From 0ab65ae59de37b2c309a7437b15dc2adcd94898b Mon Sep 17 00:00:00 2001 From: Tao Tien <29749622+taotien@users.noreply.github.com> Date: Tue, 15 Oct 2024 19:21:20 -0700 Subject: [PATCH] fix errors --- flake.nix | 6 +++--- systems/BASED.nix | 1 + users/tao/nushell/stuff.nu | 8 ++------ 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/flake.nix b/flake.nix index 9e289bb..222afd1 100644 --- a/flake.nix +++ b/flake.nix @@ -103,6 +103,7 @@ else throw "Have you forgotten to run nixos-anywhere with `--generate-hardware-config nixos-facter ./facter.json`?"; } agenix.nixosModules.default + determinate.nixosModules.default home-manager.nixosModules.home-manager ./systems/BASED.nix ./systems/NOlaptop.nix @@ -110,10 +111,9 @@ ./extras/uwuraid.nix ./extras/dev.nix ./extras/gaming.nix - nixos-cosmic.nixosModules.default - ./extras/cosmic.nix + # nixos-cosmic.nixosModules.default + # ./extras/cosmic.nix # ./extras/ssrov-laptop.nix - determinate.nixosModules.default ]; }; NOmom = nixpkgs.lib.nixosSystem { diff --git a/systems/BASED.nix b/systems/BASED.nix index 8b03b03..0551a0a 100644 --- a/systems/BASED.nix +++ b/systems/BASED.nix @@ -167,6 +167,7 @@ experimental-features = "nix-command flakes"; auto-optimise-store = true; trusted-users = ["root" "@wheel"]; + nix-path = "nixpkgs=flake:nixpkgs"; system-features = [ "benchmark" "big-parallel" diff --git a/users/tao/nushell/stuff.nu b/users/tao/nushell/stuff.nu index d2944b7..fb06fa6 100644 --- a/users/tao/nushell/stuff.nu +++ b/users/tao/nushell/stuff.nu @@ -63,12 +63,8 @@ def ns [package] { def nr [package] { nix search nixpkgs $package } -def rebuild [--no-builders (-n), subcommand] { - if $no_builders { - sudo nice -n19 nixos-rebuild $subcommand --builders "" --flake /home/tao/projects/NOflake/ --impure --verbose - } else { - sudo nice -n19 nixos-rebuild $subcommand --flake /home/tao/projects/NOflake/ --impure --verbose - } +def rebuild --wrapped [subcommand, ...rest] { + sudo nice -n19 nixos-rebuild $subcommand --flake /home/tao/projects/NOflake/ --impure --verbose ...$rest } # def post-rebuild [] { # # rm -r ~/.config/helix/runtime/grammars/