diff --git a/modules/base/fish.nix b/modules/base/fish.nix index d3c52ad..f4a91c6 100644 --- a/modules/base/fish.nix +++ b/modules/base/fish.nix @@ -24,12 +24,7 @@ }; homeManager.base = - { - lib, - osConfig, - pkgs, - ... - }: + { lib, pkgs, ... }: { catppuccin.fish.enable = true; @@ -55,8 +50,8 @@ }; functions = { checkHash = "nix hash to-sri --type sha256 $(nix-prefetch-url --unpack $argv)"; - deployNixberry = "${lib.getExe osConfig.programs.nh.package} os switch --target-host nixberry -H nixberry"; - deployLoptland = "${lib.getExe osConfig.programs.nh.package} os switch --target-host christophhollizeck.dev -H loptland"; + deployNixberry = "nixos-rebuild switch --flake .#nixberry --target-host nixberry --sudo --ask-sudo-password"; + deployLoptland = "nixos-rebuild switch --flake .#loptland --target-host christophhollizeck.dev --sudo --ask-sudo-password"; checkPR = ''cd /home/cholli/projects/NixOS/nixpkgs && ${lib.getExe pkgs.nixpkgs-review} pr $argv --post-result --systems "x86_64-linux aarch64-linux"''; }; plugins = with pkgs.fishPlugins; [ diff --git a/modules/hosts/nixberry/default.nix b/modules/hosts/nixberry/default.nix index ad0bc99..c2548d1 100644 --- a/modules/hosts/nixberry/default.nix +++ b/modules/hosts/nixberry/default.nix @@ -173,16 +173,6 @@ in uid = "019aac26-684c-7c2c-a43d-2253f4407d45"; use_global_settings = true; } - { - name = "work-laptop"; - ids = [ "192.168.178.48" ]; - tags = [ - "device_pc" - "os_windows" - ]; - uid = "019aac55-ae29-7c5e-aac0-baadd7157f92"; - use_global_settings = true; - } ]; };