diff --git a/flake.lock b/flake.lock index e55ab23..4d41d4b 100644 --- a/flake.lock +++ b/flake.lock @@ -455,11 +455,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1739214665, - "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", + "lastModified": 1741010256, + "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", + "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246", "type": "github" }, "original": { diff --git a/modules/bin/nix-scripts.nix b/modules/bin/nix-scripts.nix index e026cd4..41f6273 100644 --- a/modules/bin/nix-scripts.nix +++ b/modules/bin/nix-scripts.nix @@ -11,7 +11,7 @@ ${pkgs.alejandra}/bin/alejandra . &>/dev/null ${pkgs.git}/bin/git diff -U0 echo "NixOS Rebuilding..." - ${pkgs.unstable.nh}/bin/nh home switch ~/.nixos + ${pkgs.nh}/bin/nh home switch ~/.nixos gen=$(home-manager generations | head -n1 | ${pkgs.gawk}/bin/awk '{print "Gen" $5 " @ " $1 "-" $2}') ${pkgs.git}/bin/git commit --no-gpg-sign -am "Home $gen" popd @@ -24,7 +24,7 @@ ${pkgs.alejandra}/bin/alejandra . &>/dev/null ${pkgs.git}/bin/git diff -U0 echo "NixOS Rebuilding..." - ${pkgs.unstable.nh}/bin/nh os switch ~/.nixos + ${pkgs.nh}/bin/nh os switch ~/.nixos gen=$(sudo nix-env --list-generations --profile /nix/var/nix/profiles/system | ${pkgs.gnugrep}/bin/grep current | ${pkgs.gawk}/bin/awk '{print "Gen" $1 " @ " $2 "-" $3}') ${pkgs.git}/bin/git commit --no-gpg-sign -am "System $gen" popd @@ -41,7 +41,7 @@ echo "Updating nix-flake..." nix flake update --flake . echo "NixOS Rebuilding..." - ${pkgs.unstable.nh}/bin/nh os switch ~/.nixos + ${pkgs.nh}/bin/nh os switch ~/.nixos gen=$(sudo nix-env --list-generations --profile /nix/var/nix/profiles/system | ${pkgs.gnugrep}/bin/grep current | ${pkgs.gawk}/bin/awk '{print "Gen" $1 " @ " $2 "-" $3}') ${pkgs.git}/bin/git commit --no-gpg-sign -am "Upgrade $gen" popd @@ -58,7 +58,7 @@ echo "Updating nix-flake..." nix flake update --flake . echo "NixOS Building..." - ${pkgs.unstable.nh}/bin/nh os build ~/.nixos + ${pkgs.nh}/bin/nh os build ~/.nixos popd ''; in { diff --git a/modules/home/zsh/tools.nix b/modules/home/zsh/tools.nix index 717853f..e58811e 100644 --- a/modules/home/zsh/tools.nix +++ b/modules/home/zsh/tools.nix @@ -13,6 +13,7 @@ python311Packages.radian ranger thefuck + unstable.mmtui unzip vim w3m diff --git a/modules/programs.nix b/modules/programs.nix index 39140d0..2a0007a 100644 --- a/modules/programs.nix +++ b/modules/programs.nix @@ -44,6 +44,7 @@ in { pkgs.mosquitto pkgs.mpv pkgs.mupdf + pkgs.nh pkgs.nix-index pkgs.nix-output-monitor pkgs.obsidian @@ -53,7 +54,6 @@ in { pkgs.ranger pkgs.sops pkgs.spotify - pkgs.unstable.nh pkgs.vim pkgs.vlc pkgs.vscode