merge

nix/programs/common.nix

@@ -48,7 +48,6 @@ in
     playerctl
     ncspot
     poppler_utils
-    neofetch
     brave
     greetd.regreet
     sops

nix/programs/default.nix

@@ -1,4 +1,4 @@
-{ inputs, pkgs, mod, config, ... }:
+{ inputs, pkgs, config, lib, mod, ... }:
 let
   base_imports = [
     inputs.anyrun.homeManagerModules.default
@@ -14,7 +14,6 @@ let
     inputs.nix-flatpak.homeManagerModules.nix-flatpak
     inputs.sops-nix.homeManagerModules.sops
   ];
-  username = config.conf.username;
 in
 {
   xdg.portal.config.common.default = "*";
@@ -26,12 +25,13 @@ in
   };
   home-manager.useGlobalPkgs = true;
   home-manager.useUserPackages = true;
+  home-manager.extraSpecialArgs = {
+    inherit inputs;
+  };
 
-  home-manager.users.${username} = {
+  home-manager.users.${config.conf.username} = {
     imports = [
-      {
-        _module = { args = { inherit inputs username; }; };
-      }
+
       ./hyprland/default.nix
       ./flatpak.nix
       ./common.nix
@@ -42,7 +42,7 @@ in
       ./oxi/default.nix
       ./themes/default.nix
       ./individual_configs/default.nix
-      mod
-    ] ++ base_imports;
+    ] ++ base_imports
+    ++ lib.optional (builtins.pathExists mod) mod;
   };
 }

nix/programs/hyprland/config.nix

@@ -178,6 +178,9 @@
       workspace_swipe = true;
     };
 
+    monitor = config.conf.hyprland.monitor;
+    workspace = config.conf.hyprland.workspace;
+
     env = [
       "GTK_CSD,0"
       "TERM,\"kitty /bin/fish\""
@@ -243,7 +246,7 @@
       "oxipaste_daemon"
       "nextcloud --background"
       "oxinoti"
-    ] ++ config.programs.hyprland.extra_autostart;
+    ] ++ config.conf.hyprland.extra_autostart;
 
     # plugin = {
     #   hyprspace = {

nix/programs/hyprland/hyprpaper.nix

@@ -1,5 +1,5 @@
 { config, ... }: {
   xdg.configFile."hypr/hyprpaper.conf" = {
-    text = config.programs.hyprland.hyprpaper;
+    text = config.conf.hyprland.hyprpaper;
   };
 }

nix/programs/hyprland/ironbar.nix

@@ -146,7 +146,7 @@ in
       ];
       config = {
         monitors."${config.conf.monitor}" = {
-          end = config.conf.battery ++ [
+          end = config.conf.ironbar.modules ++ [
             {
               type = "sys_info";
               format = [