From 2d0d502e13c0209c7af15aca2eba6900a4069d6b Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Wed, 17 Sep 2025 11:01:54 +0200 Subject: [PATCH] Update packages --- flake.lock | 111 +++++++++++++++++++++--------------- modules/wm/rofi/default.nix | 79 ++++++++++++------------- nvim/default.nix | 2 +- nvim/lua/plugins/lsp.lua | 3 +- 4 files changed, 106 insertions(+), 89 deletions(-) diff --git a/flake.lock b/flake.lock index 662008b..0347515 100644 --- a/flake.lock +++ b/flake.lock @@ -56,11 +56,11 @@ ] }, "locked": { - "lastModified": 1754487366, - "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -100,11 +100,11 @@ ] }, "locked": { - "lastModified": 1755960406, - "narHash": "sha256-RF7j6C1TmSTK9tYWO6CdEMtg6XZaUKcvZwOCD2SICZs=", + "lastModified": 1757974173, + "narHash": "sha256-4DpXmct/2rcLgScT1CXOLr0TUeIlrBB1rnFqCOf5MUw=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "e891a93b193fcaf2fc8012d890dc7f0befe86ec2", + "rev": "302af509428169db34f268324162712d10559f74", "type": "github" }, "original": { @@ -144,11 +144,11 @@ ] }, "locked": { - "lastModified": 1755233722, - "narHash": "sha256-AavrbMltJKcC2Fx0lfJoZfmy7g87ebXU0ddVenhajLA=", + "lastModified": 1758022363, + "narHash": "sha256-ENUhCRWgSX4ni751HieNuQoq06dJvApV/Nm89kh+/A0=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "99e03e72e3f7e13506f80ef9ebaedccb929d84d0", + "rev": "1a3667d33e247ad35ca250698d63f49a5453d824", "type": "github" }, "original": { @@ -164,11 +164,11 @@ ] }, "locked": { - "lastModified": 1756261190, - "narHash": "sha256-eiy0klFK5EVJLNilutR7grsZN/7Itj9DyD75eyOf83k=", + "lastModified": 1758085625, + "narHash": "sha256-D0KVKNgWSDVjYFgPLEtSQvSKchTBT0YqSbNlH7OQ+bo=", "owner": "nix-community", "repo": "home-manager", - "rev": "77f348da3176dc68b20a73dab94852a417daf361", + "rev": "fb928abb67bd4df99040721ed48c3b42e24b1d08", "type": "github" }, "original": { @@ -205,11 +205,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1756453197, - "narHash": "sha256-h5vsWwLzU6+TIY5yqR6ps8JQh9S8WRU9xxsnckM/HSE=", + "lastModified": 1758067563, + "narHash": "sha256-g9UMPKyBtIfCI21zdseTfe5I5P4RyjpaQXgtO1txoWM=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "3edf4118b2bb7182ceabbd9ce0a374c415e5a793", + "rev": "958af4628a9e463582e3cf16c963fdb510dc85f3", "type": "github" }, "original": { @@ -221,11 +221,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1756423423, - "narHash": "sha256-2ybzbB4lADwLkAST+FVFIXw1v+VjmQarsNWCKTFW/qE=", + "lastModified": 1758047314, + "narHash": "sha256-HzyJpt8TsVQmF+tkZgVaubzCA8H9syQhZvwrwXj7frc=", "owner": "neovim", "repo": "neovim", - "rev": "19f2e5c3eb4194a4b4255abb01991af63c1979b3", + "rev": "cbfa7f0d7b55c5329e6ffd36451b41b7f41b645c", "type": "github" }, "original": { @@ -241,11 +241,11 @@ ] }, "locked": { - "lastModified": 1755825449, - "narHash": "sha256-XkiN4NM9Xdy59h69Pc+Vg4PxkSm9EWl6u7k6D5FZ5cM=", + "lastModified": 1757430124, + "narHash": "sha256-MhDltfXesGH8VkGv3hmJ1QEKl1ChTIj9wmGAFfWj/Wk=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "8df64f819698c1fee0c2969696f54a843b2231e8", + "rev": "830b3f0b50045cf0bcfd4dab65fad05bf882e196", "type": "github" }, "original": { @@ -261,11 +261,11 @@ ] }, "locked": { - "lastModified": 1756008611, - "narHash": "sha256-rfTBWuTXi9/X7GhtF562FKNXKh2kvKb6dwI5lV1SjPE=", + "lastModified": 1757822619, + "narHash": "sha256-3HIpe3P2h1AUPYcAH9cjuX0tZOqJpX01c0iDwoUYNZ8=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "52dec1cb33a614accb9e01307e17816be974d24d", + "rev": "050a5feb5d1bb5b6e5fc04a7d3d816923a87c9ea", "type": "github" }, "original": { @@ -275,12 +275,15 @@ } }, "nixos-avf": { + "inputs": { + "nixpkgs": "nixpkgs" + }, "locked": { - "lastModified": 1755349137, - "narHash": "sha256-xwgq0DinLBYKqo/FegSUkh4Pr0oexYfJzv+MMB/Xy4c=", + "lastModified": 1758048506, + "narHash": "sha256-I7cLckLwnppaqoUFvTrgGKDevNnIn3qV/3ELxetm6jk=", "owner": "nix-community", "repo": "nixos-avf", - "rev": "5615d1f6e268709dfed168dc7c5762a1e612bbd0", + "rev": "1b7bf91cef5e3aeada4bc81977eb12b71585b45c", "type": "github" }, "original": { @@ -291,11 +294,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1756245047, - "narHash": "sha256-9bHzrVbjAudbO8q4vYFBWlEkDam31fsz0J7GB8k4AsI=", + "lastModified": 1757943327, + "narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a65b650d6981e23edd1afa1f01eb942f19cdcbb7", + "rev": "67a709cfe5d0643dafd798b0b613ed579de8be05", "type": "github" }, "original": { @@ -313,11 +316,11 @@ ] }, "locked": { - "lastModified": 1755261305, - "narHash": "sha256-EOqCupB5X5WoGVHVcfOZcqy0SbKWNuY3kq+lj1wHdu8=", + "lastModified": 1757937573, + "narHash": "sha256-B+MT526k5th4x22h213/CgzdkKWIaeaa0+Y0uuCkH/I=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "203a7b463f307c60026136dd1191d9001c43457f", + "rev": "134e117c969f42277f1c5e60c8fbcac103c2c454", "type": "github" }, "original": { @@ -328,11 +331,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1756386758, - "narHash": "sha256-1wxxznpW2CKvI9VdniaUnTT2Os6rdRJcRUf65ZK9OtE=", + "lastModified": 1757545623, + "narHash": "sha256-mCxPABZ6jRjUQx3bPP4vjA68ETbPLNz9V2pk9tO7pRQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dfb2f12e899db4876308eba6d93455ab7da304cd", + "rev": "8cd5ce828d5d1d16feff37340171a98fc3bf6526", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1757745802, + "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "type": "github" }, "original": { @@ -351,7 +370,7 @@ "nixos-avf": "nixos-avf", "nixos-hardware": "nixos-hardware", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "tmux": "tmux", "zen-browser": "zen-browser" } @@ -359,11 +378,11 @@ "tmux": { "flake": false, "locked": { - "lastModified": 1756198867, - "narHash": "sha256-vcBMdGgHEKlh6UuzoStPTmZt9KIM9AQZLH7fCpVii6s=", + "lastModified": 1757674869, + "narHash": "sha256-EIytv4wIxLnvTE9fXIJIbrxABAaEHnHpQ9irc3bRxSI=", "owner": "tmux", "repo": "tmux", - "rev": "fa63088dceab9b9397d5cfde83b19839a6a881d7", + "rev": "3e28777ecbc8de3df803d5d7429a5ecd35f61553", "type": "github" }, "original": { @@ -380,11 +399,11 @@ ] }, "locked": { - "lastModified": 1755934250, - "narHash": "sha256-CsDojnMgYsfshQw3t4zjRUkmMmUdZGthl16bXVWgRYU=", + "lastModified": 1756662192, + "narHash": "sha256-F1oFfV51AE259I85av+MAia221XwMHCOtZCMcZLK2Jk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "74e1a52d5bd9430312f8d1b8b0354c92c17453e5", + "rev": "1aabc6c05ccbcbf4a635fb7a90400e44282f61c4", "type": "github" }, "original": { @@ -400,11 +419,11 @@ ] }, "locked": { - "lastModified": 1756440354, - "narHash": "sha256-sYbFYDOkBOoUr+L4vzwoDuPVTducUNbkSSvvI/i/Lv4=", + "lastModified": 1757304371, + "narHash": "sha256-EZ3Vwgh5xgXuiPUmr9e1a9dEu3hvEWhRurAKpsAwB2A=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "e0c59efe742821feb04049acf9ef7f472e0d325c", + "rev": "3968348af022fe88468ef8de4f9683076e2e5e4b", "type": "github" }, "original": { diff --git a/modules/wm/rofi/default.nix b/modules/wm/rofi/default.nix index dd77f84..b8f91bf 100644 --- a/modules/wm/rofi/default.nix +++ b/modules/wm/rofi/default.nix @@ -1,47 +1,44 @@ -{ - pkgs, - ... -}: { +{pkgs, ...}: { xdg.configFile."rofi/base16.rasi".text = with { - base00 = "1e1e2e"; # base - base01 = "181825"; # mantle - base02 = "313244"; # surface0 - base03 = "45475a"; # surface1 - base04 = "585b70"; # surface2 - base05 = "cdd6f4"; # text - base06 = "f5e0dc"; # rosewater - base07 = "b4befe"; # lavender - base08 = "f38ba8"; # red - base09 = "fab387"; # peach - base0A = "f9e2af"; # yellow - base0B = "a6e3a1"; # green - base0C = "94e2d5"; # teal - base0D = "89b4fa"; # blue - base0E = "cba6f7"; # mauve - base0F = "f2cdcd"; # flamingo - }; '' - * { - base00: #${base00}; - base01: #${base01}; - base02: #${base02}; - base03: #${base03}; - base04: #${base04}; - base05: #${base05}; - base06: #${base06}; - base07: #${base07}; - base08: #${base08}; - base09: #${base09}; - base0A: #${base0A}; - base0B: #${base0B}; - base0C: #${base0C}; - base0D: #${base0D}; - base0E: #${base0E}; - base0F: #${base0F}; - } + base00 = "1e1e2e"; # base + base01 = "181825"; # mantle + base02 = "313244"; # surface0 + base03 = "45475a"; # surface1 + base04 = "585b70"; # surface2 + base05 = "cdd6f4"; # text + base06 = "f5e0dc"; # rosewater + base07 = "b4befe"; # lavender + base08 = "f38ba8"; # red + base09 = "fab387"; # peach + base0A = "f9e2af"; # yellow + base0B = "a6e3a1"; # green + base0C = "94e2d5"; # teal + base0D = "89b4fa"; # blue + base0E = "cba6f7"; # mauve + base0F = "f2cdcd"; # flamingo + }; '' + * { + base00: #${base00}; + base01: #${base01}; + base02: #${base02}; + base03: #${base03}; + base04: #${base04}; + base05: #${base05}; + base06: #${base06}; + base07: #${base07}; + base08: #${base08}; + base09: #${base09}; + base0A: #${base0A}; + base0B: #${base0B}; + base0C: #${base0C}; + base0D: #${base0D}; + base0E: #${base0E}; + base0F: #${base0F}; + } - /* vim:ft=css + /* vim:ft=css ''; - home.packages = with pkgs; [rofi-wayland]; + home.packages = with pkgs; [rofi]; xdg.configFile."rofi" = { source = ./.; recursive = true; diff --git a/nvim/default.nix b/nvim/default.nix index 0205cf4..a1188fe 100644 --- a/nvim/default.nix +++ b/nvim/default.nix @@ -128,7 +128,7 @@ in haskell-language-server rust-analyzer clang-tools - # roslyn-ls + roslyn-ls basedpyright typescript-language-server nil diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua index 2976d76..22e3439 100644 --- a/nvim/lua/plugins/lsp.lua +++ b/nvim/lua/plugins/lsp.lua @@ -18,9 +18,10 @@ vim.lsp.enable({ "jsonls", "biome", "sqls", - -- "roslyn_ls" + "roslyn_ls" }) +vim.lsp.on_type_formatting.enable() vim.api.nvim_create_autocmd("LspAttach", { desc = "Custom lsp attach", group = vim.api.nvim_create_augroup("lsp-setup", { clear = true }),