split up flake and use emacs as nixos module

flake.nix

@@ -26,24 +26,9 @@
         imports = [
           wrappers.flakeModules.wrappers
           ./modules/theme.nix
-          ./modules/programs/emacs/emacs.nix
+          ./hosts.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

@@ -0,0 +1,31 @@
+{ 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,23 +1,18 @@
 {
-  inputs,
   pkgs,
   config,
   ...
 }:
 let
-  c = ((pkgs.callPackage inputs.base16.lib { }).mkSchemeAttrs config.theme.name).withHashtag;
+  c = config.scheme.withHashtag;
 in
 {
-  home.stateVersion = "26.05";
+  home-manager.users.lucy = {
-  gtk = {
+    home.stateVersion = "26.05";
-    enable = true;
+    gtk = {
-    colorScheme = "dark";
+      enable = true;
-    cursorTheme = {
+      colorScheme = "dark";
-      name = "macOS";
+      gtk3.extraCss = ''
-      package = pkgs.apple-cursor;
-      size = 24;
-    };
-    gtk3.extraCss = ''
         @define-color theme_bg_color ${c.base00};
         @define-color theme_fg_color ${c.base05};
         @define-color theme_base_color ${c.base00};
@@ -30,8 +25,32 @@ in
         @define-color warning_color ${c.base0A};
         @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#

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

modules/hosts/nerv/#theme.nix#

@@ -1,23 +0,0 @@
-{
-  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

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

modules/hosts/nerv/.#theme.nix

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

modules/hosts/nerv/configuration.nix

@@ -1,10 +1,14 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 {
-  imports =
+  imports = [
-    [ 
+    ./hardware-configuration.nix
-      ./hardware-configuration.nix
+  ];
-    ];
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
@@ -19,43 +23,42 @@
   hardware.graphics.enable = true;
   services.xserver.videoDrivers = [ "nvidia" ];
   hardware.nvidia = {
-  		  modesetting.enable = true;
+    modesetting.enable = true;
-		  powerManagement.enable = false;
+    powerManagement.enable = false;
-		  open = true;
+    open = true;
-		  nvidiaSettings = true;
+    nvidiaSettings = true;
-		  package = config.boot.kernelPackages.nvidiaPackages.stable;
+    package = config.boot.kernelPackages.nvidiaPackages.stable;
-};
+  };
 
   # Set your time zone.
   time.timeZone = "Europe/Berlin";
 
-   i18n.defaultLocale = "en_US.UTF-8";
+  i18n.defaultLocale = "en_US.UTF-8";
-   services.desktopManager.gnome.enable = true;
+  services.desktopManager.gnome.enable = true;
-   services.displayManager.gdm.enable = true;
+  services.displayManager.gdm.enable = true;
-   services.xserver.xkb.layout = "us";
+  services.xserver.xkb.layout = "us";
-   services.pipewire = {
+  services.pipewire = {
-     enable = true;
+    enable = true;
-     pulse.enable = true;
+    pulse.enable = true;
   };
   nixpkgs.config.allowUnfree = true;
 
-   # Define a user account. Don't forget to set a password with ‘passwd’.
+  # Define a user account. Don't forget to set a password with ‘passwd’.
-   users.users.lucy = {
+  users.users.lucy = {
-     isNormalUser = true;
+    isNormalUser = true;
-     extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
+    extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
-     packages = with pkgs; [
+    packages = with pkgs; [
-       vesktop
+      vesktop
-	     google-chrome
+      google-chrome
-     ];
+    ];
-   };
+  };
 
-   environment.systemPackages = with pkgs; [
+  environment.systemPackages = with pkgs; [
-     fastfetch
+    fastfetch
-     wget
+    wget
-     git
+    git
-     clang
+    clang
-   ];
+  ];
   system.stateVersion = "26.05"; # Did you read the comment?
 
 }
-

modules/hosts/nerv/theme.nix

@@ -1,7 +0,0 @@
-{ 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.theme.name;
+  schemeName = config.scheme;
 in
 {
-  flake.wrappers.emacs =
+  wrappers.emacs =
     {
       pkgs,
       wlib,
@@ -17,7 +17,8 @@ in
     let
       scheme = (pkgs.callPackage inputs.base16.lib { }).mkSchemeAttrs schemeName;
     in
-    {
+      {
+        enable = true;
       imports = [
         wlib.wrapperModules.emacs
       ];