cleanup time (#212)

flake.nix

@@ -102,7 +102,6 @@
       inputs = {
         nixpkgs.follows = "nixpkgs";
         nixpkgs-24_05.follows = "";
-        utils.follows = "";
         flake-compat.follows = "";
       };
     };

home/isabel/configs/gui/browsers/chromium.nix

@@ -46,7 +46,6 @@ in
       # };
 
       package = chrome_pkg.override {
-        nss = pkgs.nss_latest;
         enableWideVine = true;
 
         commandLineArgs =
@@ -78,13 +77,11 @@ in
             "--disable-speech-synthesis-api"
           ]
           ++ lib.optionals (lib.isWayland osConfig) [
-            # Wayland
             # Disabled because hardware acceleration doesn't work
-            # when disabling --use-gl=egl, it's not gonna show any emoji
-            # and it's gonna be slow as hell
-
+            # when disabling --use-gl=egl, it's not gonna show any emojis
             # "--use-gl=egl"
 
+            # Wayland
             "--ozone-platform=wayland"
             "--enable-features=UseOzonePlatform"
           ];

hosts/amaterasu/default.nix

@@ -31,11 +31,7 @@ in
           tmpOnTmpfs = true;
           enableKernelTweaks = true;
           loadRecommendedModules = true;
-
-          plymouth = {
-            enable = true;
-            withThemes = true;
-          };
+          plymouth.enable = true;
 
           initrd = {
             enableTweaks = true;

hosts/luz/default.nix

@@ -34,7 +34,6 @@
       video.enable = false;
       sound.enable = false;
       bluetooth.enable = false;
-      printing.enable = false;
 
       networking = {
         optimizeTcp = false;

hosts/valkyrie/default.nix

@@ -20,11 +20,7 @@
         tmpOnTmpfs = true;
         enableKernelTweaks = true;
         loadRecommendedModules = true;
-
-        plymouth = {
-          enable = false;
-          withThemes = true;
-        };
+        plymouth.enable = false;
 
         initrd = {
           enableTweaks = true;
@@ -39,7 +35,6 @@
       video.enable = false;
       sound.enable = false;
       bluetooth.enable = false;
-      printing.enable = false;
       yubikeySupport.enable = false;
 
       security = {

modules/base/activation/default.nix

@@ -1,37 +1,6 @@
-{ pkgs, config, ... }:
 {
-  system.activationScripts = {
-    # https://github.com/colemickens/nixcfg/blob/main/mixins/ssh.nix
-    # symlink root's ssh config to ours
-    # to fix nix-daemon's ability to remote build since it sshs from the root account
-    root_ssh_config =
-      let
-        inherit (config.modules.system) mainUser;
-
-        sshDir = "${config.users.users.${mainUser}.home}/.ssh";
-      in
-      {
-        text = ''
-          (
-            # symlink root ssh config to ours so daemon can use our agent/keys/etc...
-            mkdir -p /root/.ssh
-            ln -sf ${sshDir}/config /root/.ssh/config
-            ln -sf ${sshDir}/known_hosts /root/.ssh/known_hosts
-            ln -sf ${sshDir}/known_hosts /root/.ssh/known_hosts
-          )
-        '';
-        deps = [ ];
-      };
-
-    diff = {
-      supportsDryActivation = true;
-      text = ''
-        if [[ -e /run/current-system ]]; then
-          echo "=== diff to current-system ==="
-          ${pkgs.nvd}/bin/nvd --nix-bin-dir='${config.nix.package}/bin' diff /run/current-system "$systemConfig"
-          echo "=== end of the system diff ==="
-        fi
-      '';
-    };
-  };
+  imports = [
+    ./diff.nix
+    ./root-ssh.nix
+  ];
 }

modules/base/activation/diff.nix

@@ -0,0 +1,13 @@
+{ pkgs, config, ... }:
+{
+  system.activationScripts.diff = {
+    supportsDryActivation = true;
+    text = ''
+      if [[ -e /run/current-system ]]; then
+        echo "=== diff to current-system ==="
+        ${pkgs.nvd}/bin/nvd --nix-bin-dir='${config.nix.package}/bin' diff /run/current-system "$systemConfig"
+        echo "=== end of the system diff ==="
+      fi
+    '';
+  };
+}

modules/base/activation/root-ssh.nix

@@ -0,0 +1,24 @@
+{ config, ... }:
+{
+  # https://github.com/colemickens/nixcfg/blob/main/mixins/ssh.nix
+  # symlink root's ssh config to ours
+  # to fix nix-daemon's ability to remote build since it sshs from the root account
+  system.activationScripts.root_ssh_config =
+    let
+      inherit (config.modules.system) mainUser;
+
+      sshDir = "${config.users.users.${mainUser}.home}/.ssh";
+    in
+    {
+      text = ''
+        (
+          # symlink root ssh config to ours so daemon can use our agent/keys/etc...
+          mkdir -p /root/.ssh
+          ln -sf ${sshDir}/config /root/.ssh/config
+          ln -sf ${sshDir}/known_hosts /root/.ssh/known_hosts
+          ln -sf ${sshDir}/known_hosts /root/.ssh/known_hosts
+        )
+      '';
+      deps = [ ];
+    };
+}

modules/base/environment/vars.nix

@@ -1,21 +1,15 @@
 { config, ... }:
 {
   # variables that I want to set globally on all systems
+  environment.variables = {
+    EDITOR = "nvim";
+    VISUAL = "vscode";
+    SUDO_EDITOR = "nvim";
 
-  environment = {
-    # the below can be done for faster shell response time but it can break things, and it did
-    # binsh = "${pkgs.dash}/bin/dash";
+    SYSTEMD_PAGERSECURE = "true";
+    PAGER = "less -FR";
+    MANPAGER = "nvim +Man!";
 
-    variables = {
-      EDITOR = "nvim";
-      VISUAL = "vscode";
-      SUDO_EDITOR = "nvim";
-
-      SYSTEMD_PAGERSECURE = "true";
-      PAGER = "less -FR";
-      MANPAGER = "nvim +Man!";
-
-      FLAKE = "${config.modules.environment.flakePath}";
-    };
+    FLAKE = "${config.modules.environment.flakePath}";
   };
 }

modules/base/options/default.nix

@@ -2,8 +2,6 @@
   imports = [
     ./device
     ./programs
-    ./themes
-    ./services
     ./system
     ./environment
   ];

modules/base/options/environment/default.nix

@@ -13,11 +13,10 @@ let
     ;
 
   inherit (config.modules.system) mainUser;
-  cfg = config.modules.environment;
 in
 {
   options.modules.environment = {
-    useHomeManager = mkEnableOption "Whether to use home-manager or not." // {
+    useHomeManager = mkEnableOption "Whether to use home-manager or not" // {
       default = true;
     };
 
@@ -26,34 +25,6 @@ in
       default = "/${ldTernary pkgs "home" "Users"}/${mainUser}/.config/flake";
       description = "The path to the configuration";
     };
-
-    desktop = mkOption {
-      type = types.nullOr (
-        types.enum [
-          "Hyprland"
-          "Sway"
-        ]
-      );
-      default = "Hyprland";
-      description = "The desktop environment to be used.";
-    };
-
-    loginManager = mkOption {
-      type = types.nullOr (
-        types.enum [
-          "greetd"
-          "gdm"
-          "lightdm"
-          "sddm"
-        ]
-      );
-      default = "greetd";
-      description = "The login manager to be used by the system.";
-    };
-
-    isWayland = mkEnableOption "Inferred data based on the desktop environment." // {
-      default = cfg.desktop == "Hyprland" || cfg.desktop == "Sway";
-    };
   };
 
   config.assertions = [

modules/base/options/programs/default.nix

@@ -5,10 +5,7 @@ let
   cfg = config.modules.programs;
 in
 {
-  imports = [
-    ./defaults.nix
-    ./gaming.nix
-  ];
+  imports = [ ./defaults.nix ];
 
   options.modules.programs = {
     # For programs that are not exactly limited to cli, tui or gui
@@ -23,9 +20,7 @@ in
         neovim.enable = mkEnableOption "Neovim editor" // {
           default = true;
         };
-        vscode.enable = mkEnableOption "VScode editor" // {
-          default = cfg.gui.enable;
-        };
+        vscode.enable = mkEnableOption "VScode editor";
         micro.enable = mkEnableOption "Micro editor";
       };