modularized nix configuration; builds correctly

20 files changed, 830 insertions, 653 deletions

diff --git a/nix/modules/home/default.nix b/nix/modules/home/default.nix
new file mode 100644
index 0000000..b2d3ef5
--- /dev/null
+++ b/nix/modules/home/default.nix
@@ -0,0 +1,169 @@
+{ lib, config, pkgs, ... }:
+{
+  imports = [
+    ../vars.nix
+    ./fcitx.nix
+    ./secrets.nix
+    ./emacs.nix
+    ./firefox.nix
+    ./git.nix
+    ./hyprland.nix
+    ./mpv.nix
+    ./yt-dlp.nix
+    ./wofi.nix
+    ./kitty.nix
+    ./waybar.nix
+    ./zsh.nix
+    ./mbsync.nix
+    ./msmtp.nix
+    ./gammastep.nix
+    ./mpd.nix
+    ./mako.nix
+    ./user.nix
+  ];
+
+  options = {
+    monorepo.profiles = {
+      enable = lib.mkEnableOption "Enables home manager desktop configuration";
+      # Programs
+      lang-c.enable = lib.mkEnableOption "Enables C language support";
+      lang-sh.enable = lib.mkEnableOption "Enables sh language support";
+      lang-rust.enable = lib.mkEnableOption "Enables Rust language support";
+      lang-python.enable = lib.mkEnableOption "Enables python language support";
+      lang-sol.enable = lib.mkEnableOption "Enables solidity language support";
+      lang-openscad.enable = lib.mkEnableOption "Enables openscad language support";
+      lang-js.enable = lib.mkEnableOption "Enables javascript language support";
+      lang-nix.enable = lib.mkEnableOption "Enables nix language support";
+
+      crypto.enable = lib.mkEnableOption "Enables various cryptocurrency wallets";
+      art.enable = lib.mkEnableOption "Enables various art programs";
+      music.enable = lib.mkEnableOption "Enables mpd";
+
+      hyprland = {
+        enable = lib.mkEnableOption "Enables hyprland";
+        monitors = lib.mkOption {
+          type = lib.types.listOf lib.types.str;
+          default = [
+            "HDMI-A-1"
+            "eDP-1"
+            "DP-2"
+            "DP-3"
+            "LVDS-1"
+          ];
+          example = [];
+          description = "Hyprland monitors";
+        };
+      };
+      email = {
+        email = lib.mkOption {
+          type = lib.types.str;
+          default = "ret2pop@gmail.com";
+          example = "john@example.com";
+          description = "Email address and imaps/smtps account";
+        };
+        imapsServer = lib.mkOption {
+          type = lib.types.str;
+          default = "imap.gmail.com";
+          example = "imap.example.com";
+          description = "imaps server address";
+        };
+        smtpsServer = lib.mkOption {
+          type = lib.types.str;
+          default = "smtp.gmail.com";
+          example = "smtp.example.com";
+          description = "smtp server address";
+        };
+        enable = lib.mkEnableOption "Enables email";
+      };
+    };
+  };
+
+  config = {
+    home.packages = (if config.monorepo.profiles.email.enable then [ pkgs.mu ] else [])
+                    ++
+                    (if config.monorepo.profiles.lang-c.enable then (with pkgs; [
+                      autobuild
+                      clang
+                      gdb
+                      gnumake
+                      bear
+                      clang-tools
+                    ]) else [])
+                    ++
+                    (if config.monorepo.profiles.lang-js.enable then (with pkgs; [
+                      nodejs
+                      bun
+                      yarn
+                      typescript
+                      vscode-langservers-extracted
+                    ]) else [])
+                    ++
+                    (if config.monorepo.profiles.lang-rust.enable then (with pkgs; [
+                      cargo
+                      rust-analyzer
+                      rustfmt
+                    ]) else [])
+                    ++
+                    (if config.monorepo.profiles.lang-python.enable then (with pkgs; [
+                      poetry
+                      python3
+                      python312Packages.jedi
+                    ]) else [])
+                    ++
+                    (if config.monorepo.profiles.lang-sol.enable then (with pkgs; [
+                      solc
+                    ]) else [])
+                    ++
+                    (if config.monorepo.profiles.lang-openscad.enable then (with pkgs; [
+                      openscad
+                      openscad-lsp
+                    ]) else [])
+                    ++
+                    (if config.monorepo.profiles.lang-sh.enable then (with pkgs; [
+                      bash-language-server
+                    ]) else [])
+                    ++
+                    (if config.monorepo.profiles.lang-nix.enable then (with pkgs; [
+                      nil
+                      nixd
+                      nixfmt-rfc-style
+                    ]) else [])
+                    ++
+                    (if config.monorepo.profiles.crypto.enable then (with pkgs; [
+                      bitcoin
+                      electrum
+                      monero-cli
+                      monero-gui
+                    ]) else [])
+                    ++
+                    (if config.monorepo.profiles.art.enable then (with pkgs; [
+                      inkscape
+                      krita
+                    ]) else [])
+                    ++
+                    (if config.monorepo.profiles.music.enable then (with pkgs; [
+                      mpc-cli
+                      sox
+                    ]) else []);
+
+    monorepo.profiles = {
+      enable = lib.mkDefault true;
+      music.enable = lib.mkDefault true;
+      hyprland.enable = lib.mkDefault true;
+      email.enable = lib.mkDefault true;
+
+      # Programming
+      lang-c.enable = lib.mkDefault true;
+      lang-rust.enable = lib.mkDefault true;
+      lang-python.enable = lib.mkDefault true;
+      lang-sol.enable = lib.mkDefault true;
+      lang-sh.enable = lib.mkDefault true;
+      lang-openscad.enable = lib.mkDefault true;
+      lang-js.enable = lib.mkDefault true;
+      lang-nix.enable = lib.mkDefault true;
+
+      crypto.enable = lib.mkDefault true;
+      art.enable = lib.mkDefault true;
+    };
+  };
+}
diff --git a/nix/modules/home/emacs.nix b/nix/modules/home/emacs.nix
index f269c01..190adee 100644
--- a/nix/modules/home/emacs.nix
+++ b/nix/modules/home/emacs.nix
@@ -1,85 +1,88 @@
 { lib, config, pkgs, ... }:
 {
-  enable = lib.mkDefault config.monorepo.profiles.home.enable;
-  package = pkgs.emacs29-pgtk;
-  extraConfig = ''
+  programs.emacs = 
+    {
+      enable = true;
+      package = pkgs.emacs29-pgtk;
+      extraConfig = ''
       (setq debug-on-error t)
       (org-babel-load-file
         (expand-file-name "~/monorepo/config/emacs.org"))'';
-  extraPackages = epkgs: [
-    epkgs.all-the-icons
-    epkgs.auctex
-    epkgs.catppuccin-theme
-    epkgs.chatgpt-shell
-    epkgs.company
-    epkgs.company-solidity
-    epkgs.counsel
-    epkgs.dashboard
-    epkgs.doom-modeline
-    epkgs.elfeed
-    epkgs.elfeed-org
-    epkgs.elfeed-tube
-    epkgs.elfeed-tube-mpv
-    epkgs.ellama
-    epkgs.elpher
-    epkgs.ement
-    epkgs.emmet-mode
-    epkgs.emms
-    epkgs.enwc
-    epkgs.evil
-    epkgs.evil-collection
-    epkgs.evil-commentary
-    epkgs.evil-org
-    epkgs.f
-    epkgs.flycheck
-    epkgs.general
-    epkgs.gptel
-    epkgs.gruvbox-theme
-    epkgs.htmlize
-    epkgs.irony-eldoc
-    epkgs.ivy
-    epkgs.ivy-pass
-    epkgs.latex-preview-pane
-    epkgs.lsp-ivy
-    epkgs.lsp-mode
-    epkgs.lyrics-fetcher
-    epkgs.magit
-    epkgs.magit-delta
-    epkgs.mu4e
-    epkgs.nix-mode
-    epkgs.org-fragtog
-    epkgs.org-journal
-    epkgs.org-roam
-    epkgs.org-roam-ui
-    epkgs.org-superstar
-    epkgs.page-break-lines
-    epkgs.password-store
-    epkgs.pdf-tools
-    epkgs.pinentry
-    epkgs.platformio-mode
-    epkgs.projectile
-    epkgs.rustic
-    epkgs.scad-mode
-    epkgs.simple-httpd
-    epkgs.solidity-flycheck
-    epkgs.solidity-mode
-    epkgs.sudo-edit
-    epkgs.treemacs
-    epkgs.treemacs-evil
-    epkgs.treemacs-magit
-    epkgs.treemacs-projectile
-    epkgs.treesit-auto
-    epkgs.typescript-mode
-    epkgs.unicode-fonts
-    epkgs.use-package
-    epkgs.vterm
-    epkgs.web-mode
-    epkgs.websocket
-    epkgs.which-key
-    epkgs.writegood-mode
-    epkgs.writeroom-mode
-    epkgs.yaml-mode
-    epkgs.yasnippet
-    epkgs.yasnippet-snippets
-  ];
+      extraPackages = epkgs: [
+        epkgs.all-the-icons
+        epkgs.auctex
+        epkgs.catppuccin-theme
+        epkgs.chatgpt-shell
+        epkgs.company
+        epkgs.company-solidity
+        epkgs.counsel
+        epkgs.dashboard
+        epkgs.doom-modeline
+        epkgs.elfeed
+        epkgs.elfeed-org
+        epkgs.elfeed-tube
+        epkgs.elfeed-tube-mpv
+        epkgs.ellama
+        epkgs.elpher
+        epkgs.ement
+        epkgs.emmet-mode
+        epkgs.emms
+        epkgs.enwc
+        epkgs.evil
+        epkgs.evil-collection
+        epkgs.evil-commentary
+        epkgs.evil-org
+        epkgs.f
+        epkgs.flycheck
+        epkgs.general
+        epkgs.gptel
+        epkgs.gruvbox-theme
+        epkgs.htmlize
+        epkgs.irony-eldoc
+        epkgs.ivy
+        epkgs.ivy-pass
+        epkgs.latex-preview-pane
+        epkgs.lsp-ivy
+        epkgs.lsp-mode
+        epkgs.lyrics-fetcher
+        epkgs.magit
+        epkgs.magit-delta
+        epkgs.mu4e
+        epkgs.nix-mode
+        epkgs.org-fragtog
+        epkgs.org-journal
+        epkgs.org-roam
+        epkgs.org-roam-ui
+        epkgs.org-superstar
+        epkgs.page-break-lines
+        epkgs.password-store
+        epkgs.pdf-tools
+        epkgs.pinentry
+        epkgs.platformio-mode
+        epkgs.projectile
+        epkgs.rustic
+        epkgs.scad-mode
+        epkgs.simple-httpd
+        epkgs.solidity-flycheck
+        epkgs.solidity-mode
+        epkgs.sudo-edit
+        epkgs.treemacs
+        epkgs.treemacs-evil
+        epkgs.treemacs-magit
+        epkgs.treemacs-projectile
+        epkgs.treesit-auto
+        epkgs.typescript-mode
+        epkgs.unicode-fonts
+        epkgs.use-package
+        epkgs.vterm
+        epkgs.web-mode
+        epkgs.websocket
+        epkgs.which-key
+        epkgs.writegood-mode
+        epkgs.writeroom-mode
+        epkgs.yaml-mode
+        epkgs.yasnippet
+        epkgs.yasnippet-snippets
+      ];
+    };
 }
diff --git a/nix/modules/home/fcitx.nix b/nix/modules/home/fcitx.nix
new file mode 100644
index 0000000..05dd8f7
--- /dev/null
+++ b/nix/modules/home/fcitx.nix
@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+{
+  i18n.inputMethod = {
+    enabled = "fcitx5";
+    fcitx5.addons = with pkgs; [
+      fcitx5-gtk
+      fcitx5-chinese-addons
+      fcitx5-configtool
+      fcitx5-mozc
+      fcitx5-rime
+    ];
+  };
+}
diff --git a/nix/modules/home/firefox.nix b/nix/modules/home/firefox.nix
index ea239c0..e5a4bd5 100644
--- a/nix/modules/home/firefox.nix
+++ b/nix/modules/home/firefox.nix
@@ -1,259 +1,261 @@
 { lib, config, pkgs, ... }:
 {
-  enable = lib.mkDefault config.monorepo.profiles.home.enable;
-  policies = {
-    EnableTrackingProtection = true;
-    OfferToSaveLogins = false;
-  };
-  package = pkgs.firefox-wayland;
-  profiles = {
-    default = {
-      id = 0;
-      name = "default";
-      isDefault = true;
-
-      extensions = with pkgs.nur.repos.rycee.firefox-addons; [
-        ublock-origin
-        tree-style-tab
-        firefox-color
-        vimium
-      ]
-      ++ (lib.optional
-        config.monorepo.profiles.home.crypto.enable pkgs.nur.repos.rycee.firefox-addons.metamask);
+  programs.firefox = {
+    enable = true;
+    policies = {
+      EnableTrackingProtection = true;
+      OfferToSaveLogins = false;
+    };
+    package = pkgs.firefox-wayland;
+    profiles = {
+      default = {
+        id = 0;
+        name = "default";
+        isDefault = true;
 
-      settings = {
-        media = {
-          memory_cache_max_size = 65536;
-          cache_readahead_limit = 7200;
-          cache_resume_threshold = 3600;
-          peerconnection.ice = {
-            proxy_only_if_behind_proxy = true;
-            default_address_only = true;
-          };
-        };
+        extensions = with pkgs.nur.repos.rycee.firefox-addons; [
+          ublock-origin
+          tree-style-tab
+          firefox-color
+          vimium
+        ]
+        ++ (lib.optional
+          config.monorepo.profiles.crypto.enable pkgs.nur.repos.rycee.firefox-addons.metamask);
 
-        gfx = {
-          content.skia-font-cache-size = 20;
-          canvas.accelerated = {
-            cache-items = 4096;
-            cache-size = 512;
+        settings = {
+          media = {
+            memory_cache_max_size = 65536;
+            cache_readahead_limit = 7200;
+            cache_resume_threshold = 3600;
+            peerconnection.ice = {
+              proxy_only_if_behind_proxy = true;
+              default_address_only = true;
+            };
           };
-        };
 
-        network = {
-          http = {
-            max-connections = 1800;
-            max-persistent-connections-per-server = 10;
-            max-urgent-start-excessive-connections-per-host = 5;
-            referer.XOriginTrimmingPolicy = 2;
+          gfx = {
+            content.skia-font-cache-size = 20;
+            canvas.accelerated = {
+              cache-items = 4096;
+              cache-size = 512;
+            };
           };
 
-          buffer.cache = {
-            size = 262144;
-            count = 128;
-          };
+          network = {
+            http = {
+              max-connections = 1800;
+              max-persistent-connections-per-server = 10;
+              max-urgent-start-excessive-connections-per-host = 5;
+              referer.XOriginTrimmingPolicy = 2;
+            };
 
-          dns = {
-            max_high_priority_threads = 8;
-            disablePrefetch = true;
-          };
+            buffer.cache = {
+              size = 262144;
+              count = 128;
+            };
 
-          pacing.requests.enabled = false;
-          dnsCacheExpiration = 3600;
-          ssl_tokens_cache_capacity = 10240;
-          prefetch-next = false;
-          predictor.enabled = false;
-          cookie.sameSite.noneRequiresSecure = true;
-          IDN_show_punycode = true;
-          auth.subresource-http-auth-allow = 1;
-          captive-portal-service.enabled = false;
-          connectivity-service.enabled = false;
-        };
+            dns = {
+              max_high_priority_threads = 8;
+              disablePrefetch = true;
+            };
 
-        browser = {
-          download = {
-            always_ask_before_handling_new_types = true;
-            manager.addToRecentDocs = false;
-            open_pdf_attachments_inline = true;
-            start_downloads_in_tmp_dir = true;
+            pacing.requests.enabled = false;
+            dnsCacheExpiration = 3600;
+            ssl_tokens_cache_capacity = 10240;
+            prefetch-next = false;
+            predictor.enabled = false;
+            cookie.sameSite.noneRequiresSecure = true;
+            IDN_show_punycode = true;
+            auth.subresource-http-auth-allow = 1;
+            captive-portal-service.enabled = false;
+            connectivity-service.enabled = false;
           };
 
-          urlbar = {
-            suggest.quicksuggest.sponsored = false;
-            suggest.quicksuggest.nonsponsored = false;
-            suggest.calculator = true;
-            update2.engineAliasRefresh = true;
-            unitConversion.enabled = true;
-            trending.featureGate = false;
-          };
+          browser = {
+            download = {
+              always_ask_before_handling_new_types = true;
+              manager.addToRecentDocs = false;
+              open_pdf_attachments_inline = true;
+              start_downloads_in_tmp_dir = true;
+            };
 
-          search = {
-            separatePrivateDefault.ui.enabled = true;
-            suggest.enabled = false;
-          };
+            urlbar = {
+              suggest.quicksuggest.sponsored = false;
+              suggest.quicksuggest.nonsponsored = false;
+              suggest.calculator = true;
+              update2.engineAliasRefresh = true;
+              unitConversion.enabled = true;
+              trending.featureGate = false;
+            };
 
-          newtabpage.activity-stream = {
-            feeds = {
-              topsites = false;
-              section.topstories = false;
+            search = {
+              separatePrivateDefault.ui.enabled = true;
+              suggest.enabled = false;
+            };
+
+            newtabpage.activity-stream = {
+              feeds = {
+                topsites = false;
+                section.topstories = false;
+                telemetry = false;
+              };
+              asrouter.userprefs.cfr = {
+                addons = false;
+                features = false;
+              };
               telemetry = false;
             };
-            asrouter.userprefs.cfr = {
-              addons = false;
-              features = false;
+
+            privatebrowsing = {
+              vpnpromourl = "";
+              forceMediaMemoryCache = true;
             };
-            telemetry = false;
-          };
 
-          privatebrowsing = {
-            vpnpromourl = "";
-            forceMediaMemoryCache = true;
-          };
+            display = {
+              focus_ring_on_anything = true;
+              focus_ring_style = 0;
+              focus_ring_width = 0;
+            };
 
-          display = {
-            focus_ring_on_anything = true;
-            focus_ring_style = 0;
-            focus_ring_width = 0;
+            cache.jsbc_compression_level = 3;
+            helperApps.deleteTempFileOnExit = true;
+            uitour.enabled = false;
+            sessionstore.interval = 60000;
+            formfill.enable = false;
+            xul.error_pages.expert_bad_cert = true;
+            contentblocking.category = "strict";
+            ping-centre.telemetry = false;
+            discovery.enabled = false;
+            shell.checkDefaultBrowser = false;
+            preferences.moreFromMozilla = false;
+            tabs.tabmanager.enabled = false;
+            aboutConfig.showWarning = false;
+            aboutwelcome.enabled = false;
+            bookmarks.openInTabClosesMenu = false;
+            menu.showViewImageInfo = true;
+            compactmode.show = true;
+            safebrowsing.downloads.remote.enabled = false;
+            tabs.crashReporting.sendReport = false;
+            crashReports.unsubmittedCheck.autoSubmit2 = false;
+            privateWindowSeparation.enabled = false;
           };
 
-          cache.jsbc_compression_level = 3;
-          helperApps.deleteTempFileOnExit = true;
-          uitour.enabled = false;
-          sessionstore.interval = 60000;
-          formfill.enable = false;
-          xul.error_pages.expert_bad_cert = true;
-          contentblocking.category = "strict";
-          ping-centre.telemetry = false;
-          discovery.enabled = false;
-          shell.checkDefaultBrowser = false;
-          preferences.moreFromMozilla = false;
-          tabs.tabmanager.enabled = false;
-          aboutConfig.showWarning = false;
-          aboutwelcome.enabled = false;
-          bookmarks.openInTabClosesMenu = false;
-          menu.showViewImageInfo = true;
-          compactmode.show = true;
-          safebrowsing.downloads.remote.enabled = false;
-          tabs.crashReporting.sendReport = false;
-          crashReports.unsubmittedCheck.autoSubmit2 = false;
-          privateWindowSeparation.enabled = false;
-        };
-
-        security = {
-          mixed_content = {
-            block_display_content = true;
-            upgrade_display_content = true;
-          };
-          insecure_connection_text = {
-            enabled = true;
-            pbmode.enabled = true;
+          security = {
+            mixed_content = {
+              block_display_content = true;
+              upgrade_display_content = true;
+            };
+            insecure_connection_text = {
+              enabled = true;
+              pbmode.enabled = true;
+            };
+            OCSP.enabled = 0;
+            remote_settings.crlite_filters.enabled = true;
+            pki.crlite_mode = 2;
+            ssl.treat_unsafe_negotiation_as_broken = true;
+            tls.enable_0rtt_data = false;
           };
-          OCSP.enabled = 0;
-          remote_settings.crlite_filters.enabled = true;
-          pki.crlite_mode = 2;
-          ssl.treat_unsafe_negotiation_as_broken = true;
-          tls.enable_0rtt_data = false;
-        };
 
-        toolkit = {
-          telemetry = {
-            unified = false;
-            enabled = false;
-            server = "data:,";
-            archive.enabled = false;
-            newProfilePing.enabled = false;
-            shutdownPingSender.enabled = false;
-            updatePing.enabled = false;
-            bhrPing.enabled = false;
-            firstShutdownPing.enabled = false;
-            coverage.opt-out = true;
-          };
-          coverage = {
-            opt-out = true;
-            endpoint.base = "";
+          toolkit = {
+            telemetry = {
+              unified = false;
+              enabled = false;
+              server = "data:,";
+              archive.enabled = false;
+              newProfilePing.enabled = false;
+              shutdownPingSender.enabled = false;
+              updatePing.enabled = false;
+              bhrPing.enabled = false;
+              firstShutdownPing.enabled = false;
+              coverage.opt-out = true;
+            };
+            coverage = {
+              opt-out = true;
+              endpoint.base = "";
+            };
+            legacyUserProfileCustomizations.stylesheets = true;
           };
-          legacyUserProfileCustomizations.stylesheets = true;
-        };
 
-        dom = {
-          security = {
-            https_first = true;
-            https_first_schemeless = true;
-            sanitizer.enabled = true;
+          dom = {
+            security = {
+              https_first = true;
+              https_first_schemeless = true;
+              sanitizer.enabled = true;
+            };
+            enable_web_task_scheduling = true;
           };
-          enable_web_task_scheduling = true;
-        };
 
-        layout = {
-          css = {
-            grid-template-masonry-value.enabled = true;
-            has-selector.enabled = true;
-            prefers-color-scheme.content-override = 2;
+          layout = {
+            css = {
+              grid-template-masonry-value.enabled = true;
+              has-selector.enabled = true;
+              prefers-color-scheme.content-override = 2;
+            };
+            word_select.eat_space_to_next_word = false;
           };
-          word_select.eat_space_to_next_word = false;
-        };
 
-        urlclassifier = {
-          trackingSkipURLs = "*.reddit.com, *.twitter.com, *.twimg.com, *.tiktok.com";
-          features.socialtracking.skipURLs = "*.instagram.com, *.twitter.com, *.twimg.com";
-        };
+          urlclassifier = {
+            trackingSkipURLs = "*.reddit.com, *.twitter.com, *.twimg.com, *.tiktok.com";
+            features.socialtracking.skipURLs = "*.instagram.com, *.twitter.com, *.twimg.com";
+          };
 
-        privacy = {
-          globalprivacycontrol.enabled = true;
-          history.custom = true;
-          userContext.ui.enabled = true;
-        };
+          privacy = {
+            globalprivacycontrol.enabled = true;
+            history.custom = true;
+            userContext.ui.enabled = true;
+          };
 
-        full-screen-api = {
-          transition-duration = {
-            enter = "0 0";
-            leave = "0 0";
+          full-screen-api = {
+            transition-duration = {
+              enter = "0 0";
+              leave = "0 0";
+            };
+            warning = {
+              delay = -1;
+              timeout = 0;
+            };
           };
-          warning = {
-            delay = -1;
-            timeout = 0;
+
+          permissions.default = {
+            desktop-notification = 2;
+            geo = 2;
           };
-        };
 
-        permissions.default = {
-          desktop-notification = 2;
-          geo = 2;
-        };
+          signon = {
+            formlessCapture.enabled = false;
+            privateBrowsingCapture.enabled = false;
+          };
 
-        signon = {
-          formlessCapture.enabled = false;
-          privateBrowsingCapture.enabled = false;
-        };
+          datareporting = {
+            policy.dataSubmissionEnabled = false;
+            healthreport.uploadEnabled = false;
+          };
 
-        datareporting = {
-          policy.dataSubmissionEnabled = false;
-          healthreport.uploadEnabled = false;
-        };
+          extensions = {
+            pocket.enabled = false;
+            getAddons.showPane = false;
+            htmlaboutaddons.recommendations.enabled = false;
+            postDownloadThirdPartyPrompt = false;
+          };
 
-        extensions = {
-          pocket.enabled = false;
-          getAddons.showPane = false;
-          htmlaboutaddons.recommendations.enabled = false;
-          postDownloadThirdPartyPrompt = false;
-        };
+          app = {
+            shield.optoutstudies.enabled = false;
+            normandy.enabled = false;
+            normandy.api_url = "";
+          };
 
-        app = {
-          shield.optoutstudies.enabled = false;
-          normandy.enabled = false;
-          normandy.api_url = "";
+          image.mem.decode_bytes_at_a_time = 32768;
+          editor.truncate_user_pastes = false;
+          pdfjs.enableScripting = false;
+          geo.provider.network.url = "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%";
+          permissions.manager.defaultsUrl = "";
+          webchannel.allowObject.urlWhitelist = "";
+          breakpad.reportURL = "";
+          captivedetect.canonicalURL = "";
+          cookiebanners.service.mode = 1;
+          findbar.highlightAll = true;
+          content.notify.interval = 100000;
         };
-
-        image.mem.decode_bytes_at_a_time = 32768;
-        editor.truncate_user_pastes = false;
-        pdfjs.enableScripting = false;
-        geo.provider.network.url = "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%";
-        permissions.manager.defaultsUrl = "";
-        webchannel.allowObject.urlWhitelist = "";
-        breakpad.reportURL = "";
-        captivedetect.canonicalURL = "";
-        cookiebanners.service.mode = 1;
-        findbar.highlightAll = true;
-        content.notify.interval = 100000;
       };
     };
   };
diff --git a/nix/modules/home/gammastep.nix b/nix/modules/home/gammastep.nix
index 97f7660..ae9d111 100644
--- a/nix/modules/home/gammastep.nix
+++ b/nix/modules/home/gammastep.nix
@@ -1,18 +1,20 @@
 { lib, config, ... }:
 {
-  enable = lib.mkDefault config.monorepo.profiles.home.enable;
-  provider = "manual";
-  latitude = 49.282730;
-  longitude = -123.120735;
-  
-  temperature = {
-    day = 5000;
-    night = 3000;
-  };
+  services.gammastep = {
+    enable = true;
+    provider = "manual";
+    latitude = 49.282730;
+    longitude = -123.120735;
+    
+    temperature = {
+      day = 5000;
+      night = 3000;
+    };
 
-  settings = {
-    general = {
-      adjustment-method = "wayland";
+    settings = {
+      general = {
+        adjustment-method = "wayland";
+      };
     };
   };
 }
diff --git a/nix/modules/home/git.nix b/nix/modules/home/git.nix
index 84f3b0f..d019ddb 100644
--- a/nix/modules/home/git.nix
+++ b/nix/modules/home/git.nix
@@ -1,22 +1,24 @@
 { lib, config, ... }:
 {
-  enable = lib.mkDefault config.monorepo.profiles.home.enable;
-  userName = config.vars.fullName;
-  userEmail = config.vars.email;
-  signing = {
-    key = config.vars.gpgKey;
-    signByDefault = true;
-  };
+  programs.git = {
+    enable = true;
+    userName = config.monorepo.vars.fullName;
+    userEmail = config.monorepo.profiles.email.email;
+    signing = {
+      key = config.monorepo.vars.gpgKey;
+      signByDefault = true;
+    };
 
-  extraConfig = {
-    init.defaultBranch = "main";
-  };
+    extraConfig = {
+      init.defaultBranch = "main";
+    };
 
-  aliases = {
-    co = "checkout";
-    c = "commit";
-    a = "add";
-    s = "switch";
-    b = "branch";
+    aliases = {
+      co = "checkout";
+      c = "commit";
+      a = "add";
+      s = "switch";
+      b = "branch";
+    };
   };
 }
diff --git a/nix/modules/home/home.nix b/nix/modules/home/home.nix
index d82445a..aa55550 100644
--- a/nix/modules/home/home.nix
+++ b/nix/modules/home/home.nix
@@ -1,15 +1,11 @@
 { config, sops-nix, ... }:
 {
-  imports = [
-    ../default.nix
-  ];
-
   home-manager = {
     sharedModules = [
       sops-nix.homeManagerModules.sops
     ];
     useGlobalPkgs = true;
     useUserPackages = true;
-    users."${config.monorepo.vars.userName}" = import ./user.nix;
+    users."${config.monorepo.vars.userName}" = import ./default.nix;
   };
 }
diff --git a/nix/modules/home/hyprland.nix b/nix/modules/home/hyprland.nix
index 69eedce..36e1621 100644
--- a/