Compare commits

...

3 commits

Author SHA1 Message Date
caandt 6f9a4b308d nvim 2025-02-11 19:43:15 -06:00
caandt 7fbf6a003c misc 2025-02-11 19:43:13 -06:00
caandt 9db906ea51 tailscale 2025-02-03 16:14:49 -06:00
13 changed files with 33 additions and 33 deletions

View file

@ -47,11 +47,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1737246960, "lastModified": 1738013154,
"narHash": "sha256-AsHD6Vfxx4R3FavTj0fZffhWKvg7xbUM1lNM1rryhiU=", "narHash": "sha256-yA8AwQM3bws/snp0sDscjrz7xiqZuq9LIHu12lxcb+g=",
"owner": "wamserma", "owner": "wamserma",
"repo": "flake-programs-sqlite", "repo": "flake-programs-sqlite",
"rev": "2ae6ed65904fc67517e265b59ed1df9e7ee9e2e4", "rev": "dcd8417121581ad263ca789345666a390d140eb5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -67,11 +67,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737221749, "lastModified": 1737968762,
"narHash": "sha256-igllW0yG+UbetvhT11jnt9RppSHXYgMykYhZJeqfHs0=", "narHash": "sha256-xiPARGKwocaMtv+U/rgi+h2g56CZZEmrcl7ldRaslq8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "97d7946b5e107dd03cc82f21165251d4e0159655", "rev": "e1ae908bcc30af792b0bb0a52e53b03d2577255e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -89,11 +89,11 @@
"umu": "umu" "umu": "umu"
}, },
"locked": { "locked": {
"lastModified": 1737250748, "lastModified": 1737855374,
"narHash": "sha256-dfmZxGmmwyYPVQCNI0IOOi5R7uFLAK0eHpjKhtntXcE=", "narHash": "sha256-RRGX2C+c+GaR3YMiYm6l/Tp5N/KZtYpiTplUrBwH/og=",
"owner": "fufexan", "owner": "fufexan",
"repo": "nix-gaming", "repo": "nix-gaming",
"rev": "bcc7d7ccdc82e63ab261ddea67e1db1d6091c35a", "rev": "4845fe94cda365c7550d9fd1ef899d45df0bc18a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -104,11 +104,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1737062831, "lastModified": 1737885589,
"narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -132,11 +132,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1737165118, "lastModified": 1737885640,
"narHash": "sha256-s40Kk/OulP3J/1JvC3VT16U4r/Xw6Qdi7SRw3LYkPWs=", "narHash": "sha256-GFzPxJzTd1rPIVD4IW+GwJlyGwBDV1Tj5FLYwDQQ9sM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6a3ae7a5a12fb8cac2d59d7df7cbd95f9b2f0566", "rev": "4e96537f163fad24ed9eb317798a79afc85b51b7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -164,11 +164,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737107480, "lastModified": 1737411508,
"narHash": "sha256-GXUE9+FgxoZU8v0p6ilBJ8NH7k8nKmZjp/7dmMrCv3o=", "narHash": "sha256-j9IdflJwRtqo9WpM0OfAZml47eBblUHGNQTe62OUqTw=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "4c4fb93f18b9072c6fa1986221f9a3d7bf1fe4b6", "rev": "015d461c16678fc02a2f405eb453abb509d4e1d4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -186,11 +186,11 @@
}, },
"locked": { "locked": {
"dir": "packaging/nix", "dir": "packaging/nix",
"lastModified": 1737161836, "lastModified": 1737834175,
"narHash": "sha256-v20q0DeglyrsIAbqwqOSxdzZ4JhEWtU9muWPlPz3Few=", "narHash": "sha256-fhyc89qqYM3ql0k4hJVibAhXvEXOch96hnsEGB7Av3I=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "3fd4ef90e8427cfc74d94914654a288912edb2cf", "rev": "4d1860eefd79d6c04e964774155dbe13be65121a",
"revCount": 901, "revCount": 911,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix"

View file

@ -37,5 +37,4 @@
ip46tables -t mangle -D nixos-fw-rpfilter -p udp -m udp --dport 51820 -j RETURN || true ip46tables -t mangle -D nixos-fw-rpfilter -p udp -m udp --dport 51820 -j RETURN || true
''; '';
}; };
services.tailscale.enable = true;
} }

View file

@ -48,5 +48,4 @@
ip46tables -t mangle -D nixos-fw-rpfilter -p udp -m udp --dport 51820 -j RETURN || true ip46tables -t mangle -D nixos-fw-rpfilter -p udp -m udp --dport 51820 -j RETURN || true
''; '';
}; };
services.tailscale.enable = true;
} }

View file

@ -32,6 +32,5 @@
}; };
}; };
}; };
services.tailscale.enable = true;
services.qemuGuest.enable = true; services.qemuGuest.enable = true;
} }

View file

@ -106,5 +106,4 @@
}; };
}; };
users.users.nginx.extraGroups = ["acme"]; users.users.nginx.extraGroups = ["acme"];
services.tailscale.enable = true;
} }

View file

@ -20,5 +20,4 @@
isNormalUser = true; isNormalUser = true;
extraGroups = ["wheel"]; extraGroups = ["wheel"];
}; };
services.tailscale.enable = true;
} }

View file

@ -38,6 +38,7 @@
settings.default = ["Alacritty.desktop"]; settings.default = ["Alacritty.desktop"];
}; };
services.globalprotect.enable = config.u.has.graphical; services.globalprotect.enable = config.u.has.graphical;
services.tailscale.enable = lib.mkDefault true;
environment.etc."ssh/ssh_config".text = lib.mkAfter "Include /home/*/.local/ssh/config"; environment.etc."ssh/ssh_config".text = lib.mkAfter "Include /home/*/.local/ssh/config";

View file

@ -4,6 +4,7 @@
# get parent process name # get parent process name
local parent="$(ps -o command= -p "$PPID" | cut -f1 -d' ')" local parent="$(ps -o command= -p "$PPID" | cut -f1 -d' ')"
if [[ "$parent" == *alacritty ]]; then if [[ "$parent" == *alacritty ]]; then
export SHLVL=1
if [[ -z "$TMUX" && -z "$NOTMUX" ]]; then if [[ -z "$TMUX" && -z "$NOTMUX" ]]; then
if [[ "$PWD" == "$HOME" ]]; then if [[ "$PWD" == "$HOME" ]]; then
exec auto-tmux exec auto-tmux
@ -11,7 +12,6 @@ if [[ "$parent" == *alacritty ]]; then
exec auto-tmux -n exec auto-tmux -n
fi fi
fi fi
# set shell level
elif [[ "$parent" == "tmux" ]]; then elif [[ "$parent" == "tmux" ]]; then
export SHLVL=1 export SHLVL=1
fi fi

View file

@ -39,6 +39,7 @@
]; ];
extraPackages = with pkgs; [ extraPackages = with pkgs; [
python3Packages.jedi-language-server python3Packages.jedi-language-server
pyright
clang-tools clang-tools
nixd nixd
lua-language-server lua-language-server

View file

@ -4,7 +4,8 @@ map('n', '<leader>e', MiniFiles.open)
map('n', '<leader>u', require('undotree').toggle) map('n', '<leader>u', require('undotree').toggle)
map('n', 'H', '<cmd>bp<cr>') map('n', 'H', '<cmd>bp<cr>')
map('n', 'L', '<cmd>bn<cr>') map('n', 'L', '<cmd>bn<cr>')
map('n', '<leader>bd', '<cmd>bdelete<cr>') map('n', '<leader>bd', '<cmd>bdelete<cr>', {desc = "buffer delete"})
map('n', '<leader>v', '<cmd>vs<cr>') map('n', '<leader>v', '<cmd>vs<cr>', {desc = "split [V]ertical"})
map('n', '<leader>h', '<cmd>sp<cr>') map('n', '<leader>h', '<cmd>sp<cr>', {desc = "split [H]orizontal"})
map('n', 'q:', '<nop>') map('n', 'q:', '<nop>')
map('n', '<leader>cd', vim.diagnostic.open_float, {desc = "[C]ode [D]iagnostic"})

View file

@ -62,6 +62,7 @@ lspconfig.clangd.setup({
}, },
capabilities=capabilities capabilities=capabilities
}) })
lspconfig.jedi_language_server.setup({}) --lspconfig.jedi_language_server.setup({})
lspconfig.pyright.setup({})
lspconfig.nixd.setup({}) lspconfig.nixd.setup({})
lspconfig.lua_ls.setup({}) lspconfig.lua_ls.setup({})

View file

@ -29,7 +29,7 @@
tmuxPlugins.sessionist tmuxPlugins.sessionist
] ]
++ lib.optionals config.u.has.graphical [ ++ lib.optionals config.u.has.graphical [
(config.u.lib.localHome pkgs.firefox-bin "firefox" "bin/firefox") (config.u.lib.localHome pkgs.firefox "firefox" "bin/firefox")
alacritty alacritty
nsxiv nsxiv
rofi rofi

View file

@ -22,6 +22,7 @@ lib.mkIf config.u.has.prog {
pwninit pwninit
patchelf patchelf
lazygit lazygit
pyp
] ]
++ lib.optionals config.u.has.graphical [ ++ lib.optionals config.u.has.graphical [
(cutter.withPlugins (ps: with ps; [jsdec rz-ghidra sigdb])) (cutter.withPlugins (ps: with ps; [jsdec rz-ghidra sigdb]))