diff --git a/home/.chezmoiignore.tmpl b/home/.chezmoiignore.tmpl index b460f77..5630238 100644 --- a/home/.chezmoiignore.tmpl +++ b/home/.chezmoiignore.tmpl @@ -73,6 +73,8 @@ vim:ft=gotmpl .config/zed/keymap.json .config/starship.toml .config/aichat + .config/libvirt + .config/tmux .local/share/kio/** .local/share/fonts/** {{ end }} diff --git a/home/dot_config/nvim/lua/keymaps/lspkeys.lua b/home/dot_config/nvim/lua/keymaps/lspkeys.lua index fdba2a7..b95a788 100644 --- a/home/dot_config/nvim/lua/keymaps/lspkeys.lua +++ b/home/dot_config/nvim/lua/keymaps/lspkeys.lua @@ -13,9 +13,9 @@ local M = { } -- stylua: ignore end -local function smart_split(func) +local function smart_split(func, reverse) local width = vim.api.nvim_win_get_width(0) - if width > 80 then + if width > 80 and not reverse then vim.api.nvim_command("vsp") else vim.api.nvim_command("sp") @@ -28,7 +28,7 @@ vim.keymap.set("n", "d", function() end, { desc = "Go to Definition (Smart Split)" }) vim.keymap.set("n", "D", function() - smart_split(vim.lsp.buf.declaration) + smart_split(vim.lsp.buf.declaration, true) end, { desc = "Go to Declaration (Smart Split)" }) return M diff --git a/home/dot_config/nvim/lua/plugins/mod/avante-nvim.lua b/home/dot_config/nvim/lua/plugins/mod/avante-nvim.lua index 7aca804..6f987fc 100644 --- a/home/dot_config/nvim/lua/plugins/mod/avante-nvim.lua +++ b/home/dot_config/nvim/lua/plugins/mod/avante-nvim.lua @@ -15,7 +15,13 @@ return { openrouter = { __inherited_from = "openai", endpoint = "https://openrouter.ai/api/v1", - model = "openai/gpt-5.1-codex", + model = "anthropic/claude-sonnet-4.5", + model_names = { + "openai/gpt-5.1-codex", + "google/gemini-3-pro-preview", + "anthropic/claude-sonnet-4.5", + "x-ai/grok-code-fast-1", + }, api_key_name = "OPENROUTER_API_KEY", }, }, diff --git a/nixcfgs/flake.lock b/nixcfgs/flake.lock index 556d675..b7bc969 100644 --- a/nixcfgs/flake.lock +++ b/nixcfgs/flake.lock @@ -45,11 +45,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1762735459, - "narHash": "sha256-VZRCyMRSLFORBzH+pYzDSx/ooIBD5Ohrv28sWktSiqk=", + "lastModified": 1763385902, + "narHash": "sha256-ZuM6Ji52YtonM84E8L7HlYquYs1xL19Fld33nFpXZd4=", "owner": "HeitorAugustoLN", "repo": "betterfox-nix", - "rev": "37ac3490a7e2825985ce5c0004489b2264ea1cd0", + "rev": "a1fb9f34cd5a0bbea43e744da998d54931184257", "type": "github" }, "original": { @@ -69,11 +69,11 @@ ] }, "locked": { - "lastModified": 1762480719, - "narHash": "sha256-TjTMNmndJJIxP/N6owC/CoAPiRuM99fNaQbZqHDtwLw=", + "lastModified": 1763172111, + "narHash": "sha256-QseFQKZgMq/kbHlrhfaNlwEyQ1H3J+UhnbgpAIEGpvA=", "owner": "caelestia-dots", "repo": "cli", - "rev": "9323fbf1b497204e17dff103cf412daf04a5c723", + "rev": "d89c438284311e99148ece61054cd6f9bc8e8cb7", "type": "github" }, "original": { @@ -91,11 +91,11 @@ "quickshell": "quickshell" }, "locked": { - "lastModified": 1762651107, - "narHash": "sha256-V++8JREoP1TC6ROYByMAKx/cSyxza0tp1tUNOpq5Z4k=", + "lastModified": 1763256383, + "narHash": "sha256-Vwct8SbZkfoTY0BbB0XVmXo5KsRIH4asV7QzXpjZ4b8=", "owner": "caelestia-dots", "repo": "shell", - "rev": "c0ea060ffecd3f38233652556d3085d094082400", + "rev": "58fe2962b6f515e879962953fcb4fcd9c8f39c32", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1763110997, - "narHash": "sha256-S2vF+3D/9vna3/vBV7LHiGUbp+ltPsQhvccIyim6VQg=", + "lastModified": 1763724081, + "narHash": "sha256-hCgZsbaw21R9uL3iJwG8WT3VCMXVa7xjmxGRf0nwvL4=", "owner": "catppuccin", "repo": "nix", - "rev": "e6928cdd3dd20636326c2756d2bc8fd1cd825768", + "rev": "e4676e1fd9b09131feadd3df556fd1d3f31fdd2d", "type": "github" }, "original": { @@ -163,11 +163,11 @@ ] }, "locked": { - "lastModified": 1763254583, - "narHash": "sha256-qOCvJgLGKahIG9DWcLUMjadAR/0KZeEypIqw3ASj2sA=", + "lastModified": 1763686334, + "narHash": "sha256-iqm9K+PRPqrhiypkWlQfZV82NKoByFeff3PJPrqmQ6s=", "owner": "petrkozorezov", "repo": "firefox-addons-nix", - "rev": "7a779c26bd1e6caf1fe45f905253c41e5b03c2b7", + "rev": "33e13a44144b1cf284f8a75b8dda7b9891487a2f", "type": "github" }, "original": { @@ -214,11 +214,11 @@ ] }, "locked": { - "lastModified": 1762440070, - "narHash": "sha256-xxdepIcb39UJ94+YydGP221rjnpkDZUlykKuF54PsqI=", + "lastModified": 1762980239, + "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "26d05891e14c88eb4a5d5bee659c0db5afb609d8", + "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da", "type": "github" }, "original": { @@ -331,11 +331,11 @@ ] }, "locked": { - "lastModified": 1762787259, - "narHash": "sha256-t2U/GLLXHa2+kJkwnFNRVc2fEJ/lUfyZXBE5iKzJdcs=", + "lastModified": 1763416652, + "narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=", "owner": "nix-community", "repo": "home-manager", - "rev": "37a3d97f2873e0f68711117c34d04b7c7ead8f4e", + "rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312", "type": "github" }, "original": { @@ -645,11 +645,11 @@ }, "import-tree": { "locked": { - "lastModified": 1762327901, - "narHash": "sha256-AJ96FNj50DU0bTyIzAPkPOjCZTHqjURVjok8qoXvmqM=", + "lastModified": 1763263999, + "narHash": "sha256-AZ4UkBJQKfaL9sX+/mzc1xBtcJk8hDQGkhjWX0Py5hU=", "owner": "vic", "repo": "import-tree", - "rev": "90fa129798be99cde036b78658e89475710966a1", + "rev": "058bd03ac818ea349946323ae3c2837b4cab7f22", "type": "github" }, "original": { @@ -668,11 +668,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1762938849, - "narHash": "sha256-ltM04Wy+vMm/EAwhGTl2BYjCgF+Kq4lltpDH9NEh264=", + "lastModified": 1763739228, + "narHash": "sha256-taQ7h8kkyigrdiAHilUXOZiqdT/cCYcpxQentuH+Krc=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "ea9b76cfa921d42a7502260b2d1296798089dfe6", + "rev": "4708ce5f7d7c7aec103e22c87c11a711eeafd1fa", "type": "github" }, "original": { @@ -701,11 +701,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1762881062, - "narHash": "sha256-j0Gxopn4jGYQae/90V2v4u4+Ec+gFLq3UbSaGfczpOM=", + "lastModified": 1763729389, + "narHash": "sha256-VcToDv3/lw3q3sVIqQsMUhSGKEVdQM4h6rnr/XhPBwM=", "owner": "YaLTeR", "repo": "niri", - "rev": "5b77107161c504376b962107913bf74b575703e7", + "rev": "012700dd549a79c501bcab92839e5dcc46c372b5", "type": "github" }, "original": { @@ -721,11 +721,11 @@ ] }, "locked": { - "lastModified": 1762627886, - "narHash": "sha256-/QLk1bzmbcqJt9sU43+y/3tHtXhAy0l8Ck0MoO2+evQ=", + "lastModified": 1763505477, + "narHash": "sha256-nJRd4LY2kT3OELfHqdgWjvToNZ4w+zKCMzS2R6z4sXE=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "5125a3cd414dc98bbe2c528227aa6b62ee61f733", + "rev": "3bda9f6b14161becbd07b3c56411f1670e19b9b5", "type": "github" }, "original": { @@ -757,11 +757,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1763223362, - "narHash": "sha256-iH+tM4MmtYMfWuWoo6KIc7Al+zQL13f3ScJloqSKyAs=", + "lastModified": 1763736098, + "narHash": "sha256-XYCXts/qA8CRYO4sO70U03IgwY89m/VfTSyyrpaOAcM=", "owner": "kaylorben", "repo": "nixcord", - "rev": "35c173408a25cae1c5af23b9d4fd80a181a395d4", + "rev": "616850c25a0f280686f3b66af8a8781ea6b9fdd8", "type": "github" }, "original": { @@ -772,11 +772,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1762482733, - "narHash": "sha256-g/da4FzvckvbiZT075Sb1/YDNDr+tGQgh4N8i5ceYMg=", + "lastModified": 1763191728, + "narHash": "sha256-esRhOS0APE6k40Hs/jjReXg+rx+J5LkWw7cuWFKlwYA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e1ebeec86b771e9d387dd02d82ffdc77ac753abc", + "rev": "1d4c88323ac36805d09657d13a5273aea1b34f0c", "type": "github" }, "original": { @@ -818,11 +818,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1762756533, - "narHash": "sha256-HiRDeUOD1VLklHeOmaKDzf+8Hb7vSWPVFcWwaTrpm+U=", + "lastModified": 1763622513, + "narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c2448301fb856e351aab33e64c33a3fc8bcf637d", + "rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b", "type": "github" }, "original": { @@ -834,11 +834,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1762756533, - "narHash": "sha256-HiRDeUOD1VLklHeOmaKDzf+8Hb7vSWPVFcWwaTrpm+U=", + "lastModified": 1763622513, + "narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=", "owner": "nixOS", "repo": "nixpkgs", - "rev": "c2448301fb856e351aab33e64c33a3fc8bcf637d", + "rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b", "type": "github" }, "original": { @@ -882,11 +882,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1762111121, - "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", + "lastModified": 1763421233, + "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", + "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", "type": "github" }, "original": { @@ -898,11 +898,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1762844143, - "narHash": "sha256-SlybxLZ1/e4T2lb1czEtWVzDCVSTvk9WLwGhmxFmBxI=", + "lastModified": 1763421233, + "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4", + "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", "type": "github" }, "original": { @@ -930,11 +930,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1762604901, - "narHash": "sha256-Pr2jpryIaQr9Yx8p6QssS03wqB6UifnnLr3HJw9veDw=", + "lastModified": 1763618868, + "narHash": "sha256-v5afmLjn/uyD9EQuPBn7nZuaZVV9r+JerayK/4wvdWA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f6b44b2401525650256b977063dbcf830f762369", + "rev": "a8d610af3f1a5fb71e23e08434d8d61a466fc942", "type": "github" }, "original": { @@ -946,11 +946,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1762844143, - "narHash": "sha256-SlybxLZ1/e4T2lb1czEtWVzDCVSTvk9WLwGhmxFmBxI=", + "lastModified": 1763421233, + "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4", + "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", "type": "github" }, "original": { @@ -1014,11 +1014,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1762951833, - "narHash": "sha256-KX0OJGwGXupn0MQCYr5EEk+rRBR7KIeB4MheRhDSE7A=", + "lastModified": 1763739770, + "narHash": "sha256-h2SZiOwmR/IG5om+/5v1mu/4w9dTGqA/naTm4bUFn/Y=", "owner": "nix-community", "repo": "NUR", - "rev": "98be2578da8f2ac7d4f6e404936dc45f1d83935d", + "rev": "9cfdb9c199ebf780c36a9998d27547563c7b2aaf", "type": "github" }, "original": { @@ -1082,11 +1082,11 @@ ] }, "locked": { - "lastModified": 1761897390, - "narHash": "sha256-er4gYrIoThYLjlsOMTysoRfn67d1Gci+ZpqDrtQxrA0=", + "lastModified": 1763210607, + "narHash": "sha256-gyEL9lw8oSbFbZ323vYUpIhcZLzudACEAQyCTkYh1WM=", "ref": "refs/heads/master", - "rev": "fc704e6b5d445899a1565955268c91942a4f263f", - "revCount": 700, + "rev": "0a7dcf30eaf438aa1ec72a9017cdb952df03f005", + "revCount": 704, "type": "git", "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, @@ -1122,11 +1122,11 @@ ] }, "locked": { - "lastModified": 1762812535, - "narHash": "sha256-A91a+K0Q9wfdPLwL06e/kbHeAWSzPYy2EGdTDsyfb+s=", + "lastModified": 1763607916, + "narHash": "sha256-VefBA1JWRXM929mBAFohFUtQJLUnEwZ2vmYUNkFnSjE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d75e4f89e58fdda39e4809f8c52013caa22483b7", + "rev": "877bb495a6f8faf0d89fc10bd142c4b7ed2bcc0b", "type": "github" }, "original": { @@ -1307,11 +1307,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1762747449, - "narHash": "sha256-Z1TKiux8K09a93w4PFDFsj8HFugXNy3iCC3Z8MpR5Rk=", + "lastModified": 1763704521, + "narHash": "sha256-ceYEV6PnvUN8Zixao4gpPuN+VT3B0SlAXKuPNHZhqUY=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "6338574bc5c036487486acde264f38f39ea15fad", + "rev": "f379ff5722a821212eb59ada9cf8e51cb3654aad", "type": "github" }, "original": { @@ -1327,11 +1327,11 @@ ] }, "locked": { - "lastModified": 1762827415, - "narHash": "sha256-YxPQbafcd09foVFn5yHggTZDbXsrtHVae+iwo2wGn0w=", + "lastModified": 1763697957, + "narHash": "sha256-p6CTJoeM3EK9tcqm6lgnKZFVJiGHCzcCftkko4EpEb0=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "6e0ad935d9caad128d2c58b2a1ba31524c0fe7f1", + "rev": "9eb198a4d7ea4bd1284254780e3c22533f743d55", "type": "github" }, "original": { diff --git a/nixcfgs/flake.nix b/nixcfgs/flake.nix index 2a1b89d..56e5cee 100644 --- a/nixcfgs/flake.nix +++ b/nixcfgs/flake.nix @@ -99,6 +99,7 @@ modules = [ xremap-flake.nixosModules.default sops-nix.nixosModules.sops + catppuccin.nixosModules.catppuccin ./hosts/${hostname} {nixpkgs.overlays = overlays;} ]; diff --git a/nixcfgs/modules/nixos/programs/zsh.nix b/nixcfgs/modules/nixos/programs/zsh.nix index 1450df7..c27898f 100644 --- a/nixcfgs/modules/nixos/programs/zsh.nix +++ b/nixcfgs/modules/nixos/programs/zsh.nix @@ -6,6 +6,5 @@ zsh-autoenv.enable = true; autosuggestions.enable = true; }; - catppuccin.zsh-syntax-highlighting.enable = false; environment.pathsToLink = ["/share/zsh"]; } diff --git a/nixcfgs/users/js0ny/packages/cli.nix b/nixcfgs/users/js0ny/packages/cli.nix index 5726108..12cf62c 100644 --- a/nixcfgs/users/js0ny/packages/cli.nix +++ b/nixcfgs/users/js0ny/packages/cli.nix @@ -64,5 +64,6 @@ jujutsu github-copilot-cli yt-dlp + bluetui ]; } diff --git a/nixcfgs/users/js0ny/programs/anki.nix b/nixcfgs/users/js0ny/programs/anki.nix new file mode 100644 index 0000000..eb2c33e --- /dev/null +++ b/nixcfgs/users/js0ny/programs/anki.nix @@ -0,0 +1,11 @@ +{pkgs, ...}: { + home.sessionVariables.ANKI_WAYLAND = 1; + programs.anki = { + enable = true; + addons = with pkgs.ankiAddons; [ + anki-connect + review-heatmap + recolor + ]; + }; +} diff --git a/nixcfgs/users/js0ny/programs/discord.nix b/nixcfgs/users/js0ny/programs/discord.nix index 37579f0..010ac8e 100644 --- a/nixcfgs/users/js0ny/programs/discord.nix +++ b/nixcfgs/users/js0ny/programs/discord.nix @@ -26,7 +26,7 @@ serverInfo.enable = true; showMeYourName = { enable = true; - mode = "nick-user"; + includedNames = "{friend, nick} [{display}] (@{user})"; }; silentMessageToggle.enable = true; silentTyping.enable = true; diff --git a/nixcfgs/users/js0ny/programs/shell/zsh.nix b/nixcfgs/users/js0ny/programs/shell/zsh.nix index 1e28c70..8416541 100644 --- a/nixcfgs/users/js0ny/programs/shell/zsh.nix +++ b/nixcfgs/users/js0ny/programs/shell/zsh.nix @@ -9,6 +9,7 @@ in { zsh-fzf-tab zsh-nix-shell ]; + catppuccin.zsh-syntax-highlighting.enable = false; programs.zsh = { enable = true; autocd = true;