diff --git a/configuration.nix b/configuration.nix index a0ae7cd..0d3947c 100644 --- a/configuration.nix +++ b/configuration.nix @@ -124,6 +124,13 @@ services.hardware.bolt.enable = true; + system.activationScripts.diff = { + supportsDryActivation = true; + text = '' + ${pkgs.nvd}/bin/nvd --nix-bin-dir=${pkgs.nix}/bin diff /run/current-system "$systemConfig" + ''; + }; + # System system.stateVersion = "24.11"; system.autoUpgrade.enable = true; diff --git a/flake.nix b/flake.nix index 6efb1b0..d04c0b3 100644 --- a/flake.nix +++ b/flake.nix @@ -4,24 +4,31 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/release-24.11"; #nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + disko = { + url = github:nix-community/disko/latest; + inputs.nixpkgs.follows = "nixpkgs"; + }; nixos-cosmic = { url = "github:lilyinstarlight/nixos-cosmic"; inputs.nixpkgs.follows = "nixpkgs"; }; home-manager = { - url = "github:nix-community/home-manager/release-24.11"; + url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; pinix.url = "github:remi-dupre/pinix"; }; - outputs = inputs@{ self, nixpkgs, nixos-cosmic, home-manager, nixos-hardware, pinix, ... }: { + outputs = inputs@{ self, nixpkgs, disko, nixos-cosmic, home-manager, nixos-hardware, pinix, ... }: { nixosConfigurations = { "nixos" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [ + # Add Disko for disk management + disko.nixosModules.disko + ./disko-config.nix ./gnome.nix ./configuration.nix ./hardware-configuration.nix @@ -32,6 +39,9 @@ system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [ + # Add Disko for disk management + disko.nixosModules.disko + ./disko-config.nix ./gnome.nix ./shepard.nix ./configuration.nix @@ -49,6 +59,9 @@ system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [ + # Add Disko for disk management + disko.nixosModules.disko + ./disko-config.nix ./edi.nix ./configuration.nix ./hardware-configuration.nix @@ -59,6 +72,9 @@ system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [ + # Add Disko for disk management + disko.nixosModules.disko + ./disko-config.nix ./garrus.nix ./gnome.nix ./configuration.nix @@ -83,6 +99,9 @@ system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [ + # Add Disko for disk management + disko.nixosModules.disko + ./disko-config.nix ./pixel-slate.nix ./configuration.nix ]; @@ -92,6 +111,9 @@ system = "aarch64-linux"; specialArgs = { inherit inputs; }; modules = [ + # Add Disko for disk management + disko.nixosModules.disko + ./disko-config.nix ./drack.nix ./gnome.nix ./configuration.nix @@ -107,6 +129,9 @@ "vm" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ + # Add Disko for disk management + disko.nixosModules.disko + ./disko-config.nix ./vm.nix ./configuration.nix ./hardware-configuration.nix diff --git a/home.nix b/home.nix index 2495c92..9edbfd2 100644 --- a/home.nix +++ b/home.nix @@ -20,7 +20,6 @@ deja-dup libreoffice-fresh signal-desktop - ]; programs.bash = { diff --git a/hosts/x86_64/garrus/configuration.nix b/hosts/x86_64/garrus/configuration.nix index bd95533..9cd4f34 100644 --- a/hosts/x86_64/garrus/configuration.nix +++ b/hosts/x86_64/garrus/configuration.nix @@ -1,9 +1,9 @@ { config, pkgs, ... }: { - # Latest kernel needed for best support + # lemp13 needs newer than the 6.6 boot.kernelPackages = pkgs.linuxPackages_latest; - + # Name your host machine networking.hostName = "garrus"; diff --git a/partitions/luks-lvm.nix b/partitions/luks-lvm.nix index 596dcf1..5b107b9 100644 --- a/partitions/luks-lvm.nix +++ b/partitions/luks-lvm.nix @@ -69,4 +69,4 @@ }; }; }; -} +} \ No newline at end of file