flake.nix

@@ -26,9 +26,24 @@
         imports = [
           wrappers.flakeModules.wrappers
           ./modules/theme.nix
-          ./hosts.nix
+          ./modules/programs/emacs/emacs.nix
         ];
-    
+        flake.nixosConfigurations.nerv = inputs.nixpkgs.lib.nixosSystem {
+          specialArgs = { inherit inputs; };
+          modules = [
+            base16.nixosModule
+            { scheme = "${inputs.tt-schemes}/base16/oxocarbon-dark.yaml"; }
+            ./modules/hosts/nerv/configuration.nix
+            config.flake.wrappers.emacs.install
+            { wrappers.emacs.enable = true; }
+            home-manager.nixosModules.home-manager {
+              home-manager.useGlobalPkgs = true;
+              home-manager.useUserPackages = true;
+              home-manager.extraSpecialArgs = { inherit inputs; };
+              home-manager.users.lucy = ./modules/home.nix;
+            }
+          ];
+        };
       }
     );
 }

hosts.nix

@@ -1,31 +0,0 @@
-{ inputs, config, ... }:
-let
-  themeName = "catppuccin-mocha";
-in
-{
-  flake.nixosConfigurations.nerv = inputs.nixpkgs.lib.nixosSystem {
-    specialArgs = { inherit inputs; };
-    modules = [
-      inputs.base16.nixosModule
-      { scheme = "${inputs.tt-schemes}/base16/${themeName}.yaml"; }
-      ./modules/hosts/nerv/configuration.nix
-      ./modules/home.nix
-      inputs.home-manager.nixosModules.home-manager
-      {
-        home-manager.useGlobalPkgs = true;
-        home-manager.useUserPackages = true;
-        home-manager.extraSpecialArgs = { inherit inputs; };
-      }
-      {
-        imports = [
-          (inputs.wrappers.lib.getInstallModule {
-            name = "emacs";
-            value = inputs.wrappers.lib.wrapperModules.emacs;
-          })
-          ./modules/programs/emacs/emacs.nix
-        ];
-
-      }
-    ];
-  };
-}

modules/home.nix

@@ -1,17 +1,22 @@
 {
+  inputs,
   pkgs,
   config,
   ...
 }:
 let
-  c = config.scheme.withHashtag;
+  c = ((pkgs.callPackage inputs.base16.lib { }).mkSchemeAttrs config.theme.name).withHashtag;
 in
 {
-  home-manager.users.lucy = {
   home.stateVersion = "26.05";
   gtk = {
     enable = true;
     colorScheme = "dark";
+    cursorTheme = {
+      name = "macOS";
+      package = pkgs.apple-cursor;
+      size = 24;
+    };
     gtk3.extraCss = ''
         @define-color theme_bg_color ${c.base00};
         @define-color theme_fg_color ${c.base05};
@@ -26,31 +31,7 @@ in
         @define-color error_color ${c.base08};
         @define-color success_color ${c.base0B};
     '';
-      gtk4.extraCss = ''
+
-        @define-color window_bg_color ${c.base00};
-        @define-color window_fg_color ${c.base05};
-        @define-color view_bg_color ${c.base00};
-        @define-color view_fg_color ${c.base05};
-        @define-color headerbar_bg_color ${c.base01};
-        @define-color headerbar_fg_color ${c.base05};
-        @define-color headerbar_border_color ${c.base02};
-        @define-color sidebar_bg_color ${c.base01};
-        @define-color sidebar_fg_color ${c.base05};
-        @define-color card_bg_color ${c.base01};
-        @define-color card_fg_color ${c.base05};
-        @define-color popover_bg_color ${c.base01};
-        @define-color popover_fg_color ${c.base05};
-        @define-color dialog_bg_color ${c.base01};
-        @define-color dialog_fg_color ${c.base05};
-        @define-color accent_bg_color ${c.base0D};
-        @define-color accent_fg_color ${c.base00};
-        @define-color accent_color ${c.base0D};
-        @define-color destructive_bg_color ${c.base08};
-        @define-color destructive_color ${c.base08};
-        @define-color warning_color ${c.base0A};
-        @define-color error_color ${c.base08};
-        @define-color success_color ${c.base0B};
-      '';
-    };
   };
+
 }

modules/hosts/nerv/#nerv.nix#

@@ -1,9 +0,0 @@
-{ inputs, ... }: {
-  flake.nixosConfigurations.nerv = inputs.nixpkgs.lib.nixosSystem {
-    modules = [
-      ./configuration.nix
-      
-    ];
-  };
-}
-  

modules/hosts/nerv/#theme.nix#

@@ -0,0 +1,23 @@
+{
+  inputs,
+  config,
+  lib,
+  ...
+}:
+let
+  schemeName = config.theme.name;
+in
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  scheme = (pkgs.callPackage inputs.base16.lib { }).mkSchemeAttrs schemeName;
+in
+{
+  
+
+}

modules/hosts/nerv/.#nerv.nix

@@ -1 +0,0 @@
-lucy@nerv.50314:1788169501

modules/hosts/nerv/.#theme.nix

@@ -0,0 +1 @@
+lucy@nerv.31959:1788169501

modules/hosts/nerv/configuration.nix

@@ -1,12 +1,8 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
 {
-  imports = [
+  imports =
+    [ 
       ./hardware-configuration.nix
     ];
 
@@ -62,3 +58,4 @@
   system.stateVersion = "26.05"; # Did you read the comment?
 
 }
+

modules/hosts/nerv/theme.nix

@@ -0,0 +1,7 @@
+{ inputs, config, lib, ... }: let
+  schemeName = config.theme.name;
+in
+  {config, lib, pkgs, ...}:
+
+  let scheme = (pkgs.callPackage inputs.base16.lib {}).mkSchemeAttrs schemeName; in
+  {}

modules/programs/emacs/emacs.nix

@@ -5,10 +5,10 @@
   ...
 }:
 let
-  schemeName = config.scheme;
+  schemeName = config.theme.name;
 in
 {
-  wrappers.emacs =
+  flake.wrappers.emacs =
     {
       pkgs,
       wlib,
@@ -18,7 +18,6 @@ in
       scheme = (pkgs.callPackage inputs.base16.lib { }).mkSchemeAttrs schemeName;
     in
     {
-        enable = true;
       imports = [
         wlib.wrapperModules.emacs
       ];