finished switching to modules

imports/fonts.nix

@@ -1,50 +0,0 @@
-_: {pkgs, ...}: {
-  #use a better tty
-  services.kmscon = {
-    enable = true;
-    hwRender = true;
-    extraConfig = ''
-      font-size=10
-    '';
-    fonts = [
-      {
-        name = "OverpassMono Nerd Font";
-        package =
-          pkgs.nerdfonts.override
-          {
-            fonts = ["Overpass"];
-          };
-      }
-      {
-        name = "Material Design Icons";
-        package = pkgs.material-design-icons;
-      }
-    ];
-  };
-  systemd.services = {
-    "autovt@tty1".enable = false;
-    "kmsconvt@tty1".enable = false;
-  };
-
-  fonts = {
-    fonts = [
-      pkgs.material-design-icons
-      (pkgs.nerdfonts.override
-        {
-          fonts = ["Overpass"];
-        })
-    ];
-    enableDefaultFonts = false;
-    fontDir.enable = true;
-    fontconfig = {
-      enable = true;
-      defaultFonts = {
-        serif = ["Overpass Nerd Font" "Material Design Icons"];
-        sansSerif = ["Overpass Nerd Font" "Material Design Icons"];
-        monospace = ["OverpassMono Nerd Font" "Material Design Icons"];
-      };
-      hinting.enable = true;
-      antialias = true;
-    };
-  };
-}

imports/git.nix

@@ -1,18 +0,0 @@
-_: {pkgs, ...}: {
-  programs.git = {
-    enable = true;
-    package = pkgs.gitMinimal;
-    config = {
-      user = {
-        name = "Gerg-L";
-        email = "GregLeyda@proton.me";
-      };
-      init = {
-        defaultBranch = "master";
-      };
-      push = {
-        autoSetupRemote = true;
-      };
-    };
-  };
-}

imports/theme.nix

@@ -1,46 +0,0 @@
-_: {pkgs, ...}: {
-  environment = {
-    systemPackages = [
-      pkgs.flat-remix-gtk
-      pkgs.flat-remix-icon-theme
-      pkgs.quintom-cursor-theme
-    ];
-    etc = {
-      "xdg/gtk-4.0/settings.ini".text = ''
-        [Settings]
-        gtk-cursor-theme-name=Quintom_Ink
-        gtk-cursor-theme-size=16
-        gtk-font-name = "Overpass Nerd Font 10"
-        gtk-icon-theme-name=Flat-Remix-Blue-Dark
-        gtk-theme-name=Flat-Remix-GTK-Blue-Darkest
-      '';
-      "xdg/gtk-3.0/settings.ini".text = ''
-        [Settings]
-        gtk-cursor-theme-name=Quintom_Ink
-        gtk-cursor-theme-size=16
-        gtk-font-name = "Overpass Nerd Font 10"
-        gtk-icon-theme-name=Flat-Remix-Blue-Dark
-        gtk-theme-name=Flat-Remix-GTK-Blue-Darkest
-      '';
-      "xdg/gtk-2.0/gtkrc".text = ''
-        gtk-cursor-theme-name = "Quintom_Ink"
-        gtk-cursor-theme-size = 16
-        gtk-font-name = "Overpass Nerd Font 10"
-        gtk-icon-theme-name = "Flat-Remix-Blue-Dark"
-        gtk-theme-name = "Flat-Remix-GTK-Blue-Darkest"
-      '';
-      "xdg/Xresources".text = ''
-        Xcursor.size: 16
-        Xcursor.theme: Quintom_Ink
-      '';
-    };
-  };
-  qt = {
-    enable = true;
-    style = "gtk2";
-    platformTheme = "gtk2";
-  };
-  services.xserver.displayManager.sessionCommands = ''
-    xrdb -load /etc/xdg/Xresources
-  '';
-}

modules/DE/default.nix

@@ -1,7 +1,7 @@
 inputs: {
   imports = [
+    (import ./dwm.nix inputs)
     (import ./gnome.nix inputs)
     (import ./xfce.nix inputs)
-    (import ./dwm.nix inputs)
   ];
 }

modules/DM/default.nix

@@ -1,6 +1,6 @@
 inputs: {
   imports = [
-    (import ./lightDM.nix inputs)
     (import ./autoLogin.nix inputs)
+    (import ./lightDM.nix inputs)
   ];
 }

modules/default.nix

@@ -1,13 +1,17 @@
 inputs: {
   imports = [
-    (import ./boot.nix inputs)
-    (import ./misc.nix inputs)
-    (import ./packages.nix inputs)
-    (import ./X11.nix inputs)
-    (import ./nix.nix inputs)
-    (import ./unfree.nix inputs)
     (import ./DE inputs)
     (import ./DM inputs)
+
+    (import ./boot.nix inputs)
+    (import ./git.nix inputs)
     (import ./hardware.nix inputs)
+    (import ./misc.nix inputs)
+    (import ./nix.nix inputs)
+    (import ./packages.nix inputs)
+    (import ./shell.nix inputs)
+    (import ./theming.nix inputs)
+    (import ./unfree.nix inputs)
+    (import ./X11.nix inputs)
   ];
 }

modules/git.nix

@@ -0,0 +1,35 @@
+_: {
+  pkgs,
+  options,
+  config,
+  lib,
+  ...
+}:
+with lib; let
+  cfg = config.localModules.git;
+in {
+  options.localModules.git = {
+    disable = mkOption {
+      type = types.bool;
+      default = false;
+    };
+  };
+  config = mkIf (! cfg.disable) {
+    programs.git = {
+      enable = true;
+      package = pkgs.gitMinimal;
+      config = {
+        user = {
+          name = "Gerg-L";
+          email = "GregLeyda@proton.me";
+        };
+        init = {
+          defaultBranch = "master";
+        };
+        push = {
+          autoSetupRemote = true;
+        };
+      };
+    };
+  };
+}

modules/shell.nix

@@ -1,22 +1,16 @@
-{
+{fetch-rs, ...}: {pkgs, ...}: rec {
-  fetch-rs,
-  suckless,
-  ...
-}: {pkgs, ...}: rec {
   #put:
   #source /run/current-system/sw/share/nix-direnv/direnvrc
   #in ~/.direnvrc
   #do i need to do this^?
   environment = {
     systemPackages = [
-      pkgs.dash
       pkgs.page
       pkgs.exa
       pkgs.direnv
       pkgs.nix-direnv
       pkgs.neovim
       fetch-rs.packages.${pkgs.system}.default
-      suckless.packages.${pkgs.system}.st
     ];
     binsh = "${pkgs.dash}/bin/dash"; #use dash for speed
     variables = {

modules/theming.nix

@@ -0,0 +1,109 @@
+_: {
+  pkgs,
+  options,
+  config,
+  lib,
+  ...
+}:
+with lib; let
+  cfg = config.localModules.theming;
+in {
+  options.localModules.theming = {
+    enable = mkEnableOption "";
+    kmscon.enable = mkEnableOption "";
+  };
+  config = mkMerge [
+    (
+      mkIf cfg.enable {
+        environment = {
+          systemPackages = [
+            pkgs.flat-remix-gtk
+            pkgs.flat-remix-icon-theme
+            pkgs.quintom-cursor-theme
+          ];
+          etc = {
+            "xdg/gtk-4.0/settings.ini".text = ''
+              [Settings]
+              gtk-cursor-theme-name=Quintom_Ink
+              gtk-cursor-theme-size=16
+              gtk-font-name = "Overpass Nerd Font 10"
+              gtk-icon-theme-name=Flat-Remix-Blue-Dark
+              gtk-theme-name=Flat-Remix-GTK-Blue-Darkest
+            '';
+            "xdg/gtk-3.0/settings.ini".text = ''
+              [Settings]
+              gtk-cursor-theme-name=Quintom_Ink
+              gtk-cursor-theme-size=16
+              gtk-font-name = "Overpass Nerd Font 10"
+              gtk-icon-theme-name=Flat-Remix-Blue-Dark
+              gtk-theme-name=Flat-Remix-GTK-Blue-Darkest
+            '';
+            "xdg/gtk-2.0/gtkrc".text = ''
+              gtk-cursor-theme-name = "Quintom_Ink"
+              gtk-cursor-theme-size = 16
+              gtk-font-name = "Overpass Nerd Font 10"
+              gtk-icon-theme-name = "Flat-Remix-Blue-Dark"
+              gtk-theme-name = "Flat-Remix-GTK-Blue-Darkest"
+            '';
+            "xdg/Xresources".text = ''
+              Xcursor.size: 16
+              Xcursor.theme: Quintom_Ink
+            '';
+          };
+        };
+        qt = {
+          enable = true;
+          style = "gtk2";
+          platformTheme = "gtk2";
+        };
+        services.xserver.displayManager.sessionCommands = ''
+          xrdb -load /etc/xdg/Xresources
+        '';
+      }
+    )
+    (mkIf cfg.kmscon.enable {
+      services.kmscon = {
+        enable = true;
+        hwRender = true;
+        extraConfig = ''
+          font-size=10
+        '';
+        fonts = [
+          {
+            name = "OverpassMono Nerd Font";
+            package =
+              pkgs.nerdfonts.override
+              {
+                fonts = ["Overpass"];
+              };
+          }
+        ];
+      };
+      systemd.services = {
+        "autovt@tty1".enable = false;
+        "kmsconvt@tty1".enable = false;
+      };
+
+      fonts = {
+        fonts = [
+          (pkgs.nerdfonts.override
+            {
+              fonts = ["Overpass"];
+            })
+        ];
+        enableDefaultFonts = false;
+        fontDir.enable = true;
+        fontconfig = {
+          enable = true;
+          defaultFonts = {
+            serif = ["Overpass Nerd Font"];
+            sansSerif = ["Overpass Nerd Font"];
+            monospace = ["OverpassMono Nerd Font"];
+          };
+          hinting.enable = true;
+          antialias = true;
+        };
+      };
+    })
+  ];
+}

systems/game-laptop/default.nix

@@ -6,11 +6,6 @@ inputs: {
   imports = [
     (import ./prime.nix inputs)
     (import ./gaming.nix inputs)
-
-    (import ../imports/fonts.nix inputs)
-    (import ../imports/git.nix inputs)
-    (import ../imports/shells.nix inputs)
-    (import ../imports/theme.nix inputs)
   ];
 
   localModules = {
@@ -19,6 +14,10 @@ inputs: {
       lightdm.enable = true;
       autoLogin = true;
     };
+    theming = {
+      enable = true;
+      kmscon.enable = true;
+    };
   };
   nixpkgs.allowedUnfree = [
     "nvidia-x11"

systems/gerg-desktop/default.nix

@@ -11,11 +11,6 @@ inputs: {
     (import ./spicetify.nix inputs)
     #(import ./mining.nix inputs)
     (import ./zfs inputs)
-
-    (import ../../imports/fonts.nix inputs)
-    (import ../../imports/git.nix inputs)
-    (import ../../imports/shells.nix inputs)
-    (import ../../imports/theme.nix inputs)
   ];
   system.stateVersion = "23.05";
 
@@ -29,6 +24,10 @@ inputs: {
       lightdm.enable = true;
       autoLogin = true;
     };
+    theming = {
+      enable = true;
+      kmscon.enable = true;
+    };
   };
   services.xserver.videoDrivers = ["amdgpu"];
 
@@ -43,9 +42,11 @@ inputs: {
     pkgs.cava #pretty audio
     pkgs.pipes-rs # more fun things
     pkgs.vlc #play stuff
+    inputs.suckless.packages.${pkgs.system}.st
   ];
-
+  #set webcord theme
   systemd.tmpfiles.rules = ["L+ /home/gerg/.config/WebCord/Themes/black - - - - ${self}/misc/black.theme.css"];
+
   networking = {
     hostName = settings.hostname;
     hostId = "288b56db";

systems/mom-laptop/default.nix

@@ -5,10 +5,6 @@ inputs: {
 }: {
   imports = [
     (import ./printing.nix inputs)
-    (import ../imports/fonts.nix inputs)
-    (import ../imports/git.nix inputs)
-    (import ../imports/shells.nix inputs)
-    (import ../imports/theme.nix inputs)
   ];
   localModules = {
     DM = {
@@ -16,6 +12,10 @@ inputs: {
       autoLogin = true;
     };
     DE.xfce.enable = true;
+    theming = {
+      enable = true;
+      kmscon.enable = true;
+    };
   };
 
   system.stateVersion = "22.11";