4/30

hosts/configuration.nix

@@ -14,5 +14,6 @@
   };
   users.groups.plugdev = {};
   security.pam.services.swaylock = {};
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
   system.stateVersion = "22.11";
 }

hosts/default.nix

@@ -1,4 +1,4 @@
-{ lib, nixpkgs, username, home-manager, nixos-hardware, ... }:
+{ lib, nixpkgs, username, home-manager, nixos-hardware, sops-nix, ... }:
 
 let
   system = "x86_64-linux";
@@ -12,36 +12,36 @@ let
 in
   {
     t14 = lib.nixosSystem {
-    inherit system;
-    specialArgs = {
-      inherit username;
-      host = {
-        hostName = "t14";
+      inherit system;
+      specialArgs = {
+        inherit username;
+        host = {
+          hostName = "t14";
+        };
       };
-    };
-    modules = [
-      ./configuration.nix
-      ./t14/configuration.nix
-      nixos-hardware.nixosModules.lenovo-thinkpad-t14-amd-gen1
-      home-manager.nixosModules.home-manager {
-        home-manager.useGlobalPkgs = true;
-        home-manager.useUserPackages = true;
-        home-manager.extraSpecialArgs = {
-          inherit username;
-          host = {
-            hostName = "t14";
+      modules = [
+        sops-nix.nixosModules.sops
+        ./configuration.nix
+        ./t14/configuration.nix
+        nixos-hardware.nixosModules.lenovo-thinkpad-t14-amd-gen1
+        home-manager.nixosModules.home-manager {
+          home-manager.useGlobalPkgs = true;
+          home-manager.useUserPackages = true;
+          home-manager.extraSpecialArgs = {
+            inherit username;
           };
-        };
-        home-manager.users.${username} = {
-          programs.home-manager.enable = true;
-          imports = [
-            ./home.nix
-            ./t14/home.nix
+          home-manager.sharedModules = [
+            sops-nix.homeManagerModule
           ];
-        };
-      }
-    ];
-  };
+          home-manager.users.${username} = {
+            programs.home-manager.enable = true;
+            imports = [
+              ./t14/home.nix
+            ];
+          };
+        }
+      ];
+    };
 
-}
+  }
 

hosts/home.nix

@@ -8,6 +8,8 @@
         htop
         appimage-run
         ripgrep
+        fluxcd
+        k9s
       ];
     };
     systemd.user.startServices = "sd-switch";

hosts/t14/configuration.nix

@@ -1,4 +1,4 @@
-{ nixos-hardware, config, pkgs, ... }:
+{ config, pkgs, nixos-hardware, sops-nix, ... }:
 {
   imports =
     [ 
@@ -12,6 +12,7 @@
     fonts = {
       fonts = with pkgs; [
         spleen
+        roboto
       ];
     };
     programs.light.enable = true;

hosts/t14/home.nix

@@ -3,16 +3,17 @@
   imports = [
     ../../modules/wayland
     ../../modules/librewolf
+    ../home.nix
   ];
   home = {
     packages = with pkgs; [
-      neofetch
       pulseaudio
       pulsemixer
       alsa-utils
       discord
       signal-desktop
       runelite
+      framesh
     ];
   };
 }