From 4255553aabd08e3a6f547863bcf59eef46a65220 Mon Sep 17 00:00:00 2001 From: Vivian Date: Mon, 18 Aug 2025 12:56:39 +0200 Subject: [PATCH] updates --- common/default.nix | 3 +- common/desktop/home.nix | 7 +- common/hm-modules/catppuccin/default.nix | 8 +- common/hm-modules/nvim/default.nix | 4 +- common/hm-modules/nvim/lsp.nix | 26 ++--- flake.lock | 142 +++++++++++------------ 6 files changed, 94 insertions(+), 96 deletions(-) diff --git a/common/default.nix b/common/default.nix index 01b21371..05d08868 100644 --- a/common/default.nix +++ b/common/default.nix @@ -18,8 +18,7 @@ }; sharedModules = [ ./hm-modules - inputs.nixvim.homeManagerModules.nixvim - inputs.autostart.homeManagerModules.xdg-autostart + inputs.nixvim.homeModules.nixvim inputs.catppuccin.homeModules.catppuccin inputs.autostart.homeManagerModules.xdg-autostart ]; diff --git a/common/desktop/home.nix b/common/desktop/home.nix index 19b8aed0..a432fd42 100644 --- a/common/desktop/home.nix +++ b/common/desktop/home.nix @@ -28,15 +28,15 @@ in btop calibre celluloid # video player - comma cinny-desktop + comma discord element-desktop - foliate # epub reader firefox + foliate # epub reader gcc - gimp jellyfin-media-player + krita neofetch nixpkgs-review qmk @@ -46,7 +46,6 @@ in unzip yt-dlp - obsidian (lib.hiPrio ( pkgs.writeShellScriptBin "obsidian" '' unset WAYLAND_DISPLAY diff --git a/common/hm-modules/catppuccin/default.nix b/common/hm-modules/catppuccin/default.nix index 9a623725..5a240bc6 100644 --- a/common/hm-modules/catppuccin/default.nix +++ b/common/hm-modules/catppuccin/default.nix @@ -42,10 +42,10 @@ in gtk = { enable = true; - iconTheme = { - name = "Papirus-Dark"; - package = pkgs.papirus-icon-theme.override { color = "violet"; }; - }; + # iconTheme = { + # name = "Papirus-Dark"; + # package = pkgs.papirus-icon-theme.override { color = "violet"; }; + # }; # cursorTheme = { # inherit (config.home.pointerCursor) name package size; # }; diff --git a/common/hm-modules/nvim/default.nix b/common/hm-modules/nvim/default.nix index 8b1baebd..bbaf6e72 100644 --- a/common/hm-modules/nvim/default.nix +++ b/common/hm-modules/nvim/default.nix @@ -30,8 +30,8 @@ with lib; luaLoader.enable = true; performance = { - byteCompileLua.enable = true; - combinePlugins.enable = true; + # byteCompileLua.enable = true; + # combinePlugins.enable = true; }; globals.mapleader = " "; diff --git a/common/hm-modules/nvim/lsp.nix b/common/hm-modules/nvim/lsp.nix index 2c01dd47..c060bb2d 100644 --- a/common/hm-modules/nvim/lsp.nix +++ b/common/hm-modules/nvim/lsp.nix @@ -53,19 +53,19 @@ installCargo = false; installRustc = false; }; - pyright.enable = true; - pylsp = { - enable = true; - settings.plugins = { - black = { - enabled = true; - cache_config = true; - }; - pycodestyle = { - maxLineLength = 100; - }; - }; - }; + # pyright.enable = true; + # pylsp = { + # enable = true; + # settings.plugins = { + # black = { + # enabled = true; + # cache_config = true; + # }; + # pycodestyle = { + # maxLineLength = 100; + # }; + # }; + # }; elixirls.enable = true; clangd.enable = true; yamlls.enable = true; diff --git a/flake.lock b/flake.lock index e16e1945..be5136da 100644 --- a/flake.lock +++ b/flake.lock @@ -12,11 +12,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1752217044, - "narHash": "sha256-5TomR72rn4q+5poQcN6EnanxeXKqJSqWVAoDAFN0lUc=", + "lastModified": 1754527469, + "narHash": "sha256-swR4GCqp5LHYJQ7pdePBtsqYyiyy+ASfUvhAgou23KI=", "owner": "zhaofengli", "repo": "attic", - "rev": "24fad0622fc9404c69e83bab7738359c5be4988e", + "rev": "687dd7d607824edf11bf33e3d91038467e7fad43", "type": "github" }, "original": { @@ -61,11 +61,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1752227483, - "narHash": "sha256-eetITGJfURryoHY5gfuE9/4sEV9aSgzhPxgsQgofNa8=", + "lastModified": 1755247639, + "narHash": "sha256-YBjSqGgNAejwIIqUv+NTYpm+peXLro79qNBi0SF1JqM=", "owner": "catppuccin", "repo": "nix", - "rev": "5f431aac1a4038c385e6de2d2384d943e4802d61", + "rev": "bd14b47481c996e2a5d5e5704d55092edf18e892", "type": "github" }, "original": { @@ -83,11 +83,11 @@ "stable": "stable" }, "locked": { - "lastModified": 1752070778, - "narHash": "sha256-2ArxrGPb39YxeyMgEzFX/YiUwwOgz62qazHhYJnZQss=", + "lastModified": 1754254562, + "narHash": "sha256-vwu354kJ2fjK1StYmsi/M2vGQ2s72m+t9pIPHImt1Xw=", "owner": "zhaofengli", "repo": "colmena", - "rev": "f560ed613a568aee178576b21c6818ef50819ca5", + "rev": "5e0fbc4dbc50b3a38ecdbcb8d0a5bbe12e3f9a72", "type": "github" }, "original": { @@ -113,11 +113,11 @@ }, "crane_2": { "locked": { - "lastModified": 1750266157, - "narHash": "sha256-tL42YoNg9y30u7zAqtoGDNdTyXTi8EALDeCB13FtbQA=", + "lastModified": 1754269165, + "narHash": "sha256-0tcS8FHd4QjbCVoxN9jI+PjHgA4vc/IjkUSp+N3zy0U=", "owner": "ipetkov", "repo": "crane", - "rev": "e37c943371b73ed87faf33f7583860f81f1d5a48", + "rev": "444e81206df3f7d92780680e45858e31d2f07a08", "type": "github" }, "original": { @@ -292,11 +292,11 @@ ] }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1754091436, + "narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd", "type": "github" }, "original": { @@ -313,11 +313,11 @@ ] }, "locked": { - "lastModified": 1751413152, - "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", + "lastModified": 1754487366, + "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", + "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", "type": "github" }, "original": { @@ -602,11 +602,11 @@ ] }, "locked": { - "lastModified": 1752202894, - "narHash": "sha256-knafgng4gCjZIUMyAEWjxxdols6n/swkYnbWr+oF+1w=", + "lastModified": 1755229570, + "narHash": "sha256-soZegto0xXzG2zYlu/zjknDHv0Z7tRS5EQs+Z/VRTBg=", "owner": "nix-community", "repo": "home-manager", - "rev": "fab659b346c0d4252208434c3c4b3983a4b38fec", + "rev": "11626a4383b458f8dc5ea3237eaa04e8ab1912f3", "type": "github" }, "original": { @@ -657,11 +657,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1750371812, - "narHash": "sha256-D868K1dVEACw17elVxRgXC6hOxY+54wIEjURztDWLk8=", + "lastModified": 1753819801, + "narHash": "sha256-tHe6XeNeVeKapkNM3tcjW4RuD+tB2iwwoogWJOtsqTI=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "b13c7481e37856f322177010bdf75fccacd1adc8", + "rev": "b308a818b9dcaa7ab8ccab891c1b84ebde2152bc", "type": "github" }, "original": { @@ -763,11 +763,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1751381593, - "narHash": "sha256-js1XwtJpYhvQrrTaVzViybpztkHJVZ63aXOlFAcTENM=", + "lastModified": 1754297745, + "narHash": "sha256-aD6/scLN3L4ZszmNbhhd3JQ9Pzv1ScYFphz14wHinfs=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "f4eb75540307c2b33521322c04b7fea74e48a66f", + "rev": "892cbdca865d6b42f9c0d222fe309f7720259855", "type": "github" }, "original": { @@ -787,11 +787,11 @@ "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1752060039, - "narHash": "sha256-MqcbN/PgfXOv8S4q6GcmlORd6kJZ3UlFNhzCvLOEe4I=", + "lastModified": 1754605910, + "narHash": "sha256-kVWxzm44ywJTb4REfwWCYXnROISykG0yE+X5A3Gov24=", "ref": "refs/heads/master", - "rev": "80d21ed7a1ab8007597f7cd9adc26ebc98b9611f", - "revCount": 773, + "rev": "57d9624c71ca65bee69b30d72b11f6c5257e9500", + "revCount": 783, "type": "git", "url": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver.git" }, @@ -807,11 +807,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1752095991, - "narHash": "sha256-+paXzPg6SN3O+YKtQKiU+kQE1EkfsrI1XEYTxI4DSFk=", + "lastModified": 1755102374, + "narHash": "sha256-v6xhTSgnGQoF1a51BB6OQWN8HXiYbZtVL+54TRuk9zk=", "owner": "astro", "repo": "microvm.nix", - "rev": "f30b1412b73df264dc9cac154d340645add350ff", + "rev": "0a5cda80e48191959cf5a9c0552532599ef2cee4", "type": "github" }, "original": { @@ -900,11 +900,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1752048960, - "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=", + "lastModified": 1754564048, + "narHash": "sha256-dz303vGuzWjzOPOaYkS9xSW+B93PSAJxvBd6CambXVA=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806", + "rev": "26ed7a0d4b8741fe1ef1ee6fa64453ca056ce113", "type": "github" }, "original": { @@ -915,11 +915,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750776420, - "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", + "lastModified": 1755027561, + "narHash": "sha256-IVft239Bc8p8Dtvf7UAACMG5P3ZV+3/aO28gXpGtMXI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", + "rev": "005433b926e16227259a1843015b5b2b7f7d1fc3", "type": "github" }, "original": { @@ -931,11 +931,11 @@ }, "nixpkgs-25_05": { "locked": { - "lastModified": 1751741127, - "narHash": "sha256-t75Shs76NgxjZSgvvZZ9qOmz5zuBE8buUaYD28BMTxg=", + "lastModified": 1753749649, + "narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "29e290002bfff26af1db6f64d070698019460302", + "rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a", "type": "github" }, "original": { @@ -1042,11 +1042,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1746904237, - "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", + "lastModified": 1754725699, + "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", + "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", "type": "github" }, "original": { @@ -1058,11 +1058,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1751984180, - "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", + "lastModified": 1755027561, + "narHash": "sha256-IVft239Bc8p8Dtvf7UAACMG5P3ZV+3/aO28gXpGtMXI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", + "rev": "005433b926e16227259a1843015b5b2b7f7d1fc3", "type": "github" }, "original": { @@ -1073,11 +1073,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1751786137, - "narHash": "sha256-lIlUKVGCGsh0Q2EA7/6xRtKUZjaQ/ur8uUyY+MynHXQ=", + "lastModified": 1754393734, + "narHash": "sha256-fbnmAwTQkuXHKBlcL5Nq1sMAzd3GFqCOQgEQw6Hy0Ak=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ceb24d94c6feaa4e8737a8e2bd3cf71c3a7eaaa0", + "rev": "a683adc19ff5228af548c6539dbc3440509bfed3", "type": "github" }, "original": { @@ -1089,11 +1089,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1751984180, - "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", + "lastModified": 1755027561, + "narHash": "sha256-IVft239Bc8p8Dtvf7UAACMG5P3ZV+3/aO28gXpGtMXI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", + "rev": "005433b926e16227259a1843015b5b2b7f7d1fc3", "type": "github" }, "original": { @@ -1111,11 +1111,11 @@ "systems": "systems_8" }, "locked": { - "lastModified": 1752158208, - "narHash": "sha256-XbXYLUtaB/wHvZYefvaDPbo4eYj27kbtowHfww9bqLw=", + "lastModified": 1755095763, + "narHash": "sha256-cFwtMaONA4uKYk/rBrmFvIAQieZxZytoprzIblTn1HA=", "owner": "pta2002", "repo": "nixvim", - "rev": "b728cf43d97814df43f5d9bd9dafac9072ccd9e8", + "rev": "ecc7880e00a2a735074243d8a664a931d73beace", "type": "github" }, "original": { @@ -1130,11 +1130,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1752238241, - "narHash": "sha256-FAL3YvZOt8lXQY/N7ssugm775BkjWnH1FpgAAaBQrfU=", + "lastModified": 1755102471, + "narHash": "sha256-ecWsZvrU/v7phSRIulxUYoCZ+i8s+mQ0ecmxxcgHUko=", "owner": "nix-community", "repo": "NUR", - "rev": "9e311ede9a39b9ec3a7e37be8411056a4c4e9711", + "rev": "94c6c5b9798480dc220ee2cc8b1ce93a472a8d8f", "type": "github" }, "original": { @@ -1153,11 +1153,11 @@ ] }, "locked": { - "lastModified": 1749730855, - "narHash": "sha256-L3x2nSlFkXkM6tQPLJP3oCBMIsRifhIDPMQQdHO5xWo=", + "lastModified": 1754301638, + "narHash": "sha256-aRgzcPDd2axHFOuMlPLuzmDptUM2JU8mUL3jfgbBeyc=", "owner": "NuschtOS", "repo": "search", - "rev": "8dfe5879dd009ff4742b668d9c699bc4b9761742", + "rev": "a60091045273484c040a91f5c229ba298f8ecc27", "type": "github" }, "original": { @@ -1225,11 +1225,11 @@ ] }, "locked": { - "lastModified": 1751165203, - "narHash": "sha256-3QhlpAk2yn+ExwvRLtaixWsVW1q3OX3KXXe0l8VMLl4=", + "lastModified": 1754189623, + "narHash": "sha256-fstu5eb30UYwsxow0aQqkzxNxGn80UZjyehQVNVHuBk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "90f547b90e73d3c6025e66c5b742d6db51c418c3", + "rev": "c582ff7f0d8a7ea689ae836dfb1773f1814f472a", "type": "github" }, "original": { @@ -1241,11 +1241,11 @@ "spectrum": { "flake": false, "locked": { - "lastModified": 1751265943, - "narHash": "sha256-XoHSo6GEElzRUOYAEg/jlh5c8TDsyDESFIux3nU/NMc=", + "lastModified": 1754675037, + "narHash": "sha256-afS08F7lfMUBR4qrBxinN1kuxu+DoHQ5TPNVp9VS/OA=", "ref": "refs/heads/main", - "rev": "37c8663fab86fdb202fece339ef7ac7177ffc201", - "revCount": 904, + "rev": "586577f3015397afacd83bc185454f4cc3c8028f", + "revCount": 955, "type": "git", "url": "https://spectrum-os.org/git/spectrum" },