singular lib.optional

README.md

@@ -40,40 +40,52 @@ nhmu
 
 ```nix
 {
-  description = "Home Manager configuration of john";
+  description = "John's system flake";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    home-manager = {
-      url = "github:nix-community/home-manager";
+    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
+    jsl-home = {
+      url = "git+https://gitea.john-stream.com/john/jsl-home?ref=dev";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    john-home-config = {
-      url = "path:/home/john/home-manager";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.home-manager.follows = "home-manager";
-    };
   };
 
-  outputs =
-    { nixpkgs, ... }@inputs:
+  outputs = { self, nixpkgs, ... }@inputs:
   let
    system = "x86_64-linux";
-      pkgs = nixpkgs.legacyPackages.${system};
-      homeManagerConfiguration = inputs.home-manager.lib.homeManagerConfiguration;
-      jslDefault = inputs.john-home-config.homeManagerModules.default;
-      userName = "john";
+   nixosSystem = nixpkgs.lib.nixosSystem;
+   hostName = "john-p14s";
   in
   {
-      homeConfigurations."${userName}" = homeManagerConfiguration {
-        inherit pkgs;
+    nixosConfigurations.${hostName} = nixosSystem {
+      specialArgs =
+      {
+        inherit inputs;
+        inherit system;
+      };
       modules = [
-          jslDefault {
-            user = "${userName}";
-            # Add any additional configuration here
+        ./hardware-configuration.nix
+        ./configuration.nix
+        inputs.jsl-home.nixosModules.default
+        {
+          stateVersion = "24.05";
+          user = "john";
+          root = true;
+          ssh = true;
+          profile = "personal";
+          enableShell = true;
+          _1password = true;
+          docker = true;
+          graphical = {
+            steam = true;
+            vscode = true;
+          };
+          extraImports = [
+            ./home-manager/john.nix
+            ./home-manager/gnome.nix
+            ./home-manager/ssh.nix
+          ];
         }
-          ./home.nix
-          # Add other home manager modules here
       ];
     };
   };

flake.nix

@@ -22,7 +22,10 @@
 
       # These will get applied to both the configured user and the root user (if enabled)
       userOptions = config: {
-        openssh.authorizedKeys.keyFiles = lib.optionals config.ssh [ ./personal_keys ];
+        openssh.authorizedKeys = lib.mkIf config.ssh (lib.mkMerge [
+          (lib.mkIf (config.profile == "personal") { keyFiles = [ ./keys/personal ]; })
+          (lib.mkIf (config.profile == "work") { keyFiles = [ ./keys/work ]; })
+        ]);
         shell = lib.mkIf config.enableShell pkgs.zsh;
       };
 
@@ -38,7 +41,6 @@
           _1password = config._1password;
           docker = config.docker;
           graphical = config.graphical;
-          steam = config.steam;
         }
       ] ++ config.extraImports;
 
@@ -54,14 +56,17 @@
           inputs.home-manager.nixosModules.default
         ];
         nix.settings.trusted-users = [ "root" "@wheel" ];
-        users.users.${config.user} = {
+        users.users.${config.user} = lib.mkMerge [
+          {
             isNormalUser = true;
             description = "John Lancaster";
             extraGroups = []
-          ++ lib.optionals config.root [ "wheel" ]
-          ++ lib.optionals config.docker [ "docker" ]
-          ++ lib.optionals config.networking.networkmanager.enable [ "networkmanager" ];
-        } // userOptions config;
+            ++ lib.optional config.root "wheel"
+            ++ lib.optional config.docker "docker"
+            ++ lib.optional config.networking.networkmanager.enable "networkmanager";
+          }
+          (userOptions config)
+        ];
 
         users.users.root = lib.mkIf config.root (userOptions config);
         security.sudo-rs = lib.mkIf config.root {

homeManagerModules/default.nix

@@ -62,15 +62,10 @@
     # # parentheses. Maybe you want to install Nerd Fonts with a limited number of
     # # fonts?
     # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
-  ] ++ lib.optionals config.graphical [
-    discord
-    spotify
-    sublime4
-    joplin-desktop
-  ] ++ lib.optionals config._1password [
-    _1password-cli
-    gh  # GitHub CLI with 1Password integration
-  ];
+  ]
+  ++ lib.optional config.graphical.discord discord
+  ++ lib.optional config.graphical.joplin joplin-desktop
+  ++ lib.optional config.graphical.sublime sublime4;
 
   # Home Manager can also manage your environment variables through
   # 'home.sessionVariables'. These will be explicitly sourced when using a

homeManagerModules/ghostty.nix

@@ -1,6 +1,6 @@
 { config, pkgs, lib, nixgl, ... }:
 {
-  home.sessionVariables = lib.mkIf (config.enableShell && config.graphical) {
+  home.sessionVariables = lib.mkIf (config.enableShell && config.graphical.ghostty) {
     TERMINAL = "ghostty";
   };
   
@@ -9,7 +9,7 @@
   nixGL.defaultWrapper = "mesa";
   nixGL.installScripts = [ "mesa" ];
 
-  programs.ghostty = lib.mkIf (config.enableShell && config.graphical) {
+  programs.ghostty = lib.mkIf (config.enableShell && config.graphical.ghostty) {
     enable = true;
     enableZshIntegration = true;
     package = config.lib.nixGL.wrap pkgs.ghostty;
@@ -52,7 +52,7 @@
   };
 
   # https://github.com/ghostty-org/ghostty/discussions/3763#discussioncomment-11699970
-  xdg.desktopEntries."com.mitchellh.ghostty" = lib.mkIf (config.enableShell && config.graphical) {
+  xdg.desktopEntries."com.mitchellh.ghostty" = lib.mkIf (config.enableShell && config.graphical.ghostty) {
     name = "Ghostty";
     type = "Application";
     comment = "A terminal emulator";

homeManagerModules/shell.nix

@@ -38,7 +38,9 @@
     };
     shellAliases.ls = "${pkgs.eza}/bin/eza -lgos type --no-time";
     initContent = lib.mkIf config._1password '' 
+      if [ -f "${config.home.homeDirectory}/.config/op/plugins.sh" ]; then
         source ${config.home.homeDirectory}/.config/op/plugins.sh
+      fi
     '';
   };
 }

homeManagerModules/vscode.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 {
-  programs.vscode = lib.mkIf config.graphical {
+  programs.vscode = lib.mkIf config.graphical.vscode {
     enable = true;
     package = pkgs.vscode;
     profiles.default.extensions = with pkgs.vscode-extensions; [

nixosModules/options.nix

@@ -60,15 +60,19 @@
     description = "Whether to enable docker stuff";
   };
 
-  options.graphical = lib.mkOption {
+  options.graphical = 
+    let
+      boolOption = lib.mkOption {
         type = lib.types.bool;
         default = false;
-    description = "Whether this system has a graphical environment";
       };
-
-  options.steam = lib.mkOption {
-    type = lib.types.bool;
-    default = false;
-    description = "Whether this system has Steam installed";
+    in
+    {
+      discord = boolOption;
+      ghostty = boolOption;
+      joplin = boolOption;
+      steam = boolOption;
+      sublime = boolOption;
+      vscode = boolOption;
     };
 }

nixosModules/steam.nix

@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }:
 {
-  programs.steam = lib.mkIf config.steam {
+  programs.steam = lib.mkIf config.graphical.steam {
     enable = true;
     gamescopeSession.enable = true;
     remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play