moving along... at 2:47 am

etc/nix/home/home.nix

@@ -1,6 +1,9 @@
 { ... }:
 {
-  imports = [ ./den.nix ];
+  imports = [
+    ./hosts
+    ./modules
+  ];
 
   den.enable = true;
   den.user = "vix";

etc/nix/home/hosts/default.nix

@@ -4,5 +4,6 @@
     ./unknown.nix
 
     ./niji.nix
+    ./vyxn.nix
   ];
 }

etc/nix/home/hosts/niji.nix

@@ -15,20 +15,27 @@ in
 
   config = mkIf cfg.enable {
     den = {
+      dir.self = "${config.den.dir.home}/den";
+      dir.opt = "${config.den.dir.home}/.opt";
+
       apps = {
         alacritty.enable = true;
         gnome.enable = true;
         openrgb.enable = true;
         polybar.enable = true;
         tor.enable = true;
+
+        go.goPath = ".opt/go";
       };
 
-      modules = {
+      packs = {
         comfy.enable = true;
         development.enable = true;
         fonts.enable = true;
         media.enable = true;
+
         xdg.enable = true;
+        xdg.userDirRoot = "${config.den.dir.home}/stuff";
       };
     };
 

etc/nix/home/hosts/unknown.nix

@@ -14,7 +14,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    den.modules = {
+    den.packs = {
       comfy.enable = true;
     };
 

etc/nix/home/hosts/vyxn.nix

@@ -0,0 +1,58 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+with lib;
+let
+  cfg = config.den.hosts.vyxn;
+in
+{
+  options.den.hosts.vyxn = {
+    enable = mkEnableOption "vyxn host";
+  };
+
+  config = mkIf cfg.enable {
+    den = {
+      apps = {
+        alacritty.enable = true;
+        tor.enable = true;
+      };
+
+      packs = {
+        comfy.enable = true;
+        development.enable = true;
+      };
+    };
+
+    home.packages = with pkgs; [
+      zip
+      wmctrl
+
+      # installed globally
+      # _1password-cli
+      # _1password-gui
+
+      # net util
+      rdap
+      whois
+      subnetcalc
+      dnsutils
+      nmap
+
+      kitty
+
+      vscode
+    ];
+
+    # services.syncthing.enable = true;
+
+    # programs.gpg.enable = true;
+
+    # services.gpg-agent = {
+    #   enable = true;
+    #   pinentryPackage = pkgs.pinentry-gnome3;
+    # };
+  };
+}

etc/nix/home/apps/go.nix → etc/nix/home/modules/apps/go.nix

@@ -6,22 +6,28 @@
 }:
 with lib;
 let
+  # https://github.com/nix-community/home-manager/blob/release-24.11/modules/programs/go.nix#L41
+  goFullPath = "${config.home.homeDirectory}/${config.programs.go.goPath}";
   cfg = config.den.apps.go;
 in
 {
-  options.den.apps.go.enable = mkEnableOption "golang";
+  options.den.apps.go = {
+    enable = mkEnableOption "golang";
+
+    goPath = mkOption {
+      type = types.str;
+      default = "opt/go";
+    };
+  };
 
   config = mkIf cfg.enable {
 
     programs.go = {
-      enable = true;
-      goPath = "opt/go";
+      enable = mkDefault true;
+      goPath = mkDefault cfg.goPath;
     };
 
-    home.sessionPath = [
-      # go paths
-      "${config.programs.go.goPath}/bin"
-    ];
+    home.sessionPath = [ "${goFullPath}/bin" ];
 
     programs.helix.languages = {
       language-server.gopls.command = "${pkgs.gopls}/bin/gopls";

etc/nix/home/modules/apps/helix.nix

@@ -0,0 +1,78 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+with lib;
+let
+  cfg = config.den.apps.helix;
+in
+{
+  options.den.apps.helix.enable = mkEnableOption "helix";
+
+  config = mkIf cfg.enable {
+
+    home.packages = with pkgs; [
+      nixd # nix lsp
+      marksman # markdown lsp
+      vscode-langservers-extracted
+    ];
+
+    programs.helix = {
+      enable = true;
+
+      settings = {
+        theme = "monokai";
+        editor.lsp.display-inlay-hints = true;
+      };
+
+      languages.language = [
+        # nix
+        {
+          name = "nix";
+          auto-format = true;
+          language-servers = [ "nixd" ];
+          formatter.command = "${pkgs.nixfmt-rfc-style}/bin/nixfmt";
+        }
+        # html
+        {
+          name = "html";
+          language-servers = [ "vscode-html-language-server" ];
+          formatter = {
+            command = "prettier";
+            args = [
+              "--stdin-filepath"
+              "file.html"
+            ];
+          };
+          auto-format = true;
+        }
+        # json
+        {
+          name = "json";
+          language-servers = [
+            {
+              name = "vscode-json-language-server";
+              except-features = [ "format" ];
+            }
+          ];
+          auto-format = true;
+        }
+        # markdown
+        {
+          name = "markdown";
+          language-servers = [ "marksman" ];
+          formatter = {
+            command = "prettier";
+            args = [
+              "--stdin-filepath"
+              "file.md"
+            ];
+          };
+          auto-format = true;
+        }
+      ];
+    };
+  };
+}

etc/nix/home/apps/openrgb.nix → etc/nix/home/modules/apps/openrgb.nix

@@ -6,7 +6,7 @@
 }:
 with lib;
 let
-  den_pkgs = pkgs.callPackage ../packages { };
+  den_pkgs = pkgs.callPackage ../../../packages { };
 
   cfg = config.den.apps.openrgb;
 in

etc/nix/home/apps/rust.nix → etc/nix/home/modules/apps/rust.nix

@@ -13,9 +13,7 @@ in
 
   config = mkIf cfg.enable {
 
-    home.packages = [
-      pkgs.rust-analyzer
-    ];
+    home.packages = [ pkgs.rust-analyzer ];
 
     home.sessionVariables = {
       RUSTUP_HOME = "${config.den.dir.opt}/rustup";

etc/nix/home/modules/default.nix

@@ -1,12 +1,11 @@
 { ... }:
 {
   imports = [
-    ./comfy.nix
-    ./development.nix
-    ./fonts.nix
-    ./media.nix
+    ./den.nix
     ./shell.nix
-    ./x11.nix
-    ./xdg.nix
+    ./workspace.nix
+
+    ./apps
+    ./packs
   ];
 }

etc/nix/home/den.nix → etc/nix/home/modules/den.nix

@@ -19,12 +19,6 @@ let
   cfg = config.den;
 in
 {
-  imports = [
-    ./apps
-    ./hosts
-    ./modules
-  ];
-
   options.den = {
     enable = mkOption {
       type = types.bool;
@@ -45,7 +39,7 @@ in
     dir = {
       self = mkOption {
         type = types.path;
-        default = "${cfg.dir.home}/den";
+        default = "${cfg.dir.opt}/den";
       };
 
       home = mkOption {
@@ -84,13 +78,11 @@ in
 
   config = mkIf cfg.enable {
 
-    # enable some modules by default
-    den.modules = {
-      shell = {
-        enable = true;
-        aliases = {
-          hm = "home-manager";
-        };
+    # enable some packs by default
+    den.shell = {
+      enable = true;
+      aliases = {
+        hm = "home-manager";
       };
     };
 
@@ -114,7 +106,6 @@ in
 
     home.sessionPath = [
       "${cfg.dir.self}/bin"
-      "${cfg.dir.home}/bin"
       "${cfg.dir.home}/rbin"
     ];
 

etc/nix/home/modules/packs/comfy.nix

@@ -0,0 +1,21 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+with lib;
+let
+  cfg = config.den.packs.comfy;
+in
+{
+  options.den.packs.comfy.enable = mkEnableOption "comfy module";
+
+  config = mkIf cfg.enable {
+    den.apps = {
+      neofetch.enable = true;
+    };
+
+    den.packs = { };
+  };
+}