diff --git a/flake.lock b/flake.lock index 86a75a8..7b428e3 100644 --- a/flake.lock +++ b/flake.lock @@ -66,28 +66,6 @@ "type": "github" } }, - "devshell": { - "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1713532798, - "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=", - "owner": "numtide", - "repo": "devshell", - "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -104,36 +82,6 @@ "type": "github" } }, - "flake-compat_2": { - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -155,42 +103,6 @@ "type": "github" } }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1715865404, - "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-root": { - "locked": { - "lastModified": 1713493429, - "narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=", - "owner": "srid", - "repo": "flake-root", - "rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "flake-root", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -227,24 +139,6 @@ "type": "github" } }, - "flake-utils_3": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -267,28 +161,6 @@ "type": "github" } }, - "gitignore_2": { - "inputs": { - "nixpkgs": [ - "nixvim", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -317,11 +189,11 @@ ] }, "locked": { - "lastModified": 1716457508, - "narHash": "sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo=", + "lastModified": 1717316182, + "narHash": "sha256-Xi0EpZcu39N0eW7apLjFfUOR9y80toyjYizez7J1wMI=", "owner": "nix-community", "repo": "home-manager", - "rev": "850cb322046ef1a268449cf1ceda5fd24d930b05", + "rev": "9b53a10f4c91892f5af87cf55d08fba59ca086af", "type": "github" }, "original": { @@ -337,37 +209,16 @@ ] }, "locked": { - "lastModified": 1715381426, - "narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=", + "lastModified": 1716736833, + "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=", "owner": "nix-community", "repo": "home-manager", - "rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-23.11", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_3": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1716448020, - "narHash": "sha256-u1ddoBOILtLVX4NYzqSZ9Qaqusql1M4reLd1fs554hY=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "25dedb0d52c20448f6a63cc346df1adbd6ef417e", + "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -395,11 +246,11 @@ ] }, "locked": { - "lastModified": 1716618639, - "narHash": "sha256-H3kcJDVqDmXZ9IfVtqObL3JUx/a0ERn6gWBTn+7vwN4=", + "lastModified": 1717012808, + "narHash": "sha256-Wn0fbjqmpIiuPUWnvxu85a9sPYtSd/2tcPDhAYW54RM=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "a358c56a163b3b7d149571e853a8f75b2c1ceb38", + "rev": "a8e6557f29fa0cbcc2c54d15f9664c14ae2a3e98", "type": "github" }, "original": { @@ -421,11 +272,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1713369831, - "narHash": "sha256-G4OGxvlIIjphpkxcRAkf1QInYsAeqbfNh6Yl1JLy2uM=", + "lastModified": 1716805126, + "narHash": "sha256-yqJWx74e16Gk4pwW5DWfI4orTKeWezKFNbW7eaojpLw=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "850f27322239f8cfa56b122cc9a278ab99a49015", + "rev": "2eb19b872bc0a5f336b9b934ba96ea029e4da8c2", "type": "github" }, "original": { @@ -444,11 +295,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1716382614, - "narHash": "sha256-dwUYl8jyMNKidPEM9gTafcRe+3pUh2rH3ZlBrUpsvnw=", + "lastModified": 1717281900, + "narHash": "sha256-NBwB16qOv8TKaPg62UXfy+RojsDC+DLZPtohUqUyIM4=", "owner": "astro", "repo": "microvm.nix", - "rev": "a59c3167f673ce29b65c674deb2bee73d151a96c", + "rev": "16ec47e1fae62bcc2a76e164b7101152ad98849c", "type": "github" }, "original": { @@ -457,27 +308,6 @@ "type": "github" } }, - "nix-darwin": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1716329735, - "narHash": "sha256-ap51w+VqG21vuzyQ04WrhI2YbWHd3UGz0e7dc/QQmoA=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "eac4f25028c1975a939c8f8fba95c12f8a25e01c", - "type": "github" - }, - "original": { - "owner": "lnl7", - "repo": "nix-darwin", - "type": "github" - } - }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -502,11 +332,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1716173274, - "narHash": "sha256-FC21Bn4m6ctajMjiUof30awPBH/7WjD0M5yqrWepZbY=", + "lastModified": 1717248095, + "narHash": "sha256-e8X2eWjAHJQT82AAN+mCI0B68cIDBJpqJ156+VRrFO0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d9e0b26202fd500cf3e79f73653cce7f7d541191", + "rev": "7b49d3967613d9aacac5b340ef158d493906ba79", "type": "github" }, "original": { @@ -518,16 +348,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1716361217, - "narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=", + "lastModified": 1717144377, + "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f", + "rev": "805a384895c696f802a9bf5bf4720f37385df547", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -550,11 +380,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1716330097, - "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", + "lastModified": 1717196966, + "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", + "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", "type": "github" }, "original": { @@ -564,61 +394,6 @@ "type": "github" } }, - "nixvim": { - "inputs": { - "devshell": "devshell", - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts_2", - "flake-root": "flake-root", - "home-manager": "home-manager_3", - "nix-darwin": "nix-darwin", - "nixpkgs": [ - "nixpkgs-unstable" - ], - "pre-commit-hooks": "pre-commit-hooks", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1716566815, - "narHash": "sha256-WO3MF4W1SrSD0lanU1n7dfuHizeSLfDHJNEir9exlcM=", - "owner": "nix-community", - "repo": "nixvim", - "rev": "9d858de2e9ab136d1c53d92af62fed8fccf492ab", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixvim", - "type": "github" - } - }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat_3", - "gitignore": "gitignore_2", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ], - "nixpkgs-stable": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1716213921, - "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ @@ -661,8 +436,7 @@ "microvm": "microvm", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", - "nixpkgs-unstable": "nixpkgs-unstable", - "nixvim": "nixvim" + "nixpkgs-unstable": "nixpkgs-unstable" } }, "rust-overlay": { @@ -750,42 +524,6 @@ "repo": "default", "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": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1715940852, - "narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "2fba33a182602b9d49f0b2440513e5ee091d838b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } } }, "root": "root", diff --git a/hosts/default.nix b/hosts/default.nix index 452e2fa..6478346 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -40,6 +40,7 @@ in lanzaboote.nixosModules.lanzaboote ./desktop ./configuration_desktop.nix + ../modules/hardware/hydraCache.nix ../modules/hardware/remoteBuilder.nix nixos-hardware.nixosModules.common-cpu-amd nixos-hardware.nixosModules.common-gpu-amd diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix index 9d2d790..6fc0367 100644 --- a/hosts/desktop/default.nix +++ b/hosts/desktop/default.nix @@ -68,7 +68,7 @@ gnupg.agent = { enable = true; enableSSHSupport = true; - pinentryFlavor = "curses"; + pinentryPackage = pkgs.pinentry-curses; }; }; diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix index 7165135..fffe005 100644 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -36,7 +36,6 @@ #yubioath-flutter nitrokey-app kicad - yuzu-mainline # Display #light # xorg.xbacklight not supported. Other option is just use xrandr. diff --git a/hosts/jupiter/default.nix b/hosts/jupiter/default.nix index 0a4cdc8..cf2edaf 100644 --- a/hosts/jupiter/default.nix +++ b/hosts/jupiter/default.nix @@ -53,7 +53,7 @@ gnupg.agent = { enable = false; enableSSHSupport = true; - pinentryFlavor = "curses"; + pinentryPackage = pkgs.pinentry-curses; }; }; diff --git a/hosts/kabtop/default.nix b/hosts/kabtop/default.nix index e405831..fbac8b1 100644 --- a/hosts/kabtop/default.nix +++ b/hosts/kabtop/default.nix @@ -62,7 +62,7 @@ gnupg.agent = { enable = true; enableSSHSupport = true; - pinentryFlavor = "curses"; + pinentryPackage = pkgs.pinentry-curses; }; }; diff --git a/hosts/laptop/default.nix b/hosts/laptop/default.nix index 4df69f8..04058d4 100644 --- a/hosts/laptop/default.nix +++ b/hosts/laptop/default.nix @@ -65,7 +65,7 @@ gnupg.agent = { enable = true; enableSSHSupport = true; - pinentryFlavor = "curses"; + pinentryPackage = pkgs.pinentry-curses; }; }; diff --git a/hosts/nas/default.nix b/hosts/nas/default.nix index f74cc34..2788530 100644 --- a/hosts/nas/default.nix +++ b/hosts/nas/default.nix @@ -53,7 +53,7 @@ gnupg.agent = { enable = false; enableSSHSupport = true; - pinentryFlavor = "curses"; + pinentryPackage = pkgs.pinentry-curses; }; }; diff --git a/hosts/nasbackup/default.nix b/hosts/nasbackup/default.nix index 117ac24..ffd40c1 100644 --- a/hosts/nasbackup/default.nix +++ b/hosts/nasbackup/default.nix @@ -45,7 +45,7 @@ gnupg.agent = { enable = false; enableSSHSupport = true; - pinentryFlavor = "curses"; + pinentryPackage = pkgs.pinentry-curses; }; }; diff --git a/hosts/nasbackup/hardware-configuration.nix b/hosts/nasbackup/hardware-configuration.nix index b932e1c..94a992d 100644 --- a/hosts/nasbackup/hardware-configuration.nix +++ b/hosts/nasbackup/hardware-configuration.nix @@ -51,7 +51,6 @@ }; services.btrbk = { - extraPackages = [ pkgs.lz4 ]; instances = { hf = { onCalendar = "hourly"; diff --git a/hosts/server/default.nix b/hosts/server/default.nix index 75eb746..0b2cffc 100644 --- a/hosts/server/default.nix +++ b/hosts/server/default.nix @@ -57,7 +57,7 @@ gnupg.agent = { enable = true; enableSSHSupport = true; - pinentryFlavor = "curses"; + pinentryPackage = pkgs.pinentry-curses; }; }; diff --git a/hosts/steamdeck/default.nix b/hosts/steamdeck/default.nix index 21b3fbe..1e5f90a 100644 --- a/hosts/steamdeck/default.nix +++ b/hosts/steamdeck/default.nix @@ -66,7 +66,7 @@ gnupg.agent = { enable = true; enableSSHSupport = true; - #pinentryFlavor = "curses"; + #pinentryPackage = pkgs.pinentry-curses; }; }; diff --git a/modules/hardware/backup.nix b/modules/hardware/backup.nix index 94574ee..cb345e5 100644 --- a/modules/hardware/backup.nix +++ b/modules/hardware/backup.nix @@ -10,6 +10,5 @@ roles = [ "source" "info" "send" ]; } ]; - extraPackages = [ pkgs.lz4 ]; }; } diff --git a/modules/shell/zsh.nix b/modules/shell/zsh.nix index 5f6793b..43af6c4 100644 --- a/modules/shell/zsh.nix +++ b/modules/shell/zsh.nix @@ -9,7 +9,7 @@ zsh = { enable = true; dotDir = ".config/zsh_nix"; - enableAutosuggestions = true; # Auto suggest options and highlights syntact, searches in history for options + autosuggestion.enable = true; # Auto suggest options and highlights syntact, searches in history for options syntaxHighlighting.enable = true; history.size = 10000; diff --git a/modules/wm/sway/home.nix b/modules/wm/sway/home.nix index d230bdc..fdc772e 100644 --- a/modules/wm/sway/home.nix +++ b/modules/wm/sway/home.nix @@ -18,6 +18,7 @@ wayland.windowManager.sway = { enable = true; + checkConfig = false; config = rec { menu = "${pkgs.bemenu}/bin/bemenu-run -m -1 --hf '#ffff00' --tf '#888888' --nf '#00ff40' --hb '#424242' | xargs ${pkgs.sway}/bin/swaymsg exec --"; left = "m";