From 88ada5d28d4f8e374d900b9591a9a26e1373a3d3 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 27 Feb 2025 14:05:13 +0700 Subject: [PATCH 01/21] Enable `emacs-lsp-booster` --- hmModules/emacs/default.nix | 1 + hmModules/emacs/init.el | 4 ++++ packages/emacs/packages.nix | 10 ++++++++++ 3 files changed, 15 insertions(+) diff --git a/hmModules/emacs/default.nix b/hmModules/emacs/default.nix index 39717d3..61afd35 100644 --- a/hmModules/emacs/default.nix +++ b/hmModules/emacs/default.nix @@ -48,6 +48,7 @@ in kdePackages.qtwayland copilot-node-server math-preview + emacs-lsp-booster ] ++ (with hunspellDicts; [ en_US-large diff --git a/hmModules/emacs/init.el b/hmModules/emacs/init.el index ba64445..a09038d 100644 --- a/hmModules/emacs/init.el +++ b/hmModules/emacs/init.el @@ -37,6 +37,10 @@ (consult-eglot-embark-mode) ) +(use-package eglot-booster + :after eglot + :config (eglot-booster-mode)) + (use-package emacs :bind (("" . scroll-down-line) ("" . scroll-up-line) diff --git a/packages/emacs/packages.nix b/packages/emacs/packages.nix index af76056..74b0068 100644 --- a/packages/emacs/packages.nix +++ b/packages/emacs/packages.nix @@ -98,6 +98,16 @@ let }; deps = [ ]; }; + eglot-booster = buildEmacsPackage { + name = "eglot-booster"; + src = pkgs.fetchFromGitHub { + owner = "jdtsmith"; + repo = "eglot-booster"; + rev = "e6daa6bcaf4aceee29c8a5a949b43eb1b89900ed"; + hash = "sha256-PLfaXELkdX5NZcSmR1s/kgmU16ODF8bn56nfTh9g6bs="; + }; + deps = [ ]; + }; }; # *List* containing emacs packages from (M)ELPA From f358b8e5e95befb051e4bd5c1cebb4f8f6b1c9f7 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 27 Feb 2025 14:05:23 +0700 Subject: [PATCH 02/21] Change `sisko` NFS mountpoint --- modules/mount-sisko/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mount-sisko/default.nix b/modules/mount-sisko/default.nix index 61671a5..cd9d1d0 100644 --- a/modules/mount-sisko/default.nix +++ b/modules/mount-sisko/default.nix @@ -15,7 +15,7 @@ source = "${pkgs.nfs-utils.out}/bin/mount.nfs"; }; - fileSystems."/home/${config.ccr.username}/nas" = { + fileSystems."/mnt/nas" = { device = "sisko.fleet:/hd"; fsType = "nfs"; options = [ From 6a7a16807df9131b2bb5f553ab2d3ee4fa950ed6 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 27 Feb 2025 14:05:40 +0700 Subject: [PATCH 03/21] Disable spotify on `sisko` --- hosts/kirk/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/kirk/default.nix b/hosts/kirk/default.nix index 5bb2927..0835424 100644 --- a/hosts/kirk/default.nix +++ b/hosts/kirk/default.nix @@ -57,7 +57,6 @@ "niri" "udiskie" "xdg" - "spotify" "lutris" "wine" "cura" From e35ba5af349a8ed26e7309741301d7be7c86d0fa Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 27 Feb 2025 14:05:52 +0700 Subject: [PATCH 04/21] Make ssh better/faster? --- hmModules/git/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hmModules/git/default.nix b/hmModules/git/default.nix index 424c4b9..52fcf80 100644 --- a/hmModules/git/default.nix +++ b/hmModules/git/default.nix @@ -33,6 +33,12 @@ in credential.helper = "manager"; credential.credentialStore = "cache"; + + core = { + fsmonitor = true; + untrackedcache = true; + }; + fetch.writeCommitGraph = true; }; userName = config.name; From e1ebdc68e99aeeb85203624b427b4de0f4d49255 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 27 Feb 2025 14:06:04 +0700 Subject: [PATCH 05/21] Improve Discord --- hmModules/discord/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hmModules/discord/default.nix b/hmModules/discord/default.nix index 90f6d31..f750cb7 100644 --- a/hmModules/discord/default.nix +++ b/hmModules/discord/default.nix @@ -1,6 +1,9 @@ { pkgs, ... }: { - home.packages = [ pkgs.discord ]; + home.packages = [ (pkgs.discord.override { + withOpenASAR = true; + withVencord = true; + }) ]; home.file.".config/discord/settings.json".text = builtins.toJSON { SKIP_HOST_UPDATE = true; }; From fccbf30dd366180dc25755ede753412adcab5715 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 27 Feb 2025 14:18:12 +0700 Subject: [PATCH 06/21] Customize Gptel and bTop floating windows sizes for each host --- hmModules/niri/config.kdl | 6 ++++-- hmModules/niri/default.nix | 39 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/hmModules/niri/config.kdl b/hmModules/niri/config.kdl index c0045cd..d06c32d 100644 --- a/hmModules/niri/config.kdl +++ b/hmModules/niri/config.kdl @@ -351,11 +351,13 @@ binds { Mod+B { spawn "firefox"; } Mod+RETURN { spawn "emacsclient" "-c" "--eval" "(ccr/start-eshell)"; } Mod+M { spawn "emacsclient" "-c" "--eval" "(notmuch-search \"tag:new\")"; } - Mod+G { spawn "emacsclient" "-c" "--eval" "(switch-to-buffer (gptel \"*ChatGPT*\"))" "-F" "((name . \"GPTel - Emacs\") (width . 150) (height . 60))'"; } + // Mod+G { spawn "emacsclient" "-c" "--eval" "(switch-to-buffer (gptel \"*ChatGPT*\"))" "-F" "((name . \"GPTel - Emacs\") (width . $NIRI_GPTEL_COLS) (height . $NIRI_GPTEL_ROWS))'"; } + Mod+G { spawn "run-floating-gptel"; } Mod+Shift+C { spawn "emacsclient" "-c" "--eval" "(org-roam-dailies-capture-today)"; } Mod+Alt+L { spawn "swaylock"; } Mod+Space { spawn "rofi" "-show" "menu" "-modi" "menu:rofi-power-menu"; } - Mod+Ctrl+b { spawn "foot" "--title='bTop'" "-W" "210x60" "btop";} + // Mod+Ctrl+b { spawn "foot" "--title='bTop'" "-W" "$NIRI_BTOP_COLSx$NIRI_BTOP_ROWS" "btop";} + Mod+Ctrl+b { spawn "run-floating-btop"; } // Example volume keys mappings for PipeWire & WirePlumber. // The allow-when-locked=true property makes them work even when the session is locked. diff --git a/hmModules/niri/default.nix b/hmModules/niri/default.nix index 9210926..ded045b 100644 --- a/hmModules/niri/default.nix +++ b/hmModules/niri/default.nix @@ -2,13 +2,52 @@ pkgs, lib, config, + hostname, ... }: +let + niriVars = + { + picard = { + floating-gptel = { + rows = "60"; + cols = "150"; + }; + floating-btop = { + rows = "210"; + cols = "60"; + }; + }; + kirk = { + floating-gptel = { + rows = "40"; + cols = "140"; + }; + floating-btop = { + rows = "40"; + cols = "140"; + }; + }; + } + ."${hostname}" or niriVars.kirk; + run-floating-gptel = + with niriVars.floating-gptel; + pkgs.writeScriptBin "run-floating-gptel" '' + emacsclient -c --eval '(switch-to-buffer (gptel "*GptEl*"))' -F '((name . "GPTel - Emacs") (width . ${cols}) (height . ${rows}))' + ''; + run-floating-btop = + with niriVars.floating-btop; + pkgs.writeScriptBin "run-floating-btop" '' + foot --title='bTop' -W ${rows}x${cols} btop + ''; +in { home.packages = with pkgs; [ niri waypaper xwayland-satellite + run-floating-gptel + run-floating-btop ]; systemd.user.targets.niri-session = { Unit = { From 820fda70aaf1254ba2eb9f2480e777bea99556d3 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 27 Feb 2025 08:48:48 +0100 Subject: [PATCH 07/21] Disable custom `dump1090` nixos Module A PR on nixpkgs is now open --- hosts/picard/default.nix | 1 - modules/dump1090/default.nix | 45 ------------------------------------ 2 files changed, 46 deletions(-) delete mode 100644 modules/dump1090/default.nix diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix index 9c2f4a1..104a454 100644 --- a/hosts/picard/default.nix +++ b/hosts/picard/default.nix @@ -41,7 +41,6 @@ "adb" "prometheus-exporters" "promtail" - "dump1090" ] ++ [ ./disko.nix ]; diff --git a/modules/dump1090/default.nix b/modules/dump1090/default.nix deleted file mode 100644 index d6f2456..0000000 --- a/modules/dump1090/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ pkgs, lib, ... }: -{ - systemd.services.dump1090-fa = { - description = "dump1090 ADS-B receiver (FlightAware customization)"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - - serviceConfig = { - DynamicUser = true; - SupplementaryGroups = "plugdev"; - ExecStart = lib.escapeShellArgs [ - (lib.getExe pkgs.dump1090) - "--net" - "--write-json" - "%t/dump1090-fa" - ]; - RuntimeDirectory = "dump1090-fa"; - WorkingDirectory = "%t/dump1090-fa"; - RuntimeDirectoryMode = 755; - }; - }; - - services.nginx = { - enable = true; - - virtualHosts."dump1090-fa" = { - listen = [ - { - addr = "0.0.0.0"; - port = 8080; - } - ]; - locations = { - "/".alias = "${pkgs.dump1090}/share/dump1090/"; - "/data/".alias = "/run/dump1090-fa/"; - }; - }; - }; - - # TODO before upstreaming in nixpkgs - # - add `meta.mainProgram` to dump1090 - # - rename dump1090 to dump1090-fa - # - optionally create an alias for dump1090 - # - securing the systemd service (`systemd-analyze security dump1090-fa`) -} From e583ab81e413baaccdd1630ac0762fe1d3acdb64 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 27 Feb 2025 09:49:24 +0100 Subject: [PATCH 08/21] Update inputs and remove `lix-eval-jobs`, `nixThePlanet` and `nix-darwin` --- flake.lock | 616 ++++++++--------------------------------------------- flake.nix | 9 - 2 files changed, 85 insertions(+), 540 deletions(-) diff --git a/flake.lock b/flake.lock index 583d5c1..a90094c 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1723293904, - "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", + "lastModified": 1736955230, + "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", "owner": "ryantm", "repo": "agenix", - "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", + "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", "type": "github" }, "original": { @@ -23,20 +23,14 @@ }, "catppuccin": { "inputs": { - "catppuccin-v1_1": "catppuccin-v1_1", - "catppuccin-v1_2": "catppuccin-v1_2", - "home-manager": "home-manager_2", - "home-manager-stable": "home-manager-stable", - "nixpkgs": "nixpkgs_2", - "nixpkgs-stable": "nixpkgs-stable", - "nuscht-search": "nuscht-search" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1736069220, - "narHash": "sha256-76MaB3COao55nlhWmSmq9PKgu2iGIs54C1cAE0E5J6Y=", + "lastModified": 1739934729, + "narHash": "sha256-PcrLk10meIJICzUJqtCMOJxoITzbH52fZg2XAB7SSsM=", "owner": "catppuccin", "repo": "nix", - "rev": "8eada392fd6571a747e1c5fc358dd61c14c8704e", + "rev": "b1ff2a638afa827f1473498190a2c1cae1cf41cf", "type": "github" }, "original": { @@ -45,34 +39,6 @@ "type": "github" } }, - "catppuccin-v1_1": { - "locked": { - "lastModified": 1734055249, - "narHash": "sha256-pCWJgwo77KD7EJpwynwKrWPZ//dwypHq2TfdzZWqK68=", - "rev": "7221d6ca17ac36ed20588e1c3a80177ac5843fa7", - "revCount": 326, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.1.1/0193bdc0-b045-7eed-bbec-95611a8ecdf5/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/catppuccin/nix/1.1.%2A.tar.gz" - } - }, - "catppuccin-v1_2": { - "locked": { - "lastModified": 1734728407, - "narHash": "sha256-Let3uJo4YDyfqbqaw66dpZxhJB2TrDyZWSFd5rpPLJA=", - "rev": "23ee86dbf4ed347878115a78971d43025362fab1", - "revCount": 341, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.2.0/0193e5e0-33b7-7149-a362-bfe56b20f64e/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/catppuccin/nix/1.2.%2A.tar.gz" - } - }, "crane": { "locked": { "lastModified": 1731098351, @@ -117,11 +83,11 @@ ] }, "locked": { - "lastModified": 1736711425, - "narHash": "sha256-8hKhPQuMtXfJi+4lPvw3FBk/zSJVHeb726Zo0uF1PP8=", + "lastModified": 1740485968, + "narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=", "owner": "nix-community", "repo": "disko", - "rev": "f720e64ec37fa16ebba6354eadf310f81555cc07", + "rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940", "type": "github" }, "original": { @@ -153,14 +119,14 @@ "emacs-overlay": { "inputs": { "nixpkgs": "nixpkgs_4", - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1736759802, - "narHash": "sha256-XCaIRTC+YlL5nRi9WJHeftyfw2Z0YXwwzEmHThGuR3Q=", + "lastModified": 1740622367, + "narHash": "sha256-7TpBfGb24DrQrdW94T5x0vHN0GF2I50fkP+YX5r6JqE=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "244a2ab1459c72bac32a2db088549f8bc6d7a836", + "rev": "ee8442abce734e9a1d0e5824818062bcbf358e73", "type": "github" }, "original": { @@ -238,66 +204,6 @@ "type": "github" } }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "lix-eval-jobs", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" - }, - "locked": { - "lastModified": 1701473968, - "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_4": { - "inputs": { - "nixpkgs-lib": [ - "nixThePlanet", - "hercules-ci-effects", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1696343447, - "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", - "type": "github" - }, - "original": { - "id": "flake-parts", - "type": "indirect" - } - }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -320,24 +226,6 @@ "inputs": { "systems": "systems_3" }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_4" - }, "locked": { "lastModified": 1681202837, "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", @@ -357,11 +245,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1736143030, - "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", + "lastModified": 1738453229, + "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", + "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", "type": "github" }, "original": { @@ -394,11 +282,11 @@ ] }, "locked": { - "lastModified": 1735882644, - "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", + "lastModified": 1737465171, + "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", + "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", "type": "github" }, "original": { @@ -450,25 +338,6 @@ "type": "github" } }, - "hercules-ci-effects": { - "inputs": { - "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_7" - }, - "locked": { - "lastModified": 1701009247, - "narHash": "sha256-GuX16rzRze2y7CsewJLTV6qXkXWyEwp6VCZXi8HLruU=", - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "rev": "31b6cd7569191bfcd0a548575b0e2ef953ed7d09", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -490,50 +359,7 @@ "type": "github" } }, - "home-manager-stable": { - "inputs": { - "nixpkgs": [ - "catppuccin", - "nixpkgs-stable" - ] - }, - "locked": { - "lastModified": 1734366194, - "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-24.11", - "repo": "home-manager", - "type": "github" - } - }, "home-manager_2": { - "inputs": { - "nixpkgs": [ - "catppuccin", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1734622215, - "narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_3": { "inputs": { "nixpkgs": [ "nix-on-droid", @@ -561,11 +387,11 @@ ] }, "locked": { - "lastModified": 1736781604, - "narHash": "sha256-nIjcN89nxaI5ZnwU/1gzc3rBVQ/te5sHraYeG4cyJX4=", + "lastModified": 1740624780, + "narHash": "sha256-8TP61AI3QBQsjzVUQFIV8NoB5nbYfJB3iHczhBikDkU=", "owner": "nix-community", "repo": "home-manager", - "rev": "9616d81f98032d1ee9bec68ab4b6a8c833add88c", + "rev": "b8869e4ead721bbd4f0d6b927e8395705d4f16e6", "type": "github" }, "original": { @@ -597,11 +423,11 @@ }, "impermanence": { "locked": { - "lastModified": 1736688610, - "narHash": "sha256-1Zl9xahw399UiZSJ9Vxs1W4WRFjO1SsNdVZQD4nghz0=", + "lastModified": 1737831083, + "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=", "owner": "nix-community", "repo": "impermanence", - "rev": "c64bed13b562fc3bb454b48773d4155023ac31b7", + "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170", "type": "github" }, "original": { @@ -610,34 +436,6 @@ "type": "github" } }, - "ixx": { - "inputs": { - "flake-utils": [ - "catppuccin", - "nuscht-search", - "flake-utils" - ], - "nixpkgs": [ - "catppuccin", - "nuscht-search", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729958008, - "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.0.6", - "repo": "ixx", - "type": "github" - } - }, "lanzaboote": { "inputs": { "crane": "crane", @@ -650,11 +448,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1734994463, - "narHash": "sha256-S9MgfQjNt4J3I7obdLOVY23h+Yl/hnyibwGfOl+1uOE=", + "lastModified": 1740440383, + "narHash": "sha256-w8ixbqOGrVWMQZFFs4uAwZpuwuGMzFoKjocMFxTR5Ts=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "93e6f0d77548be8757c11ebda5c4235ef4f3bc67", + "rev": "6321bc060d757c137c1fbae2057c7e941483878f", "type": "github" }, "original": { @@ -666,11 +464,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1736680332, - "narHash": "sha256-gwidOezQ6FT5q4GHcpD6y2EwKcrtzjAoxaN/9bTGqQw=", + "lastModified": 1740629216, + "narHash": "sha256-i6fadzFVD7B8XWXa2ycPoVlpSJ5SeWcZ8LLzfzYedKs=", "ref": "refs/heads/main", - "rev": "38dd196b03f4163ae3bbb2a1910b8f0f141ca0e2", - "revCount": 16610, + "rev": "8082f0b8434a81db309ac8abf1cf32532ba9168e", + "revCount": 17513, "type": "git", "url": "https://git@git.lix.systems/lix-project/lix" }, @@ -679,35 +477,9 @@ "url": "https://git@git.lix.systems/lix-project/lix" } }, - "lix-eval-jobs": { - "inputs": { - "flake-parts": "flake-parts_2", - "lix": [ - "lix" - ], - "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "nixpkgs" - ], - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1733522041, - "narHash": "sha256-KpKmFgcUGQlAWhLUHyBn3AnTJLp7Kt82q2Cxfp3Yf44=", - "ref": "refs/heads/main", - "rev": "df3edf37301cdc77ca5bd5f3f6fcccd6d0befee5", - "revCount": 619, - "type": "git", - "url": "https://git.lix.systems/lix-project/nix-eval-jobs" - }, - "original": { - "type": "git", - "url": "https://git.lix.systems/lix-project/nix-eval-jobs" - } - }, "lix-module": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "flakey-profile": "flakey-profile", "lix": [ "lix" @@ -717,11 +489,11 @@ ] }, "locked": { - "lastModified": 1733522213, - "narHash": "sha256-H+Pk19MzvI/TAbXWimUPZAoKkD56OSyxJBm8lVIA5n0=", + "lastModified": 1738176840, + "narHash": "sha256-NG3IRvRs3u3btVCN861FqHvgOwqcNT/Oy6PBG86F5/E=", "ref": "refs/heads/main", - "rev": "c374ebf5548c7b6d4bf884369a5b6879cfc916ea", - "revCount": 124, + "rev": "621aae0f3cceaffa6d73a4fb0f89c08d338d729e", + "revCount": 133, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, @@ -733,11 +505,11 @@ "mobile-nixos": { "flake": false, "locked": { - "lastModified": 1736638789, - "narHash": "sha256-pkpOkSUNrSf5DePUtYYFt4wGODhY28RlQ4SIJ1e+15M=", + "lastModified": 1737346419, + "narHash": "sha256-YHByUFujAnfJJ2JnhHIJyohECr5o0EDmuRdyUcvnZGQ=", "owner": "NixOS", "repo": "mobile-nixos", - "rev": "72a0601f36a1b424e8b72f17ff53509b990ee060", + "rev": "1498c4d7fd59026479469efdbfe30c78a7300d89", "type": "github" }, "original": { @@ -772,30 +544,9 @@ "type": "github" } }, - "nix-github-actions": { - "inputs": { - "nixpkgs": [ - "lix-eval-jobs", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1731952509, - "narHash": "sha256-p4gB3Rhw8R6Ak4eMl8pqjCPOLCZRqaehZxdZ/mbFClM=", - "owner": "nix-community", - "repo": "nix-github-actions", - "rev": "7b5f051df789b6b20d259924d349a9ba3319b226", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-github-actions", - "type": "github" - } - }, "nix-on-droid": { "inputs": { - "home-manager": "home-manager_3", + "home-manager": "home-manager_2", "nix-formatter-pack": "nix-formatter-pack", "nixpkgs": "nixpkgs_5", "nixpkgs-docs": "nixpkgs-docs", @@ -816,52 +567,13 @@ "type": "github" } }, - "nixDarwin": { - "inputs": { - "nixpkgs": "nixpkgs_6" - }, - "locked": { - "lastModified": 1736631212, - "narHash": "sha256-mG9lRZBcPiAGiVJ9B97BJoIGQcSBWIVlBiN30QYCtG0=", - "owner": "LnL7", - "repo": "nix-darwin", - "rev": "6ace2f2d12bdf74235d5cbf9fbd34a71c9716685", - "type": "github" - }, - "original": { - "owner": "LnL7", - "repo": "nix-darwin", - "type": "github" - } - }, - "nixThePlanet": { - "inputs": { - "flake-parts": "flake-parts_3", - "hercules-ci-effects": "hercules-ci-effects", - "nixpkgs": "nixpkgs_8", - "osx-kvm": "osx-kvm" - }, - "locked": { - "lastModified": 1734291592, - "narHash": "sha256-6jc7RzRLAnoUjgqJizWdOBmYbp49UBpOlqZeDw8SCjc=", - "owner": "MatthewCroughan", - "repo": "NixThePlanet", - "rev": "b70d951ab433806e44a6b366367af55c469da52d", - "type": "github" - }, - "original": { - "owner": "MatthewCroughan", - "repo": "NixThePlanet", - "type": "github" - } - }, "nixosHardware": { "locked": { - "lastModified": 1736441705, - "narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=", + "lastModified": 1740387674, + "narHash": "sha256-pGk/aA0EBvI6o4DeuZsr05Ig/r4uMlSaf5EWUZEWM10=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337", + "rev": "d58f642ddb23320965b27beb0beba7236e9117b5", "type": "github" }, "original": { @@ -920,41 +632,23 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1735774519, - "narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=", + "lastModified": 1738452942, + "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" - } - }, - "nixpkgs-lib_2": { - "locked": { - "dir": "lib", - "lastModified": 1701253981, - "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1734600368, - "narHash": "sha256-nbG9TijTMcfr+au7ZVbKpAhMJzzE2nQBYmRvSdXUD8g=", + "lastModified": 1740463929, + "narHash": "sha256-4Xhu/3aUdCKeLfdteEHMegx5ooKQvwPHNkOgNCXQrvc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b47fd6fa00c6afca88b8ee46cfdb00e104f50bca", + "rev": "5d7db4668d7a0c6cc5fc8cf6ef33b008b2b1ed8b", "type": "github" }, "original": { @@ -965,22 +659,6 @@ } }, "nixpkgs-stable_2": { - "locked": { - "lastModified": 1736549401, - "narHash": "sha256-ibkQrMHxF/7TqAYcQE+tOnIsSEzXmMegzyBWza6uHKM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1dab772dd4a68a7bba5d9460685547ff8e17d899", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_3": { "locked": { "lastModified": 1730741070, "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", @@ -996,27 +674,13 @@ "type": "github" } }, - "nixpkgs_10": { - "locked": { - "lastModified": 1682134069, - "narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fd901ef4bf93499374c5af385b2943f5801c0833", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "nixpkgs_2": { "locked": { - "lastModified": 1734424634, - "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "type": "github" }, "original": { @@ -1044,11 +708,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1736523798, - "narHash": "sha256-Xb8mke6UCYjge9kPR9o4P1nVrhk7QBbKv3xQ9cj7h2s=", + "lastModified": 1740367490, + "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "130595eba61081acde9001f43de3248d8888ac4a", + "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", "type": "github" }, "original": { @@ -1075,11 +739,27 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1718149104, - "narHash": "sha256-Ds1QpobBX2yoUDx9ZruqVGJ/uQPgcXoYuobBguyKEh8=", + "lastModified": 1740367490, + "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e913ae340076bbb73d9f4d3d065c2bca7caafb16", + "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1682134069, + "narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fd901ef4bf93499374c5af385b2943f5801c0833", "type": "github" }, "original": { @@ -1087,54 +767,6 @@ "type": "indirect" } }, - "nixpkgs_7": { - "locked": { - "lastModified": 1697723726, - "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { - "locked": { - "lastModified": 1703255338, - "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "6df37dc6a77654682fe9f071c62b4242b5342e04", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_9": { - "locked": { - "lastModified": 1736701207, - "narHash": "sha256-jG/+MvjVY7SlTakzZ2fJ5dC3V1PrKKrUEOEE30jrOKA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ed4a395ea001367c1f13d34b1e01aa10290f67d6", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nmd": { "inputs": { "nixpkgs": [ @@ -1173,45 +805,6 @@ "type": "gitlab" } }, - "nuscht-search": { - "inputs": { - "flake-utils": "flake-utils", - "ixx": "ixx", - "nixpkgs": [ - "catppuccin", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733773348, - "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=", - "owner": "NuschtOS", - "repo": "search", - "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, - "osx-kvm": { - "flake": false, - "locked": { - "lastModified": 1701316418, - "narHash": "sha256-Sk8LYhFovoMX1ln7DWYArJQphW2a4h8Xg7/ZEZXwZv4=", - "owner": "kholia", - "repo": "OSX-KVM", - "rev": "09daff670a7eb9ff616073df329586c5995623a9", - "type": "github" - }, - "original": { - "owner": "kholia", - "repo": "OSX-KVM", - "type": "github" - } - }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ @@ -1223,7 +816,7 @@ "lanzaboote", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_3" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1731363552, @@ -1293,15 +886,12 @@ "impermanence": "impermanence", "lanzaboote": "lanzaboote", "lix": "lix", - "lix-eval-jobs": "lix-eval-jobs", "lix-module": "lix-module", "mobile-nixos": "mobile-nixos", "nix-on-droid": "nix-on-droid", - "nixDarwin": "nixDarwin", - "nixThePlanet": "nixThePlanet", "nixosHardware": "nixosHardware", - "nixpkgs": "nixpkgs_9", - "treefmt-nix": "treefmt-nix_2", + "nixpkgs": "nixpkgs_6", + "treefmt-nix": "treefmt-nix", "vscode-server": "vscode-server" } }, @@ -1409,54 +999,18 @@ "type": "github" } }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ - "lix-eval-jobs", "nixpkgs" ] }, "locked": { - "lastModified": 1732292307, - "narHash": "sha256-5WSng844vXt8uytT5djmqBCkopyle6ciFgteuA9bJpw=", + "lastModified": 1739829690, + "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "705df92694af7093dfbb27109ce16d828a79155f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1736154270, - "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b", + "rev": "3d0579f5cc93436052d94b73925b48973a104204", "type": "github" }, "original": { @@ -1467,8 +1021,8 @@ }, "vscode-server": { "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_10" + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1729422940, diff --git a/flake.nix b/flake.nix index 34a3717..4b6946e 100644 --- a/flake.nix +++ b/flake.nix @@ -28,10 +28,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; dream2nix.url = "github:nix-community/dream2nix"; - nixThePlanet.url = "github:MatthewCroughan/NixThePlanet"; # not following nixpkgs on purpose - nixDarwin = { - url = "github:LnL7/nix-darwin"; - }; nix-on-droid.url = "github:nix-community/nix-on-droid"; lix = { url = "git+https://git@git.lix.systems/lix-project/lix"; # FIXME update @@ -42,11 +38,6 @@ inputs.lix.follows = "lix"; inputs.nixpkgs.follows = "nixpkgs"; }; - lix-eval-jobs = { - url = "git+https://git.lix.systems/lix-project/nix-eval-jobs"; - inputs.lix.follows = "lix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; mobile-nixos = { url = "github:NixOS/mobile-nixos"; flake = false; From 52109a6671276fc7a062d24d244fcf5fdb01266e Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 27 Feb 2025 09:50:23 +0100 Subject: [PATCH 09/21] Use `useFetchCargoVendor` --- packages/spotify-adblocked/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/spotify-adblocked/default.nix b/packages/spotify-adblocked/default.nix index f44acea..599f7dc 100644 --- a/packages/spotify-adblocked/default.nix +++ b/packages/spotify-adblocked/default.nix @@ -15,7 +15,9 @@ let rev = "5a3281dee9f889afdeea7263558e7a715dcf5aab"; hash = "sha256-UzpHAHpQx2MlmBNKm2turjeVmgp5zXKWm3nZbEo0mYE="; }; - cargoHash = "sha256-wPV+ZY34OMbBrjmhvwjljbwmcUiPdWNHFU3ac7aVbIQ="; + + useFetchCargoVendor = true; + cargoHash = "sha256-oGpe+kBf6kBboyx/YfbQBt1vvjtXd1n2pOH6FNcbF8M="; patchPhase = '' substituteInPlace src/lib.rs \ From 866af533ef0581d1a95f479269151bb004f6271d Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 27 Feb 2025 09:50:33 +0100 Subject: [PATCH 10/21] Rename `kdePackages.xdg-desktop-portal-kde` --- modules/xdg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/xdg/default.nix b/modules/xdg/default.nix index 3dc5b50..078ee8e 100644 --- a/modules/xdg/default.nix +++ b/modules/xdg/default.nix @@ -9,7 +9,7 @@ xdg-desktop-portal-hyprland xdg-desktop-portal-gnome xdg-desktop-portal - xdg-desktop-portal-kde + kdePackages.xdg-desktop-portal-kde ]; extraPortals = with pkgs; [ xdg-desktop-portal-wlr @@ -17,7 +17,7 @@ xdg-desktop-portal-hyprland xdg-desktop-portal-gnome xdg-desktop-portal - xdg-desktop-portal-kde + kdePackages.xdg-desktop-portal-kde ]; xdgOpenUsePortal = true; wlr.enable = true; From 3171475f90ef9ecbddea96bd751b90a3b1c2611e Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 27 Feb 2025 09:50:46 +0100 Subject: [PATCH 11/21] Reanme `services.pulseaudio` --- modules/pipewire/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/pipewire/default.nix b/modules/pipewire/default.nix index fac17a0..3e324a1 100644 --- a/modules/pipewire/default.nix +++ b/modules/pipewire/default.nix @@ -2,7 +2,7 @@ { services.pipewire.enable = true; - hardware.pulseaudio = { + services.pulseaudio = { enable = false; }; } From 6d8bbd3b94497811a4f0fa9b52c1ca2371622d13 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 27 Feb 2025 09:50:56 +0100 Subject: [PATCH 12/21] Custom overlay for Lix's `nix-eval-jobs` no more needed --- modules/nix/default.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/modules/nix/default.nix b/modules/nix/default.nix index 49227c9..c6edb78 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -6,18 +6,6 @@ ... }: { - nixpkgs.overlays = [ - (final: _: { - nix-eval-jobs = - (fleetFlake.inputs.lix-eval-jobs.packages.${final.system}.nix-eval-jobs.override { - nix = final.nix; - }) - // { - nix = final.nix; - }; - }) - ]; - environment.systemPackages = [ pkgs.nix-fast-build ]; nix = { From 52d0f2ad8d25b6260349aac755118e6563dd6f78 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 27 Feb 2025 09:51:14 +0100 Subject: [PATCH 13/21] Disable `macos-ventura` module --- hosts/picard/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix index 104a454..b2ed365 100644 --- a/hosts/picard/default.nix +++ b/hosts/picard/default.nix @@ -35,7 +35,7 @@ "hass-poweroff" "forgejo-runners" "teamviewer" - "macos-ventura" + # "macos-ventura" "sunshine" "mount-sisko" "adb" From fb21aab2e3c2400fe0446d33ca49ace6bbebd4ed Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 27 Feb 2025 09:51:35 +0100 Subject: [PATCH 14/21] `ddcci-driver` patch no more needed --- hosts/picard/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix index b2ed365..36434c0 100644 --- a/hosts/picard/default.nix +++ b/hosts/picard/default.nix @@ -118,15 +118,16 @@ # https://github.com/NixOS/nixpkgs/issues/328909 boot.extraModulePackages = [ - (config.boot.kernelPackages.ddcci-driver.overrideAttrs (old: { - patches = [ ]; - src = pkgs.fetchFromGitLab { - owner = "${old.pname}-linux"; - repo = "${old.pname}-linux"; - rev = "7853cbfc28bc62e87db79f612568b25315397dd0"; - hash = "sha256-QImfvYzMqyrRGyrS6I7ERYmteaTijd8ZRnC6+bA9OyM="; - }; - })) + # (config.boot.kernelPackages.ddcci-driver.overrideAttrs (old: { + # patches = [ ]; + # src = pkgs.fetchFromGitLab { + # owner = "${old.pname}-linux"; + # repo = "${old.pname}-linux"; + # rev = "7853cbfc28bc62e87db79f612568b25315397dd0"; + # hash = "sha256-QImfvYzMqyrRGyrS6I7ERYmteaTijd8ZRnC6+bA9OyM="; + # }; + # })) + config.boot.kernelPackages.ddcci-driver ]; # systemd.services.ddcci = { From 0bef8299c2f52c5f2866c98159310859c194a221 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 27 Feb 2025 09:51:56 +0100 Subject: [PATCH 15/21] Unused arg --- hosts/module.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/module.nix b/hosts/module.nix index a59d4e6..5b3e2f6 100644 --- a/hosts/module.nix +++ b/hosts/module.nix @@ -278,7 +278,6 @@ in ( { config, - pkgs, ... }: { From e86705a8b7ace92bcc88a635764b958a4652ae44 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 27 Feb 2025 09:52:02 +0100 Subject: [PATCH 16/21] Flake output renamed --- hosts/module.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/module.nix b/hosts/module.nix index 5b3e2f6..da0aa63 100644 --- a/hosts/module.nix +++ b/hosts/module.nix @@ -274,7 +274,7 @@ in extraHmModules = config.extraHmModules; in [ - config.homeManager.nixosModule + config.homeManager.nixosModules.home-manager ( { config, From aa63b0d3e0f46b1eb61175db870a4b08c5010c7a Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 27 Feb 2025 09:52:10 +0100 Subject: [PATCH 17/21] Unused module --- hosts/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/default.nix b/hosts/default.nix index b76a20d..b9d2db1 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -69,7 +69,6 @@ }; extraModules = [ inputs.disko.nixosModules.disko - inputs.nixThePlanet.nixosModules.macos-ventura inputs.lix-module.nixosModules.default inputs.lanzaboote.nixosModules.lanzaboote inputs.catppuccin.nixosModules.catppuccin From 74ff7d0cff027871cd3db16360e57da02c5ed7bb Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 27 Feb 2025 09:52:15 +0100 Subject: [PATCH 18/21] Option renamed --- hmModules/niri/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hmModules/niri/default.nix b/hmModules/niri/default.nix index ded045b..8e0baf1 100644 --- a/hmModules/niri/default.nix +++ b/hmModules/niri/default.nix @@ -83,7 +83,7 @@ in theme = let inherit (config.lib.formats.rasi) mkLiteral; - cfg = config.programs.fzf.catppuccin; + cfg = config.catppuccin.fzf; palette = (lib.importJSON "${config.catppuccin.sources.palette}/palette.json").${cfg.flavor}.colors; selectColor = color: palette.${color}.hex; From 9601ff024b5677fedaaf70cdfa17dde38724331c Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 27 Feb 2025 09:52:42 +0100 Subject: [PATCH 19/21] Format --- hmModules/discord/default.nix | 10 ++++++---- hmModules/git/default.nix | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/hmModules/discord/default.nix b/hmModules/discord/default.nix index f750cb7..f766f1a 100644 --- a/hmModules/discord/default.nix +++ b/hmModules/discord/default.nix @@ -1,9 +1,11 @@ { pkgs, ... }: { - home.packages = [ (pkgs.discord.override { - withOpenASAR = true; - withVencord = true; - }) ]; + home.packages = [ + (pkgs.discord.override { + withOpenASAR = true; + withVencord = true; + }) + ]; home.file.".config/discord/settings.json".text = builtins.toJSON { SKIP_HOST_UPDATE = true; }; diff --git a/hmModules/git/default.nix b/hmModules/git/default.nix index 52fcf80..d040d53 100644 --- a/hmModules/git/default.nix +++ b/hmModules/git/default.nix @@ -35,8 +35,8 @@ in credential.credentialStore = "cache"; core = { - fsmonitor = true; - untrackedcache = true; + fsmonitor = true; + untrackedcache = true; }; fetch.writeCommitGraph = true; }; From a3c722e9f841a5c464d875eeef4882ec8ec12f40 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 27 Feb 2025 15:24:14 +0100 Subject: [PATCH 20/21] Fix `ddcci` --- hosts/picard/default.nix | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix index 36434c0..50aa7a4 100644 --- a/hosts/picard/default.nix +++ b/hosts/picard/default.nix @@ -116,31 +116,21 @@ "i2c-dev" # needed? ]; - # https://github.com/NixOS/nixpkgs/issues/328909 boot.extraModulePackages = [ - # (config.boot.kernelPackages.ddcci-driver.overrideAttrs (old: { - # patches = [ ]; - # src = pkgs.fetchFromGitLab { - # owner = "${old.pname}-linux"; - # repo = "${old.pname}-linux"; - # rev = "7853cbfc28bc62e87db79f612568b25315397dd0"; - # hash = "sha256-QImfvYzMqyrRGyrS6I7ERYmteaTijd8ZRnC6+bA9OyM="; - # }; - # })) config.boot.kernelPackages.ddcci-driver ]; - # systemd.services.ddcci = { - # script = '' - # echo 'ddcci 0x37' > /sys/bus/i2c/devices/i2c-2/new_device - # ''; - # wantedBy = [ "graphical.target" ]; - # restartIfChanged = false; - # serviceConfig = { - # Type = "oneshot"; - # RemainAfterExit = true; - # }; - # }; + systemd.services.ddcci = { + script = '' + echo 'ddcci 0x37' > /sys/bus/i2c/devices/i2c-2/new_device + ''; + wantedBy = [ "graphical.target" ]; + restartIfChanged = false; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; + }; boot.loader.efi.canTouchEfiVariables = true; boot.loader.systemd-boot = { From 78d4ee01fd16596e789695c6f581e1db6bf9b0f2 Mon Sep 17 00:00:00 2001 From: Seven of Nine Date: Thu, 27 Feb 2025 15:01:39 +0000 Subject: [PATCH 21/21] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'emacs-overlay': 'github:nix-community/emacs-overlay/ee8442abce734e9a1d0e5824818062bcbf358e73' (2025-02-27) → 'github:nix-community/emacs-overlay/1d3a6e22ae1e938a2fd284b67ea9eb4d0ce044af' (2025-02-27) • Updated input 'lix': 'git+https://git@git.lix.systems/lix-project/lix?ref=refs/heads/main&rev=8082f0b8434a81db309ac8abf1cf32532ba9168e' (2025-02-27) → 'git+https://git@git.lix.systems/lix-project/lix?ref=refs/heads/main&rev=03ade5e6d75cb7705900cf696505b836fc831be0' (2025-02-27) • Updated input 'nixosHardware': 'github:NixOS/nixos-hardware/d58f642ddb23320965b27beb0beba7236e9117b5' (2025-02-24) → 'github:NixOS/nixos-hardware/009b764ac98a3602d41fc68072eeec5d24fc0e49' (2025-02-27) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/0196c0175e9191c474c26ab5548db27ef5d34b05' (2025-02-24) → 'github:NixOS/nixpkgs/5135c59491985879812717f4c9fea69604e7f26f' (2025-02-26) --- flake.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index a90094c..328a3a8 100644 --- a/flake.lock +++ b/flake.lock @@ -122,11 +122,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1740622367, - "narHash": "sha256-7TpBfGb24DrQrdW94T5x0vHN0GF2I50fkP+YX5r6JqE=", + "lastModified": 1740648034, + "narHash": "sha256-pDAnvLZOIGjf0A92m+uxZxbIvcbT4wo4LmMCemA0Zi8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "ee8442abce734e9a1d0e5824818062bcbf358e73", + "rev": "1d3a6e22ae1e938a2fd284b67ea9eb4d0ce044af", "type": "github" }, "original": { @@ -464,11 +464,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1740629216, - "narHash": "sha256-i6fadzFVD7B8XWXa2ycPoVlpSJ5SeWcZ8LLzfzYedKs=", + "lastModified": 1740647693, + "narHash": "sha256-pYxhtDAOmlbP4XqgjIvbpi7CFtX8USH6DlRybS2Jxu4=", "ref": "refs/heads/main", - "rev": "8082f0b8434a81db309ac8abf1cf32532ba9168e", - "revCount": 17513, + "rev": "03ade5e6d75cb7705900cf696505b836fc831be0", + "revCount": 17515, "type": "git", "url": "https://git@git.lix.systems/lix-project/lix" }, @@ -569,11 +569,11 @@ }, "nixosHardware": { "locked": { - "lastModified": 1740387674, - "narHash": "sha256-pGk/aA0EBvI6o4DeuZsr05Ig/r4uMlSaf5EWUZEWM10=", + "lastModified": 1740646007, + "narHash": "sha256-dMReDQobS3kqoiUCQIYI9c0imPXRZnBubX20yX/G5LE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d58f642ddb23320965b27beb0beba7236e9117b5", + "rev": "009b764ac98a3602d41fc68072eeec5d24fc0e49", "type": "github" }, "original": { @@ -739,11 +739,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1740367490, - "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", + "lastModified": 1740560979, + "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", + "rev": "5135c59491985879812717f4c9fea69604e7f26f", "type": "github" }, "original": {