more fixes

jhenderiks · jhenderiks · commit ab11ba8df14b · 2024-10-17T12:52:23.000-04:00
diff --git a/cmd/passwd b/cmd/passwd
@@ -17,7 +17,7 @@ PASSWD=$(mkpasswd)
 
 cat << EOF > $PASSWD_FILE
 {
-  _user.hashedPassword = "$PASSWD";
+  user.hashedPassword = "$PASSWD";
 }
 EOF
 
diff --git a/hosts/spinel/default.nix b/hosts/spinel/default.nix
@@ -11,7 +11,7 @@ inputs.nixpkgs.lib.nixosSystem {
     ./.passwd.nix # TODO: get rid of this
     ./hardware.nix
     {
-      _hostname = "spinel";
+      hostname = "spinel";
 
       boot.loader.systemd-boot.enable = true;
 
diff --git a/modules/common/apps/bitwarden.nix b/modules/common/apps/bitwarden.nix
@@ -11,8 +11,8 @@
   };
 
   config = lib.mkIf config.bitwarden.enable {
-    _macos.homebrew.casks = [ "bitwarden" ];
-    _nixos.environment.systemPackages = [ pkgs.bitwarden-desktop ];
-    _unfreePackages = [ "bitwarden" ];
+    macos.homebrew.casks = [ "bitwarden" ];
+    nixos.environment.systemPackages = [ pkgs.bitwarden-desktop ];
+    unfreePackages = [ "bitwarden" ];
   };
 }
diff --git a/modules/common/apps/brave.nix b/modules/common/apps/brave.nix
@@ -11,7 +11,7 @@
   };
 
   config = lib.mkIf config.brave.enable {
-    _macos.homebrew.casks = [ "brave-browser" ];
-    _nixos.environment.systemPackages = [ pkgs.brave ];
+    macos.homebrew.casks = [ "brave-browser" ];
+    nixos.environment.systemPackages = [ pkgs.brave ];
   };
 }
diff --git a/modules/common/apps/chrome.nix b/modules/common/apps/chrome.nix
@@ -19,7 +19,7 @@ in {
   };
 
   config = lib.mkIf config.chrome.enable {
-    _unfreePackages = [ "google-chrome" ];
+    unfreePackages = [ "google-chrome" ];
 
     environment.systemPackages = [ pkgs.google-chrome ];
 
diff --git a/modules/common/apps/firefox.nix b/modules/common/apps/firefox.nix
@@ -11,8 +11,8 @@
   };
 
   config = lib.mkIf config.firefox.enable {
-    _macos.homebrew.casks = [ "firefox" ];
-    _nixos.programs.firefox.enable = true;
-    _nixos._user.config.home-manager.programs.firefox.enable = true;
+    macos.homebrew.casks = [ "firefox" ];
+    # _nixos.user.home-manager.programs.firefox.enable = true;
+    nixos.environment.systemPackages = [ pkgs.firefox ];
   };
 }
diff --git a/modules/common/apps/kitty.nix b/modules/common/apps/kitty.nix
@@ -11,7 +11,7 @@
   };
 
   config = lib.mkIf config.kitty.enable {
-    _user.config.home-manager.programs.kitty.enable = true;
+    user.home-manager.programs.kitty.enable = true;
     environment.systemPackages = [ pkgs.kitty ];
   };
 }
diff --git a/modules/common/apps/ledger-live.nix b/modules/common/apps/ledger-live.nix
@@ -11,9 +11,9 @@
   };
 
   config = lib.mkIf config.ledger-live.enable {
-    _macos.homebrew.casks = [ "ledger-live" ];
+    macos.homebrew.casks = [ "ledger-live" ];
 
-    _nixos = {
+    nixos = {
       environment.systemPackages = [ pkgs.ledger-live-desktop ];
 
       services.udev.extraRules = ''
diff --git a/modules/common/apps/slack.nix b/modules/common/apps/slack.nix
@@ -11,7 +11,7 @@
   };
 
   config = lib.mkIf config.slack.enable {
-    _unfreePackages = [ "slack" ];
+    unfreePackages = [ "slack" ];
     environment.systemPackages = [ pkgs.slack ];
   };
 }
diff --git a/modules/common/apps/spotify.nix b/modules/common/apps/spotify.nix
@@ -11,8 +11,8 @@
   };
 
   config = lib.mkIf config.spotify.enable {
-    _macos.homebrew.casks = [ "spotify" ];
-    _nixos.environment.systemPackages = [ pkgs.spotify ];
-    _unfreePackages = [ "spotify" ];
+    macos.homebrew.casks = [ "spotify" ];
+    nixos.environment.systemPackages = [ pkgs.spotify ];
+    unfreePackages = [ "spotify" ];
   };
 }
diff --git a/modules/common/apps/vscode.nix b/modules/common/apps/vscode.nix
@@ -21,10 +21,9 @@ in {
   };
 
   config = lib.mkIf config.vscode.enable {
-    _macos.vscode.package = pkgs.vscode;
-    _unfreePackages = [ "visual-studio-code" ];
+    unfreePackages = [ "visual-studio-code" ];
 
-    _user.config.home-manager = {
+    user.home-manager = {
       programs.vscode = {
         enable = true;
 
diff --git a/modules/common/apps/zoom.nix b/modules/common/apps/zoom.nix
@@ -11,7 +11,7 @@
   };
 
   config = lib.mkIf config.zoom.enable {
-    _unfreePackages = [ "zoom" ];
+    unfreePackages = [ "zoom" ];
     environment.systemPackages = [ pkgs.zoom-us ];
   };
 }
diff --git a/modules/common/default.nix b/modules/common/default.nix
@@ -9,7 +9,7 @@
   ];
 
   config = {
-    _user.config.home-manager = {
+    user.home-manager = {
       imports = [
         inputs.catppuccin.homeManagerModules.catppuccin
       ];
diff --git a/modules/common/options.nix b/modules/common/options.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, options, pkgs, ... }:
 
 let
   mk = type: default: lib.mkOption {
@@ -10,9 +10,9 @@ let
   mkNoDefault = type: lib.mkOption { type = type; };
 
   osCommonOptions = with lib.types; {
-    _user = mk attrs {}; # TODO: need this?
+    # user = mk attrs {}; # TODO: need this?
     environment.systemPackages = mkListOf package [];
-    programs = mkAttrsOf attrs {};
+    # programs = mkAttrsOf attrs {};
     services = mkAttrsOf attrs {};
   };
 
@@ -28,58 +28,51 @@ let
   osConfig = builtins.mapAttrs (
     name: value: lib.mkMerge [
       (if pkgs.stdenv.isDarwin then config._macos.${name} else {})
-      (if pkgs.stdenv.isLinux then config._nixos.${name} else {})
+      (if pkgs.stdenv.isLinux then config.nixos.${name} else {})
     ]
-  ) osCommonOptions;
+  ) (if pkgs.stdenv.isDarwin then options.macos else options.nixos);#osCommonOptions;
 
   reduceUsers = fn: builtins.listToAttrs (
     map (
       user: { name = user; value = fn user; }
-    ) config._user.users
+    ) config.user.names
   );
 in {
   options = with lib.types; {
-    _hostname = mk str null;
+    macos.homebrew.casks = mkListOf str [];
 
-    _macos = osModule {
-      homebrew.casks = mkListOf str [];
-    };
-
-    _nixos = osModule {
-      systemd.services = mkAttrsOf attrs {};
-    };
+    nixos.environment.systemPackages = mkListOf package [];
+    nixos.services = mkAttrsOf attrs {};
+    nixos.systemd.services = mkAttrsOf attrs {};
 
-    _unfreePackages = mkListOf str [];
+    hostname = mk str null;
 
-    _user = {
-      config = {
-        # TODO: make setter functions for these that supply user as a variable?
-        home-manager = mkAttrsOf anything {};
-        users = mkAttrsOf anything {};
-      };
+    unfreePackages = mkListOf str [];
 
+    user = {
       hashedPassword = mk str null;
+      home-manager = mkAttrsOf anything {};
       homeBase = mk str "/home";
+      names = mkListOf str null;
       shell = mk str "fish";
-      users = mkListOf str null;
+      user = mkAttrsOf anything {};
     };
   };
 
   config = lib.mkMerge [
-    osConfig
     {
-      home-manager.users = reduceUsers (user: config._user.config.home-manager);
+      home-manager.users = reduceUsers (user: config.user.home-manager);
 
-      networking.hostName = config._hostname;
+      networking.hostName = config.hostname;
 
-      nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) config._unfreePackages;
+      nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) config.unfreePackages;
 
       users.users = reduceUsers (
         user: lib.mkMerge [
-          config._user.config.users
+          config.user.user
           {
-            home = "${config._user.homeBase}/${user}";
-            shell = pkgs.${config._user.shell};
+            home = "${config.user.homeBase}/${user}";
+            shell = pkgs.${config.user.shell};
           }
         ]
       );
diff --git a/modules/common/services/syncthing.nix b/modules/common/services/syncthing.nix
@@ -56,7 +56,7 @@ in {
     # TODO: macos
     # https://github.com/nix-community/home-manager/pull/5616
 
-    _nixos = {
+    nixos = {
       services.syncthing = {
         enable = true;
         user = user;
diff --git a/modules/common/shell/bash.nix b/modules/common/shell/bash.nix
@@ -1,6 +1,5 @@
 { pkgs, ... }:
 
 {
-  _macos.programs.bash.enable = true;
-  _user.config.home-manager.programs.bash.enable = true;
+  user.home-manager.programs.bash.enable = true;
 }
diff --git a/modules/common/shell/fish.nix b/modules/common/shell/fish.nix
@@ -2,6 +2,6 @@
 
 {
   programs.fish.enable = true;
-  _user.config.home-manager.programs.fish.enable = true;
+  user.home-manager.programs.fish.enable = true;
   environment.shells = [ pkgs.fish ];
 }
diff --git a/modules/common/shell/git.nix b/modules/common/shell/git.nix
@@ -6,9 +6,7 @@
     gh
   ];
 
-  _nixos.programs.git.enable = true;
-
-  _user.config.home-manager.programs.git = {
+  user.home-manager.programs.git = {
     enable = true;
 
     userName = lib.mkDefault "Justin Henderiks";
diff --git a/modules/macos/default.nix b/modules/macos/default.nix
@@ -1,6 +1,10 @@
 { config, inputs, lib, pkgs, ... }:
 
-{
+let
+  macosConfig = builtins.mapAttrs (
+    name: value: config.macos.${name}
+  ) options.macos;
+in {
   imports = [
     inputs.home-manager.darwinModules.home-manager
     inputs.mac-app-util.darwinModules.default
@@ -9,15 +13,18 @@
     ./system.nix
   ];
 
-  config = {
-    # environment.variables = { XDG_CONFIG_HOME = "~/.config"; };
-    
-    _user.homeBase = lib.mkForce "/Users";
+  config = lib.mkMerge [
+    macosConfig
+    {
+      # environment.variables = { XDG_CONFIG_HOME = "~/.config"; };
+      
+      user.homeBase = lib.mkForce "/Users";
 
-    security.pam.enableSudoTouchIdAuth = true;
+      security.pam.enableSudoTouchIdAuth = true;
 
-    services.nix-daemon.enable = true;
+      services.nix-daemon.enable = true;
 
-    system.stateVersion = 5;
-  };
+      system.stateVersion = 5;
+    }
+  ];
 }
diff --git a/modules/macos/homebrew.nix b/modules/macos/homebrew.nix
@@ -2,7 +2,7 @@
 
 {
   config = {
-    _user.config.home-manager.home.sessionPath = [ "/opt/homebrew/bin" ];
+    user.home-manager.home.sessionPath = [ "/opt/homebrew/bin" ];
 
     homebrew = {
       enable = true;
@@ -13,7 +13,7 @@
         upgrade = true;
       };
 
-      casks = config._macos.homebrew.casks;
+      casks = config.macos.homebrew.casks;
     };
 
     system.activationScripts.preUserActivation.text = ''
diff --git a/modules/macos/shell.nix b/modules/macos/shell.nix
@@ -17,15 +17,16 @@ let
             echo "Try again"
           done
         ''
-      ) config._user.users
+      ) config.user.names
     )}
   '';
-  shellPath = "/run/current-system/sw/bin/${config._user.shell}";
+  shellPath = "/run/current-system/sw/bin/${config.user.shell}";
 in {
   config = {
+    programs.bash.enable = true;
     programs.zsh.enable = true;
 
-    _user.config.home-manager = {
+    user.home-manager = {
       programs.zsh.enable = true;
 
       programs.kitty.settings = {
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
diff --git a/modules/nixos/gnome.nix b/modules/nixos/gnome.nix
diff --git a/modules/nixos/hyprland.nix b/modules/nixos/hyprland.nix

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ PASSWD=$(mkpasswd)`
`17`	`17`
`18`	`18`	`cat << EOF > $PASSWD_FILE`
`19`	`19`	`{`
`20`		`- _user.hashedPassword = "$PASSWD";`
	`20`	`+ user.hashedPassword = "$PASSWD";`
`21`	`21`	`}`
`22`	`22`	`EOF`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ inputs.nixpkgs.lib.nixosSystem {`
`11`	`11`	`./.passwd.nix # TODO: get rid of this`
`12`	`12`	`./hardware.nix`
`13`	`13`	`{`
`14`		`- _hostname = "spinel";`
	`14`	`+ hostname = "spinel";`
`15`	`15`
`16`	`16`	`boot.loader.systemd-boot.enable = true;`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`};`
`12`	`12`
`13`	`13`	`config = lib.mkIf config.brave.enable {`
`14`		`- _macos.homebrew.casks = [ "brave-browser" ];`
`15`		`- _nixos.environment.systemPackages = [ pkgs.brave ];`
	`14`	`+ macos.homebrew.casks = [ "brave-browser" ];`
	`15`	`+ nixos.environment.systemPackages = [ pkgs.brave ];`
`16`	`16`	`};`
`17`	`17`	`}`