diff --git a/configuration.nix b/configuration.nix index 4861416..4760de9 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, user, allowed, secrets, rice, nvidia, ... }: +{ config, lib, pkgs, user, host, allowed, secrets, rice, nvidia, ... }: let in { @@ -67,6 +67,7 @@ in # $ nix search wget environment.systemPackages = with pkgs; [ ntfs3g + btrfs-progs git git-crypt wget diff --git a/flake.nix b/flake.nix index 3ee5ec5..26a04c9 100644 --- a/flake.nix +++ b/flake.nix @@ -79,7 +79,14 @@ modules = [ ./configuration.nix ]; - specialArgs = { inherit user pkgs-unstable allowed secrets rice nvidia; }; + specialArgs = let host = "NxXPS"; in { inherit user host pkgs-unstable allowed secrets rice nvidia; }; + }; + NxNORTH = nixpkgs.lib.nixosSystem { + inherit system; + modules = [ + ./configuration.nix + ]; + specialArgs = let host = "NxNORTH"; in { inherit user host pkgs-unstable allowed secrets rice nvidia; }; }; }; diff --git a/system-modules/hardware-configuration.nix b/system-modules/hardware-configuration.nix index 2e2583a..ad5a80b 100644 --- a/system-modules/hardware-configuration.nix +++ b/system-modules/hardware-configuration.nix @@ -1,4 +1,4 @@ -{ config, lib, user, pkgs, modulesPath, ... }: +{ config, lib, user, host, pkgs, modulesPath, ... }: { imports = [ @@ -19,10 +19,10 @@ device = "/dev/disk/by-label/EFI"; fsType = "vfat"; }; - fileSystems."/home/${user}/shared" = { - device = "/dev/disk/by-label/shared"; - fsType = "ntfs"; - }; + #fileSystems."/home/${user}/shared" = if { + # device = "/dev/disk/by-label/shared"; + # fsType = if host == "NxXPS" then "ntfs" else "btrfs"; + #}; swapDevices = [ { device = "/dev/disk/by-label/swap"; }