refactor

flake.nix

@@ -6,8 +6,9 @@
       systems = ["x86_64-linux"];
 
       imports = [
-        ./home
+        ./users
         ./hosts
+        ./modules
       ];
 
       perSystem = {pkgs, ...}: {
@@ -89,7 +90,6 @@
     chaotic.url = "https://flakehub.com/f/chaotic-cx/nyx/*.tar.gz";
 
     # Miscellaneous
-    helix.url = "github:SoraTenshi/helix/new-daily-driver";
     helix-flake.url = "github:helix-editor/helix";
 
     nix-gaming = {
@@ -100,11 +100,6 @@
       };
     };
 
-    firefox-nightly = {
-      url = "github:nix-community/flake-firefox-nightly";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     nur.url = "github:nix-community/NUR";
 
     anyrun.url = "github:anyrun-org/anyrun";
@@ -112,15 +107,10 @@
     agenix.url = "github:ryantm/agenix";
 
     # Rust toolchain
-    fenix = {
+    # fenix = {
-      url = "github:nix-community/fenix";
+    #   url = "github:nix-community/fenix";
-      inputs.nixpkgs.follows = "nixpkgs";
+    #   inputs.nixpkgs.follows = "nixpkgs";
-    };
+    # };
-
-    wezterm = {
-      url = "github:wez/wezterm/main?dir=nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
 
     # Custom apps
     tuirun.url = "git+https://git.sr.ht/~canasta/tuirun";

home/README.md

@@ -1,18 +0,0 @@
-```
-home
-├── etc
-├── modules
-│   ├── browsers
-│   ├── comm
-│   ├── devtools
-│   ├── gaming
-│   ├── terminal
-│   ├── userd
-│   ├── utils
-│   └── wm
-│       ├── hyprland
-│       └── utils
-└── users
-    ├── cnst
-    └── toothpick
-```

home/etc/dconf/default.nix

@@ -1,9 +0,0 @@
-{
-  dconf = {
-    settings = {
-      "org/gnome/desktop/interface" = {
-        color-scheme = "prefer-dark";
-      };
-    };
-  };
-}

home/etc/default.nix

@@ -1,9 +0,0 @@
-{
-  imports = [
-    # shared imports
-    ./dconf
-    ./polkit
-    ./gtk
-    ./xdg
-  ];
-}

home/modules/default.nix

@@ -1,36 +0,0 @@
-{umodPath, ...}: {
-  imports = [
-    "${umodPath}/browsers/chromium"
-    "${umodPath}/browsers/firefox"
-    "${umodPath}/comm/discord"
-    "${umodPath}/devtools/neovim"
-    "${umodPath}/devtools/vscode"
-    "${umodPath}/devtools/helix"
-    "${umodPath}/gaming/lutris"
-    "${umodPath}/gaming/mangohud"
-    "${umodPath}/terminal/alacritty"
-    "${umodPath}/terminal/foot"
-    "${umodPath}/terminal/kitty"
-    "${umodPath}/terminal/wezterm"
-    "${umodPath}/terminal/zellij"
-    "${umodPath}/userd/copyq"
-    "${umodPath}/userd/blueman-applet"
-    "${umodPath}/userd/mako"
-    "${umodPath}/userd/udiskie"
-    "${umodPath}/userd/gpg"
-    "${umodPath}/userd/syncthing"
-    "${umodPath}/utils/anyrun"
-    "${umodPath}/utils/misc"
-    "${umodPath}/utils/rofi"
-    "${umodPath}/utils/waybar"
-    "${umodPath}/utils/yazi"
-    "${umodPath}/utils/zathura"
-    "${umodPath}/utils/tuirun"
-    "${umodPath}/utils/eza"
-    "${umodPath}/utils/ssh"
-    "${umodPath}/wm/hyprland"
-    "${umodPath}/wm/utils/hypridle"
-    "${umodPath}/wm/utils/hyprlock"
-    "${umodPath}/wm/utils/hyprpaper"
-  ];
-}

home/users/cnst/cpmodules.nix

@@ -1,107 +0,0 @@
-{lib, ...}: let
-  inherit (lib) mkForce;
-in {
-  userModules = {
-    browsers = {
-      #   firefox = {
-      #     enable = mkForce true;
-      #   };
-      chromium = {
-        enable = mkForce false;
-      };
-    };
-    # comm = {
-    #   discord = {
-    #     enable = mkForce true;
-    #   };
-    # };
-    # devtools = {
-    #   neovim = {
-    #     enable = mkForce true;
-    #   };
-    #   vscode = {
-    #     enable = mkForce false;
-    #   };
-    #   helix = {
-    #     enable = mkForce true;
-    #   };
-    # };
-    # gaming = {
-    #   lutris = {
-    #     enable = mkForce false;
-    #   };
-    #   mangohud = {
-    #     enable = mkForce false;
-    #   };
-    # };
-    terminal = {
-      #   alacritty = {
-      #     enable = mkForce true;
-      #   };
-      #   foot = {
-      #     enable = mkForce true;
-      #   };
-      #   kitty = {
-      #     enable = mkForce true;
-      #   };
-      wezterm = {
-        enable = mkForce false;
-      };
-      #   zellij = {
-      #     enable = mkForce false;
-      #   };
-    };
-    # userd = {
-    #   copyq = {
-    #     enable = mkForce true;
-    #   };
-    #   mako = {
-    #     enable = mkForce true;
-    #   };
-    #   udiskie = {
-    #     enable = mkForce true;
-    #   };
-    # };
-    # utils = {
-    #   anyrun = {
-    #     enable = mkForce false;
-    #   };
-    #   rofi = {
-    #     enable = mkForce false;
-    #   };
-    #   waybar = {
-    #     enable = mkForce true;
-    #   };
-    #   yazi = {
-    #     enable = mkForce true;
-    #   };
-    #   zathura = {
-    #     enable = mkForce true;
-    #   };
-    #   misc = {
-    #     enable = mkForce true;
-    #   };
-    # };
-    # wm = {
-    #   hyprland = {
-    #     cnst = {
-    #       enable = mkForce true;
-    #     };
-    #     toothpick = {
-    #       enable = mkForce false;
-    #     };
-    #   };
-    #   utils = {
-    #     hypridle = {
-    #       enable = mkForce true;
-    #     };
-    #     hyprlock = {
-    #       enable = mkForce true;
-    #     };
-    #     hyprpaper = {
-    #       enable = mkForce true;
-    #     };
-    #   };
-    # };
-  };
-}

hosts/cnix/modules.nix

@@ -1,5 +1,5 @@
 {
-  systemModules = {
+  system = {
     boot = {
       loader = {
         default = {
@@ -17,12 +17,12 @@
       };
     };
     gaming = {
-      steam = {
+      # steam = {
-        enable = true;
+      #   enable = true;
-      };
+      # };
-      gamescope = {
+      # gamescope = {
-        enable = true;
+      #   enable = true;
-      };
+      # };
       lutris = {
         enable = true;
       };
@@ -70,15 +70,6 @@
         };
       };
     };
-    nix = {
-      nh = {
-        enable = true;
-        clean = {
-          enable = true;
-          extraArgs = "--keep 3 --keep-since 21d";
-        };
-      };
-    };
     studio = {
       blender = {
         enable = true;
@@ -201,6 +192,13 @@
           enable = true;
         };
       };
+      nh = {
+        enable = true;
+        clean = {
+          enable = true;
+          extraArgs = "--keep 3 --keep-since 21d";
+        };
+      };
       npm = {
         enable = true;
       };

hosts/cnixpad/modules.nix

@@ -1,5 +1,5 @@
 {
-  systemModules = {
+  system = {
     boot = {
       loader = {
         default.enable = true;

hosts/default.nix

@@ -11,11 +11,11 @@
     systemConfig = "${self}/system";
     hostConfig = "${self}/hosts";
 
-    cnstConfig = "${self}/home/users/cnst";
+    cnstConfig = "${self}/users/cnst";
-    toothpickConfig = "${self}/home/users/toothpick";
+    toothpickConfig = "${self}/users/toothpick";
 
-    umodPath = "${self}/home/modules";
+    umodPath = "${self}/modules/home";
-    smodPath = "${self}/system/modules";
+    smodPath = "${self}/modules/system";
 
     # shorten paths
     inherit (inputs.nixpkgs.lib) nixosSystem;
@@ -41,6 +41,7 @@
               extraSpecialArgs = specialArgs;
             };
           }
+          self.nixosModules.system
           inputs.chaotic.nixosModules.default
           inputs.agenix.nixosModules.default
         ];

hosts/toothpc/modules.nix

@@ -1,5 +1,5 @@
 {
-  systemModules = {
+  system = {
     boot = {
       loader = {
         default.enable = false;

modules/default.nix

@@ -0,0 +1,119 @@
+{
+  flake.nixosModules = {
+    home = {
+      imports = [
+        ./home/browsers/chromium
+        ./home/browsers/firefox
+
+        ./home/comm/discord
+
+        ./home/devtools/helix
+        ./home/devtools/neovim
+        ./home/devtools/vscode
+
+        ./home/gaming/steam
+
+        ./home/terminal/alacritty
+        ./home/terminal/foot
+        ./home/terminal/kitty
+        ./home/terminal/wezterm
+        ./home/terminal/zellij
+
+        ./home/userd/blueman-applet
+        ./home/userd/copyq
+        ./home/userd/dconf
+        ./home/userd/gpg
+        ./home/userd/gtk
+        ./home/userd/mako
+        ./home/userd/polkit
+        ./home/userd/syncthing
+        ./home/userd/udiskie
+        ./home/userd/xdg
+
+        ./home/utils/anyrun
+        ./home/utils/eza
+        ./home/utils/misc
+        ./home/utils/mpv
+        ./home/utils/rofi
+        ./home/utils/ssh
+        ./home/utils/tuirun
+        ./home/utils/waybar
+        ./home/utils/yazi
+        ./home/utils/zathura
+
+        ./home/wm/hyprland
+        ./home/wm/utils/hypridle
+        ./home/wm/utils/hyprlock
+        ./home/wm/utils/hyprpaper
+      ];
+    };
+    system = {
+      imports = [
+        ./system/boot/loader
+        ./system/boot/kernel
+
+        ./system/gaming/gamemode
+        ./system/gaming/gamescope
+        ./system/gaming/lutris
+        ./system/gaming/steam
+
+        ./system/gui/gnome
+        ./system/gui/hyprland
+
+        ./system/hardware/bluetooth
+        ./system/hardware/graphics/amd
+        ./system/hardware/graphics/nvidia
+        ./system/hardware/logitech
+        ./system/hardware/network
+
+        ./system/studio/blender
+        ./system/studio/gimp
+        ./system/studio/inkscape
+        ./system/studio/beekeeper
+        ./system/studio/mysql-workbench
+
+        ./system/sysd/network/blueman
+        ./system/sysd/network/mullvad
+        ./system/sysd/network/samba
+        ./system/sysd/network/openssh
+
+        ./system/sysd/security/agenix
+        ./system/sysd/security/gnome-keyring
+
+        ./system/sysd/session/dbus
+        ./system/sysd/session/dconf
+        ./system/sysd/session/xserver
+
+        ./system/sysd/system/fwupd
+        ./system/sysd/system/greetd
+        ./system/sysd/system/gvfs
+        ./system/sysd/system/locate
+        ./system/sysd/system/nix-ld
+        ./system/sysd/system/pcscd
+        ./system/sysd/system/pipewire
+        ./system/sysd/system/powerd
+        ./system/sysd/system/udisks
+        ./system/sysd/system/zram
+        ./system/sysd/system/kanata
+
+        ./system/utils/android
+        ./system/utils/anyrun
+        ./system/utils/brightnessctl
+        ./system/utils/chaotic
+        ./system/utils/corectrl
+        ./system/utils/microfetch
+        ./system/utils/misc
+        ./system/utils/nh
+        ./system/utils/npm
+        ./system/utils/obsidian
+        ./system/utils/yubikey
+        ./system/utils/zsh
+      ];
+    };
+    options = {
+      imports = [
+        ./options/monitors
+      ];
+    };
+  };
+}

modules/home/browsers/chromium/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.userModules.browsers.chromium;
+  cfg = config.home.browsers.chromium;
 in {
   options = {
-    userModules.browsers.chromium.enable = mkEnableOption "Enables chromium";
+    home.browsers.chromium.enable = mkEnableOption "Enables chromium";
   };
   config = mkIf cfg.enable {
     programs.chromium = {

modules/home/browsers/firefox/default.nix

@@ -6,13 +6,13 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.userModules.browsers.firefox;
+  cfg = config.home.browsers.firefox;
 in {
   imports = [
     inputs.nur.hmModules.nur
   ];
   options = {
-    userModules.browsers.firefox.enable = mkEnableOption "Enables firefox";
+    home.browsers.firefox.enable = mkEnableOption "Enables firefox";
   };
   config = mkIf cfg.enable {
     programs.firefox = {

modules/home/comm/discord/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.userModules.comm.discord;
+  cfg = config.home.comm.discord;
 in {
   options = {
-    userModules.comm.discord.enable = mkEnableOption "Enables discord";
+    home.comm.discord.enable = mkEnableOption "Enables discord";
   };
   config = mkIf cfg.enable {
     home.packages = with pkgs; [vesktop];

modules/home/devtools/helix/default.nix

@@ -6,7 +6,7 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.userModules.devtools.helix;
+  cfg = config.home.devtools.helix;
 in {
   imports = [
     ./lang.nix
@@ -14,7 +14,7 @@ in {
   ];
 
   options = {
-    userModules.devtools.helix.enable = mkEnableOption "Enable helix";
+    home.devtools.helix.enable = mkEnableOption "Enable helix";
   };
 
   config = mkIf cfg.enable {

modules/home/devtools/neovim/default.nix

@@ -5,7 +5,7 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.userModules.devtools.neovim;
+  cfg = config.home.devtools.neovim;
 in {
   imports = [
     ./plugins
@@ -15,7 +15,7 @@ in {
   ];
 
   options = {
-    userModules.devtools.neovim.enable = mkEnableOption "Enable neovim";
+    home.devtools.neovim.enable = mkEnableOption "Enable neovim";
   };
 
   config = mkIf cfg.enable {

modules/home/devtools/nixvim/default.nix

@@ -6,7 +6,7 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.userModules.devtools.nixvim;
+  cfg = config.home.devtools.nixvim;
 in {
   imports = [
     inputs.nixvim.homeManagerModules.nixvim
@@ -18,7 +18,7 @@ in {
   ];
 
   options = {
-    userModules.devtools.nixvim.enable = mkEnableOption "Enable nixvim";
+    home.devtools.nixvim.enable = mkEnableOption "Enable nixvim";
   };
 
   config = mkIf cfg.enable {

modules/home/devtools/nixvim/plugins/barbar.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.userModules.devtools.nixvim.plugins.barbar;
+  cfg = config.home.devtools.nixvim.plugins.barbar;
 in {
   options = {
-    userModules.devtools.nixvim.plugins.barbar.enable = mkEnableOption "Enables Barbar plugin for nixvim";
+    home.devtools.nixvim.plugins.barbar.enable = mkEnableOption "Enables Barbar plugin for nixvim";
   };
 
   config = mkIf cfg.enable {

modules/home/devtools/nixvim/plugins/cmp.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.userModules.devtools.nixvim.plugins.cmp;
+  cfg = config.home.devtools.nixvim.plugins.cmp;
 in {
   options = {
-    userModules.devtools.nixvim.plugins.cmp.enable = mkEnableOption "Enables completion plugin for nixvim";
+    home.devtools.nixvim.plugins.cmp.enable = mkEnableOption "Enables completion plugin for nixvim";
   };
 
   config = mkIf cfg.enable {

modules/home/devtools/nixvim/plugins/comment.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.userModules.devtools.nixvim.plugins.comment;
+  cfg = config.home.devtools.nixvim.plugins.comment;
 in {
   options = {
-    userModules.devtools.nixvim.plugins.comment.enable = mkEnableOption "Enables Comment plugin for nixvim";
+    home.devtools.nixvim.plugins.comment.enable = mkEnableOption "Enables Comment plugin for nixvim";
   };
 
   config = mkIf cfg.enable {

modules/home/devtools/nixvim/plugins/conform.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.userModules.devtools.nixvim.plugins.conform;
+  cfg = config.home.devtools.nixvim.plugins.conform;
 in {
   options = {
-    userModules.devtools.nixvim.plugins.conform.enable = mkEnableOption "Enables Conform plugin for nixvim";
+    home.devtools.nixvim.plugins.conform.enable = mkEnableOption "Enables Conform plugin for nixvim";
   };
 
   config = mkIf cfg.enable {

modules/home/devtools/nixvim/plugins/copilot.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.userModules.devtools.nixvim.plugins.copilot;
+  cfg = config.home.devtools.nixvim.plugins.copilot;
 in {
   options = {
-    userModules.devtools.nixvim.plugins.copilot.enable = mkEnableOption "Enables AI tools for nixvim";
+    home.devtools.nixvim.plugins.copilot.enable = mkEnableOption "Enables AI tools for nixvim";
   };
 
   config = mkIf cfg.enable {

modules/home/devtools/nixvim/plugins/efm.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.userModules.devtools.nixvim.plugins.efm;
+  cfg = config.home.devtools.nixvim.plugins.efm;
 in {
   options = {
-    userModules.devtools.nixvim.plugins.efm.enable = mkEnableOption "Enables EFM LSP support for nixvim";
+    home.devtools.nixvim.plugins.efm.enable = mkEnableOption "Enables EFM LSP support for nixvim";
   };
 
   config = mkIf cfg.enable {

modules/home/devtools/nixvim/plugins/floaterm.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.userModules.devtools.nixvim.plugins.floaterm;
+  cfg = config.home.devtools.nixvim.plugins.floaterm;
 in {
   options = {
-    userModules.devtools.nixvim.plugins.floaterm.enable = mkEnableOption "Enables Floaterm plugin for nixvim";
+    home.devtools.nixvim.plugins.floaterm.enable = mkEnableOption "Enables Floaterm plugin for nixvim";
   };
 
   config = mkIf cfg.enable {

modules/home/devtools/nixvim/plugins/harpoon.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.userModules.devtools.nixvim.plugins.harpoon;
+  cfg = config.home.devtools.nixvim.plugins.harpoon;
 in {
   options = {
-    userModules.devtools.nixvim.plugins.harpoon.enable = mkEnableOption "Enables Harpoon plugin for nixvim";
+    home.devtools.nixvim.plugins.harpoon.enable = mkEnableOption "Enables Harpoon plugin for nixvim";
   };
 
   config = mkIf cfg.enable {

modules/home/devtools/nixvim/plugins/lightline.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.userModules.devtools.nixvim.plugins.lightline;
+  cfg = config.home.devtools.nixvim.plugins.lightline;
 in {
   options = {
-    userModules.devtools.nixvim.plugins.lightline.enable = mkEnableOption "Enables lightline plugin for nixvim";
+    home.devtools.nixvim.plugins.lightline.enable = mkEnableOption "Enables lightline plugin for nixvim";
   };
 
   config = mkIf cfg.enable {

modules/home/devtools/nixvim/plugins/lsp-format.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.userModules.devtools.nixvim.plugins.lsp-format;
+  cfg = config.home.devtools.nixvim.plugins.lsp-format;
 in {
   options = {
-    userModules.devtools.nixvim.plugins.lsp-format = {
+    home.devtools.nixvim.plugins.lsp-format = {
       enable = mkEnableOption "Enables LSP formatting support for nixvim";
     };
   };

modules/home/devtools/nixvim/plugins/lsp.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.userModules.devtools.nixvim.plugins.lsp;
+  cfg = config.home.devtools.nixvim.plugins.lsp;
 in {
   options = {
-    userModules.devtools.nixvim.plugins.lsp = {
+    home.devtools.nixvim.plugins.lsp = {
       enable = mkEnableOption "Enables LSP support for nixvim";
     };
   };

modules/home/devtools/nixvim/plugins/lualine.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.userModules.devtools.nixvim.plugins.lualine;
+  cfg = config.home.devtools.nixvim.plugins.lualine;
 in {
   options = {
-    userModules.devtools.nixvim.plugins.lualine.enable = mkEnableOption "Enables Lualine plugin for nixvim";
+    home.devtools.nixvim.plugins.lualine.enable = mkEnableOption "Enables Lualine plugin for nixvim";
   };
 
   config = mkIf cfg.enable {

modules/home/devtools/nixvim/plugins/markdown-preview.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.userModules.devtools.nixvim.plugins.markdown-preview;
+  cfg = config.home.devtools.nixvim.plugins.markdown-preview;
 in {
   options = {
-    userModules.devtools.nixvim.plugins.markdown-preview.enable = mkEnableOption "Enables Markdown Preview plugin for nixvim";
+    home.devtools.nixvim.plugins.markdown-preview.enable = mkEnableOption "Enables Markdown Preview plugin for nixvim";
   };
 
   config = mkIf cfg.enable {

modules/home/devtools/nixvim/plugins/neo-tree.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.userModules.devtools.nixvim.plugins.neo-tree;
+  cfg = config.home.devtools.nixvim.plugins.neo-tree;
 in {
   options = {
-    userModules.devtools.nixvim.plugins.neo-tree.enable = mkEnableOption "Enables neo-tree plugin for nixvim";
+    home.devtools.nixvim.plugins.neo-tree.enable = mkEnableOption "Enables neo-tree plugin for nixvim";
   };
 
   config = mkIf cfg.enable {

modules/home/devtools/nixvim/plugins/nonels.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.userModules.devtools.nixvim.plugins.none-ls;
+  cfg = config.home.devtools.nixvim.plugins.none-ls;
 in {
   options = {
-    userModules.devtools.nixvim.plugins.none-ls.enable = mkEnableOption "Enables None-LS plugin for nixvim";
+    home.devtools.nixvim.plugins.none-ls.enable = mkEnableOption "Enables None-LS plugin for nixvim";
   };
 
   config = mkIf cfg.enable {

modules/home/devtools/nixvim/plugins/rustaceanvim.nix

@@ -4,9 +4,9 @@
   ...
 }:
 with lib; let
-  cfg = config.userModules.devtools.nixvim.plugins.rustaceanvim;
+  cfg = config.home.devtools.nixvim.plugins.rustaceanvim;
 in {
-  options.userModules.devtools.nixvim.plugins.rustaceanvim = {
+  options.home.devtools.nixvim.plugins.rustaceanvim = {
     enable = mkEnableOption "Whether to enable rustaceanvim.";
   };
 

modules/home/devtools/nixvim/plugins/startify.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.userModules.devtools.nixvim.plugins.startify;
+  cfg = config.home.devtools.nixvim.plugins.startify;
 in {
   options = {
-    userModules.devtools.nixvim.plugins.startify.enable = mkEnableOption "Enables Startify plugin for nixvim";
+    home.devtools.nixvim.plugins.startify.enable = mkEnableOption "Enables Startify plugin for nixvim";
   };
 
   config = mkIf cfg.enable {

modules/home/devtools/nixvim/plugins/tagbar.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.userModules.devtools.nixvim.plugins.tagbar;
+  cfg = config.home.devtools.nixvim.plugins.tagbar;
 in {
   options = {
-    userModules.devtools.nixvim.plugins.tagbar.enable = mkEnableOption "Enables Tagbar plugin for nixvim";
+    home.devtools.nixvim.plugins.tagbar.enable = mkEnableOption "Enables Tagbar plugin for nixvim";
   };
 
   config = mkIf cfg.enable {

modules/home/devtools/nixvim/plugins/telescope.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.userModules.devtools.nixvim.plugins.telescope;
+  cfg = config.home.devtools.nixvim.plugins.telescope;
 in {
   options = {
-    userModules.devtools.nixvim.plugins.telescope.enable = mkEnableOption "Enables Telescope plugin for nixvim";
+    home.devtools.nixvim.plugins.telescope.enable = mkEnableOption "Enables Telescope plugin for nixvim";
   };
 
   config = mkIf cfg.enable {

modules/home/devtools/nixvim/plugins/treesitter.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.userModules.devtools.nixvim.plugins.treesitter;
+  cfg = config.home.devtools.nixvim.plugins.treesitter;
 in {
   options = {
-    userModules.devtools.nixvim.plugins = {
+    home.devtools.nixvim.plugins = {
       treesitter.enable = mkEnableOption "Enables Treesitter plugin for nixvim";
     };
   };

modules/home/devtools/nixvim/plugins/vimtex.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.userModules.devtools.nixvim.plugins.vimtex;
+  cfg = config.home.devtools.nixvim.plugins.vimtex;
 in {
   options = {
-    userModules.devtools.nixvim.plugins.vimtex.enable = mkEnableOption "Enables VimTeX plugin for nixvim";
+    home.devtools.nixvim.plugins.vimtex.enable = mkEnableOption "Enables VimTeX plugin for nixvim";
   };
 
   config = mkIf cfg.enable {

modules/home/devtools/nixvim/plugins/yanky.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
-  cfg = config.userModules.devtools.nixvim.plugins.yanky;
+  cfg = config.home.devtools.nixvim.plugins.yanky;
 in {
   options = {
-    userModules.devtools.nixvim.plugins.yanky.enable = mkEnableOption "Enables Yanky plugin for nixvim";
+    home.devtools.nixvim.plugins.yanky.enable = mkEnableOption "Enables Yanky plugin for nixvim";
   };
 
   config = mkIf cfg.enable {

modules/home/devtools/vscode/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.userModules.devtools.vscode;
+  cfg = config.home.devtools.vscode;
 in {
   options = {
-    userModules.devtools.vscode.enable = mkEnableOption "Enables vscode";
+    home.devtools.vscode.enable = mkEnableOption "Enables vscode";
   };
   config = mkIf cfg.enable {
     programs.vscode = {

modules/home/gaming/lutris/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.userModules.gaming.lutris;
+  cfg = config.home.gaming.lutris;
 in {
   options = {
-    userModules.gaming.lutris.enable = mkEnableOption "Enables lutris";
+    home.gaming.lutris.enable = mkEnableOption "Enables lutris";
   };
   config = mkIf cfg.enable {
     home.packages = [

modules/home/gaming/mangohud/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.userModules.gaming.mangohud;
+  cfg = config.home.gaming.mangohud;
 in {
   options = {
-    userModules.gaming.mangohud.enable = mkEnableOption "Enables mangohud";
+    home.gaming.mangohud.enable = mkEnableOption "Enables mangohud";
   };
   config = mkIf cfg.enable {
     programs.mangohud = {

modules/home/gaming/steam/default.nix

@@ -0,0 +1,64 @@
+# Yanked from Misterio77
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: let
+  inherit (lib) mkIf mkEnableOption concatStringsSep head filter getExe;
+  cfg = config.home.gaming.steam;
+  steam-with-pkgs = pkgs.steam.override {
+    extraPkgs = pkgs:
+      with pkgs; [
+        xorg.libXcursor
+        xorg.libXi
+        xorg.libXinerama
+        xorg.libXScrnSaver
+        libpng
+        libpulseaudio
+        libvorbis
+        stdenv.cc.cc.lib
+        libkrb5
+        keyutils
+        gamescope
+      ];
+  };
+
+  monitor = head (filter (m: m.primary) config.monitors);
+  steam-session = let
+    gamescope = concatStringsSep " " [
+      (getExe pkgs.gamescope)
+      "--output-width ${toString monitor.width}"
+      "--output-height ${toString monitor.height}"
+      "--framerate-limit ${toString monitor.refreshRate}"
+      "--prefer-output ${monitor.name}"
+      # "--adaptive-sync"
+      "--expose-wayland"
+      "--hdr-enabled"
+      "--steam"
+    ];
+    steam = concatStringsSep " " [
+      "steam"
+      "steam://open/bigpicture"
+    ];
+  in
+    pkgs.writeTextDir "share/wayland-sessions/steam-sesson.desktop" # ini
+    
+    ''
+      [Desktop Entry]
+      Name=Steam Session
+      Exec=${gamescope} -- ${steam}
+      Type=Application
+    '';
+in {
+  options = {
+    home.gaming.steam.enable = mkEnableOption "Enables steam";
+  };
+  config = {
+    home.packages = mkIf cfg.enable [
+      steam-with-pkgs
+      steam-session
+      pkgs.gamescope
+    ];
+  };
+}

modules/home/terminal/alacritty/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.userModules.terminal.alacritty;
+  cfg = config.home.terminal.alacritty;
 in {
   options = {
-    userModules.terminal.alacritty.enable = mkEnableOption "Enables firefox";
+    home.terminal.alacritty.enable = mkEnableOption "Enables firefox";
   };
   config = mkIf cfg.enable {
     programs.alacritty = {

modules/home/terminal/foot/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.userModules.terminal.foot;
+  cfg = config.home.terminal.foot;
 in {
   options = {
-    userModules.terminal.foot.enable = mkEnableOption "Enables foot terminal";
+    home.terminal.foot.enable = mkEnableOption "Enables foot terminal";
   };
   config = mkIf cfg.enable {
     programs.foot = {

modules/home/terminal/kitty/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.userModules.terminal.kitty;
+  cfg = config.home.terminal.kitty;
 in {
   options = {
-    userModules.terminal.kitty.enable = mkEnableOption "Enables kitty terminal";
+    home.terminal.kitty.enable = mkEnableOption "Enables kitty terminal";
   };
   config = mkIf cfg.enable {
     programs.kitty = {

modules/home/terminal/wezterm/default.nix

@@ -9,10 +9,10 @@
   weztermPkg = pkgs.wezterm;
   # weztermFlake = inputs.wezterm.packages.${pkgs.system}.default;
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.userModules.terminal.wezterm;
+  cfg = config.home.terminal.wezterm;
 in {
   options = {
-    userModules.terminal.wezterm.enable = mkEnableOption "Enables wezterm terminal";
+    home.terminal.wezterm.enable = mkEnableOption "Enables wezterm terminal";
   };
   config = mkIf cfg.enable {
     programs.wezterm = {

modules/home/terminal/zellij/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.userModules.terminal.zellij;
+  cfg = config.home.terminal.zellij;
 in {
   options = {
-    userModules.terminal.zellij.enable = mkEnableOption "Enables zellij";
+    home.terminal.zellij.enable = mkEnableOption "Enables zellij";
   };
   config = mkIf cfg.enable {
     programs.zellij = {

modules/home/userd/blueman-applet/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.userModules.userd.blueman-applet;
+  cfg = config.home.userd.blueman-applet;
 in {
   options = {
-    userModules.userd.blueman-applet.enable = mkEnableOption "Enables blueman-applet";
+    home.userd.blueman-applet.enable = mkEnableOption "Enables blueman-applet";
   };
   config = mkIf cfg.enable {
     services.blueman-applet = {

modules/home/userd/copyq/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.userModules.userd.copyq;
+  cfg = config.home.userd.copyq;
 in {
   options = {
-    userModules.userd.copyq.enable = mkEnableOption "Enables copyq";
+    home.userd.copyq.enable = mkEnableOption "Enables copyq";
   };
   config = mkIf cfg.enable {
     services.copyq = {

modules/home/userd/dconf/default.nix

@@ -0,0 +1,24 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib) types mkOption;
+  cfg = config.home.userd.dconf;
+in {
+  options = {
+    home.userd.dconf.settings.color-scheme = mkOption {
+      type = types.str;
+      default = "prefer-dark";
+    };
+  };
+  config = {
+    dconf = {
+      settings = {
+        "org/gnome/desktop/interface" = {
+          color-scheme = cfg.settings.color-scheme;
+        };
+      };
+    };
+  };
+}

modules/home/userd/gpg/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.userModules.userd.gpg;
+  cfg = config.home.userd.gpg;
 in {
   options = {
-    userModules.userd.gpg.enable = mkEnableOption "Enables gpg";
+    home.userd.gpg.enable = mkEnableOption "Enables gpg";
   };
   config = mkIf cfg.enable {
     services.gpg-agent = {

modules/home/userd/gtk/wip.nix

@@ -0,0 +1,140 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
+  inherit (lib) types mkOption mkIf;
+  cfg = config.home.userd.gtk;
+in {
+  options = {
+    home.userd.gtk.enable = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Enable GTK configuration.";
+    };
+
+    home.userd.gtk.theme = mkOption {
+      type = types.str;
+      default = "Orchis-Grey-Dark-Compact";
+      description = "GTK theme name.";
+    };
+
+    home.userd.gtk.themePackage = mkOption {
+      type = types.package;
+      default = pkgs.orchis-theme;
+      description = "GTK theme package.";
+    };
+
+    home.userd.gtk.iconTheme = mkOption {
+      type = types.str;
+      default = "Adwaita";
+      description = "GTK icon theme name.";
+    };
+
+    home.userd.gtk.iconThemePackage = mkOption {
+      type = types.package;
+      default = pkgs.adwaita-icon-theme;
+      description = "GTK icon theme package.";
+    };
+
+    home.userd.gtk.font = mkOption {
+      type = types.attrsOf types.anything;
+      default = {
+        name = "Input Sans Narrow Light";
+        size = 10;
+      };
+      description = "GTK font configuration.";
+    };
+
+    home.userd.gtk.cursorTheme = mkOption {
+      type = types.attrsOf types.anything;
+      default = {
+        name = "Adwaita";
+        size = 28;
+        package = pkgs.adwaita-icon-theme;
+      };
+      description = "Cursor theme configuration.";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home = {
+      packages = [pkgs.glib];
+
+      pointerCursor = {
+        package = cfg.cursorTheme.package;
+        name = cfg.cursorTheme.name;
+        size = cfg.cursorTheme.size;
+        gtk.enable = true;
+        x11.enable = true;
+      };
+    };
+
+    gtk = {
+      enable = true;
+
+      theme = {
+        package = cfg.themePackage;
+        name = cfg.theme;
+      };
+
+      iconTheme = {
+        package = cfg.iconThemePackage;
+        name = cfg.iconTheme;
+      };
+
+      font = {
+        name = cfg.font.name;
+        size = cfg.font.size;
+      };
+
+      cursorTheme = {
+        package = cfg.cursorTheme.package;
+        name = cfg.cursorTheme.name;
+        size = cfg.cursorTheme.size;
+      };
+
+      gtk2 = {
+        extraConfig = ''
+          gtk-xft-antialias=1
+          gtk-xft-hinting=1
+          gtk-xft-hintstyle="hintslight"
+          gtk-xft-rgba="rgb"
+        '';
+      };
+
+      gtk3.extraConfig = {
+        gtk-application-prefer-dark-theme = true;
+
+        gtk-decoration-layout = "appmenu:none";
+        gtk-toolbar-style = "GTK_TOOLBAR_BOTH";
+        gtk-toolbar-icon-size = "GTK_ICON_SIZE_LARGE_TOOLBAR";
+        gtk-button-images = 1;
+        gtk-menu-images = 1;
+
+        gtk-error-bell = 0;
+        gtk-enable-event-sounds = 0;
+        gtk-enable-input-feedback-sounds = 0;
+
+        gtk-xft-antialias = 1;
+        gtk-xft-hinting = 1;
+        gtk-xft-hintstyle = "hintslight";
+      };
+
+      gtk4.extraConfig = {
+        gtk-application-prefer-dark-theme = true;
+
+        gtk-decoration-layout = "appmenu:none";
+
+        gtk-error-bell = 0;
+        gtk-enable-event-sounds = 0;
+        gtk-enable-input-feedback-sounds = 0;
+
+        gtk-xft-antialias = 1;
+        gtk-xft-hinting = 1;
+        gtk-xft-hintstyle = "hintslight";
+      };
+    };
+  };
+}

modules/home/userd/mako/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.userModules.userd.mako;
+  cfg = config.home.userd.mako;
 in {
   options = {
-    userModules.userd.mako.enable = mkEnableOption "Enables mako";
+    home.userd.mako.enable = mkEnableOption "Enables mako";
   };
   config = mkIf cfg.enable {
     services.mako = {

modules/home/userd/syncthing/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.userModules.userd.syncthing;
+  cfg = config.home.userd.syncthing;
 in {
   options = {
-    userModules.userd.syncthing.enable = mkEnableOption "Enables syncthing";
+    home.userd.syncthing.enable = mkEnableOption "Enables syncthing";
   };
   config = mkIf cfg.enable {
     services.syncthing = {

modules/home/userd/udiskie/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.userModules.userd.udiskie;
+  cfg = config.home.userd.udiskie;
 in {
   options = {
-    userModules.userd.udiskie.enable = mkEnableOption "Enables udiskie";
+    home.userd.udiskie.enable = mkEnableOption "Enables udiskie";
   };
   config = mkIf cfg.enable {
     services.udiskie = {

modules/home/utils/anyrun/default.nix

@@ -5,13 +5,13 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.userModules.utils.anyrun;
+  cfg = config.home.utils.anyrun;
 in {
   imports = [
     inputs.anyrun.homeManagerModules.default
   ];
   options = {
-    userModules.utils.anyrun.enable = mkEnableOption "Enables anyrun";
+    home.utils.anyrun.enable = mkEnableOption "Enables anyrun";
   };
   config = mkIf cfg.enable {
     programs.anyrun = {

modules/home/utils/eza/default.nix

@@ -4,20 +4,20 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.userModules.utils.eza;
+  cfg = config.home.utils.eza;
 in {
   options = {
-    userModules.utils.eza.enable = mkEnableOption "Enables eza";
+    home.utils.eza.enable = mkEnableOption "Enables eza";
   };
   config = mkIf cfg.enable {
     programs.eza = {
       enable = true;
-      icons = true;
       git = true;
       enableZshIntegration = false;
       extraOptions = [
         "--group-directories-first"
         "--header"
+        "--icons"
       ];
     };
   };

modules/home/utils/misc/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.userModules.utils.misc;
+  cfg = config.home.utils.misc;
 in {
   options = {
-    userModules.utils.misc.enable = mkEnableOption "Enables miscellaneous utility apps";
+    home.utils.misc.enable = mkEnableOption "Enables miscellaneous utility apps";
   };
   config = mkIf cfg.enable {
     programs = {

modules/home/utils/mpv/default.nix

@@ -0,0 +1,20 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  cfg = config.home.utils.mpv;
+in {
+  options = {
+    home.utils.mpv.enable = mkEnableOption "Enables mpv";
+  };
+  config = mkIf cfg.enable {
+    programs.mpv = {
+      enable = true;
+      defaultProfiles = ["gpu-hq"];
+      scripts = [pkgs.mpvScripts.mpris];
+    };
+  };
+}

modules/home/utils/rofi/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.userModules.utils.rofi;
+  cfg = config.home.utils.rofi;
 in {
   options = {
-    userModules.utils.rofi.enable = mkEnableOption "Enables firefox";
+    home.utils.rofi.enable = mkEnableOption "Enables firefox";
   };
   config = mkIf cfg.enable {
     programs.rofi = {

modules/home/utils/ssh/default.nix

@@ -4,10 +4,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.userModules.utils.ssh;
+  cfg = config.home.utils.ssh;
 in {
   options = {
-    userModules.utils.ssh.enable = mkEnableOption "Enables ssh";
+    home.utils.ssh.enable = mkEnableOption "Enables ssh";
   };
   config = mkIf cfg.enable {
     programs.ssh = {

modules/home/utils/tuirun/default.nix

@@ -6,13 +6,13 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.userModules.utils.tuirun;
+  cfg = config.home.utils.tuirun;
 in {
   imports = [
     inputs.tuirun.homeManagerModules.default
   ];
   options = {
-    userModules.utils.tuirun.enable = mkEnableOption "Enables tuirun";
+    home.utils.tuirun.enable = mkEnableOption "Enables tuirun";
   };
   config = mkIf cfg.enable {
     programs.tuirun = {

modules/home/utils/waybar/default.nix

@@ -5,10 +5,10 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.userModules.utils.waybar;
+  cfg = config.home.utils.waybar;
 in {
   options = {
-    userModules.utils.waybar.enable = mkEnableOption "Enables waybar";
+    home.utils.waybar.enable = mkEnableOption "Enables waybar";
   };
   config = mkIf cfg.enable {
     systemd.user.services.waybar = {