configs/nixos/secrets.nix

@@ -1,17 +0,0 @@
-{
-  inputs,
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-  secretsDirectory = builtins.toString inputs.nix-secrets;
-in {
-  imports = [
-    inputs.sops-nix.nixosModules.sops
-  ];
-  sops = {
-    defaultSopsFile = "${secretsDirectory}/common.yaml";
-    validateSopsFiles = false;
-  };
-}

hosts/archlaptop-vm/default.nix

@@ -15,7 +15,7 @@ inputs.nixpkgs.lib.nixosSystem {
     ../../configs/nixos/common.nix
     ../../configs/nixos/printing.nix
     ../../configs/nixos/sound.nix
-    ../../configs/nixos/interactive-networking.nix
+    ../../configs/nixos/networking.nix
     ../../configs/nixos/i3
     ({
       config,
@@ -46,10 +46,8 @@ inputs.nixpkgs.lib.nixosSystem {
 
       programs.zsh.enable = true;
       environment.shells = with pkgs; [zsh];
-      users.mutableUsers=false;
       # Define a user account. Don't forget to set a password with ‘passwd’.
       users.users.${config.host.user} = {
-        hashedPasswordFile=config.sops.secrets.gv-password.path;
         isNormalUser = true;
         description = "Gabe Venberg";
         shell = pkgs.zsh;

hosts/archlaptop-vm/secrets.nix

@@ -1,14 +0,0 @@
-{
-  inputs,
-  config,
-  lib,
-  pkgs,
-  ...
-}: {
-  imports=[
-  ../../configs/nixos/secrets.nix
-  ];
-  sops.secrets.gv-password = {
-    neededForUsers = true;
-  };
-}

hosts/workstation-vm/default.nix

@@ -17,7 +17,7 @@ inputs.nixpkgs.lib.nixosSystem {
     ../../roles/nixos/graphical-vm.nix
     ../../configs/nixos/printing.nix
     ../../configs/nixos/sound.nix
-    ../../configs/nixos/interactive-networking.nix
+    ../../configs/nixos/networking.nix
     ../../configs/nixos/nfsv2.nix
     ../../configs/nixos/i3
     ../../configs/nixos/common.nix

hosts/workstation-vm/secrets.nix

@@ -4,11 +4,17 @@
   lib,
   pkgs,
   ...
-}: {
+}: let
+  secretsDirectory = builtins.toString inputs.nix-secrets;
+in {
   imports = [
-  ../../configs/nixos/secrets.nix
+    inputs.sops-nix.nixosModules.sops
   ];
-  sops.secrets.gv-password = {
+  sops = {
+    defaultSopsFile = "${secretsDirectory}/common.yaml";
+    validateSopsFiles = false;
+    secrets.gv-password={
       neededForUsers=true;
     };
+  };
 }

roles/nixos/power-saving.nix

@@ -1,10 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
-  powerManagement.powertop.enable = true;
-  powerManagement.enable = true;
-  powerManaagement.cpuFreqGovernor = "ondemand";
-}