begin modularization

TODO.md

@@ -1 +1 @@
-+ somehow sync helium dotfiles into ungoogled-chromium
++ MODULARIZE as per vimjoyer

flake.nix

@@ -15,28 +15,28 @@
     nixosConfigurations."nixos" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [
-        ./audio.nix
-        ./bluetooth.nix
-        ./boot.nix
-        ./display-manager.nix
-        ./env-vars.nix
-        ./fonts.nix
-        ./hardware-configuration.nix
-        ./hyprland-system.nix
-        ./networking.nix
-        ./nix-settings.nix
-        ./opengl.nix
-        ./openssh.nix
-        ./printing.nix
-        ./screen.nix
-        ./steam.nix
-        ./security.nix
-        ./theme.nix
-        ./time.nix
-        ./ungoogled-chromium.nix
-        ./usb.nix
-        ./users.nix
-        ./waybar-system.nix
+        ./nixosModules/audio.nix
+        ./nixosModules/bluetooth.nix
+        ./nixosModules/boot.nix
+        ./nixosModules/display-manager.nix
+        ./nixosModules/env-vars.nix
+        ./nixosModules/fonts.nix
+        ./nixosModules/hardware-configuration.nix
+        ./nixosModules/hyprland-system.nix
+        ./nixosModules/networking.nix
+        ./nixosModules/nix-settings.nix
+        ./nixosModules/opengl.nix
+        ./nixosModules/openssh.nix
+        ./nixosModules/printing.nix
+        ./nixosModules/screen.nix
+        ./nixosModules/steam.nix
+        ./nixosModules/security.nix
+        ./nixosModules/theme.nix
+        ./nixosModules/time.nix
+        ./nixosModules/ungoogled-chromium.nix
+        ./nixosModules/usb.nix
+        ./nixosModules/users.nix
+        ./nixosModules/waybar-system.nix
         
         home-manager.nixosModules.home-manager {
           home-manager.useGlobalPkgs = true;

home.nix

@@ -7,16 +7,17 @@
   programs.home-manager.enable = true;
 
   imports = [
-    ./bash.nix
-    ./git.nix
-    ./hyprland.nix
-    ./keepass.nix
-    ./kitty.nix
-    ./minecraft.nix
-    ./syncthing.nix
-    ./vim.nix
-    ./waybar.nix
-    ./xdg.nix
-    ./xournalpp.nix
+    ./homeManagerModules/bash.nix
+    ./homeManagerModules/fastfetch.nix
+    ./homeManagerModules/git.nix
+    ./homeManagerModules/hyprland.nix
+    ./homeManagerModules/keepass.nix
+    ./homeManagerModules/kitty.nix
+    ./homeManagerModules/minecraft.nix
+    ./homeManagerModules/syncthing.nix
+    ./homeManagerModules/vim.nix
+    ./homeManagerModules/waybar.nix
+    ./homeManagerModules/xdg.nix
+    ./homeManagerModules/xournalpp.nix
   ];
 }

homeManagerModules/fastfetch.nix

@@ -0,0 +1,5 @@
+{ pkgs, ... }:
+
+{
+  programs.fastfetch.enable = true;
+}

lock-suspend.nix

@@ -1,26 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  services.logind = {
-    settings.Login.HandleLidSwitch = "suspend";       # suspend on lid close
-  };
-  
-  # Add the config declaratively
-  environment.etc."hypr/hyprlock.conf" = {
-    source = pkgs.writeText "hyprlock-config" ''
-      # hyprlock configuration
-      blur = 5
-      timeout = 0
-    '';
-  };
-  systemd.user.services.hyprlock-pre-suspend = {
-    description = "Lock screen before suspend";
-    wants = [ "sleep.target" ];
-    before = [ "sleep.target" ];
-    serviceConfig = {
-      Type = "oneshot";
-      ExecStart = "${pkgs.hyprlock}/bin/hyprlock -c /etc/hypr/hyprlock.conf";
-    };
-    wantedBy = [ "default.target" "sleep.target" ];
-  };
-}