From 1a3486d77574c06b395ab6cda41084f5ed24a3f4 Mon Sep 17 00:00:00 2001 From: Preston Pan Date: Thu, 16 Jan 2025 02:11:26 -0800 Subject: modularized nix configuration; builds correctly --- nix/flake.nix | 11 +- nix/modules/configuration.nix | 17 +- nix/modules/default.nix | 162 +--- nix/modules/home/default.nix | 169 ++++ nix/modules/home/emacs.nix | 161 ++-- nix/modules/home/fcitx.nix | 13 + nix/modules/home/firefox.nix | 434 +++++------ nix/modules/home/gammastep.nix | 26 +- nix/modules/home/git.nix | 34 +- nix/modules/home/home.nix | 6 +- nix/modules/home/hyprland.nix | 250 +++--- nix/modules/home/kitty.nix | 96 +-- nix/modules/home/mako.nix | 18 +- nix/modules/home/mbsync.nix | 10 +- nix/modules/home/mpd.nix | 12 +- nix/modules/home/mpv.nix | 12 + nix/modules/home/msmtp.nix | 12 +- nix/modules/home/secrets.nix | 30 +- nix/modules/home/user.nix | 55 +- nix/modules/home/waybar.nix | 36 +- nix/modules/home/wofi.nix | 38 +- nix/modules/home/yt-dlp.nix | 16 +- nix/modules/home/zsh.nix | 55 +- nix/modules/pipewire.nix | 50 +- nix/modules/sda-simple.nix | 11 +- nix/modules/ssh.nix | 14 +- nix/modules/tor.nix | 26 +- nix/modules/vars.nix | 91 ++- nix/modules/xserver.nix | 40 +- nix/systems/continuity/default.nix | 7 + nix/systems/desktop/configuration.nix | 403 ---------- nix/systems/desktop/home.nix | 14 - nix/systems/desktop/sda-simple.nix | 39 - nix/systems/desktop/user.nix | 1381 --------------------------------- nix/systems/desktop/vars.nix | 54 -- nix/systems/installer/default.nix | 55 ++ nix/systems/installer/iso.nix | 174 ----- 37 files changed, 1044 insertions(+), 2988 deletions(-) create mode 100644 nix/modules/home/default.nix create mode 100644 nix/modules/home/fcitx.nix create mode 100644 nix/modules/home/mpv.nix create mode 100644 nix/systems/continuity/default.nix delete mode 100644 nix/systems/desktop/configuration.nix delete mode 100644 nix/systems/desktop/home.nix delete mode 100644 nix/systems/desktop/sda-simple.nix delete mode 100644 nix/systems/desktop/user.nix delete mode 100644 nix/systems/desktop/vars.nix create mode 100644 nix/systems/installer/default.nix delete mode 100644 nix/systems/installer/iso.nix diff --git a/nix/flake.nix b/nix/flake.nix index 555a8c1..787b3a7 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -38,7 +38,7 @@ imports = [ (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix") ]; } ) - ./systems/installer/iso.nix + ./systems/installer/default.nix ]; }; @@ -46,15 +46,14 @@ system = "x86_64-linux"; specialArgs = attrs; modules = [ - { nixpkgs.overlays = [ nur.overlays.default ]; } - { home-manager.extraSpecialArgs = attrs; } lanzaboote.nixosModules.lanzaboote disko.nixosModules.disko home-manager.nixosModules.home-manager sops-nix.nixosModules.sops - ./systems/desktop/configuration.nix - ./systems/desktop/sda-simple.nix - ./systems/desktop/home.nix + { nixpkgs.overlays = [ nur.overlays.default ]; } + { home-manager.extraSpecialArgs = attrs; } + + ./systems/continuity/default.nix ]; }; diff --git a/nix/modules/configuration.nix b/nix/modules/configuration.nix index 46deabb..286d485 100644 --- a/nix/modules/configuration.nix +++ b/nix/modules/configuration.nix @@ -1,6 +1,11 @@ { config, pkgs, lib, ... }: { - imports = []; + imports = [ + ./xserver.nix + ./ssh.nix + ./pipewire.nix + ./tor.nix + ]; documentation = { enable = lib.mkDefault config.monorepo.profiles.documentation.enable; @@ -197,10 +202,6 @@ usbguard.enable = false; dbus.apparmor = "enabled"; - tor = import ./tor.nix; - xserver = import ./xserver.nix; - pipewire = import ./pipewire.nix; - openssh = import ./ssh.nix; kanata.enable = true; # Misc. @@ -228,7 +229,7 @@ hostPlatform = lib.mkDefault "x86_64-linux"; config = { allowUnfree = true; - cudaSupport = lib.mkDefault false; + cudaSupport = lib.mkDefault config.monorepo.profiles.cuda.enable; }; }; @@ -273,9 +274,11 @@ }; environment.systemPackages = with pkgs; [ - tree restic sbctl + git + vim + curl ]; users.users = { diff --git a/nix/modules/default.nix b/nix/modules/default.nix index db5f82e..9d06837 100644 --- a/nix/modules/default.nix +++ b/nix/modules/default.nix @@ -2,184 +2,40 @@ { imports = [ ./configuration.nix + ./home/home.nix + ./vars.nix ]; options = { monorepo = { - vars = import ./vars.nix; - profiles = { + cuda.enable = lib.mkEnableOption "Enables CUDA support"; documentation.enable = lib.mkEnableOption "Enables documentation on system."; secureBoot.enable = lib.mkEnableOption "Enables secure boot. See sbctl."; pipewire.enable = lib.mkEnableOption "Enables pipewire low latency audio setup"; tor.enable = lib.mkEnableOption "Enables tor along with torsocks"; - - - home = { - enable = lib.mkEnableOption "Enables home manager desktop configuration"; - # Programs - lang-c.enable = lib.mkEnableOption "Enables C language support"; - lang-shell.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"; - }; - }; + home.enable = lib.mkEnableOption "Enables home user"; }; }; }; config = { + home-manager.users."${config.monorepo.vars.userName}" = { + programs.home-manager.enable = config.monorepo.profiles.home.enable; + }; + environment.systemPackages = lib.mkIf config.monorepo.profiles.documentation.enable (with pkgs; [ linux-manual man-pages man-pages-posix ]); - home-manager.users."${config.monorepo.vars.userName}".home.packages = lib.flatten [ - (lib.mkIf config.monorepo.home.email.enable [ pkgs.mu ]) - (lib.mkIf config.monorepo.home.lang-c.enable (with pkgs; [ - autobuild - clang - gdb - gnumake - bear - clang-tools - ])) - - (lib.mkIf config.monorepo.home.lang-js.enable (with pkgs; [ - nodejs - bun - yarn - typescript - vscode-langservers-extracted - ])) - - (lib.mkIf config.monorepo.home.lang-rust.enable (with pkgs; [ - cargo - rust-analyzer - rustfmt - ])) - - (lib.mkIf config.monorepo.home.lang-python.enable (with pkgs; [ - poetry - python3 - python312Packages.jedi - ])) - - (lib.mkIf config.monorepo.home.lang-sol.enable (with pkgs; [ - solc - ])) - - (lib.mkIf config.monorepo.home.lang-openscad.enable (with pkgs; [ - openscad - openscad-lsp - ])) - - (lib.mkIf config.monorepo.home.lang-sh.enable (with pkgs; [ - bash-language-server - ])) - - (lib.mkIf config.monorepo.home.lang-nix.enable (with pkgs; [ - nil - nixd - nixfmt-rfc-style - ])) - - (lib.mkIf config.monorepo.home.crypto.enable (with pkgs; [ - bitcoin - electrum - monero-cli - monero-gui - ])) - - (lib.mkIf config.monorepo.home.art.enable (with pkgs; [ - inkscape - krita - ])) - - (lib.mkIf config.monorepo.home.music.enable (with pkgs; [ - mpc-cli - sox - ])) - - (lib.mkIf config.monorepo.tor.enable (with pkgs; [ - tor-browser - torsocks - ])) - - (lib.mkIf config.monorepo.pipewire.enable (with pkgs; [ - helvum - ])) - ]; - monorepo = { profiles = { documentation.enable = lib.mkDefault true; pipewire.enable = lib.mkDefault true; tor.enable = lib.mkDefault true; - home = { - enable = lib.mkDefault true; - music.enable = lib.mkDefault config.monorepo.profiles.pipewire.enable; - 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; - }; + home.enable = lib.mkDefault true; }; }; }; 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/nix/modules/home/hyprland.nix +++ b/nix/modules/home/hyprland.nix @@ -1,132 +1,134 @@ { lib, config, wallpapers, pkgs, scripts, ... }: { - enable = lib.mkDefault config.monorepo.profiles.home.hyprland.enable; - package = pkgs.hyprland; - xwayland.enable = true; - systemd.enable = true; - settings = { - "$mod" = "SUPER"; - exec-once = [ - "waybar" - "swww-daemon --format xrgb" - "swww img ${wallpapers}/imagination.png" - "fcitx5-remote -r" - "fcitx5 -d --replace" - "fcitx5-remote -r" - "emacs" - "firefox" - ]; - env = [ - "LIBVA_DRIVER_NAME,nvidia" - "XDG_SESSION_TYPE,wayland" - "GBM_BACKEND,nvidia-drm" - "__GLX_VENDOR_LIBRARY_NAME,nvidia" - "ELECTRON_OZONE_PLATFORM_HINT,auto" - ]; - blurls = [ - "waybar" - ]; - monitor = [ - "Unknown-1,disable" - ]; - windowrule = [ - "workspace 1, ^(.*emacs.*)$" - "workspace 2, ^(.*firefox.*)$" - "workspace 2, ^(.*Tor Browser.*)$" - "workspace 2, ^(.*Chromium-browser.*)$" - "workspace 2, ^(.*chromium.*)$" - "workspace 3, ^(.*discord.*)$" - "workspace 3, ^(.*vesktop.*)$" - "workspace 3, ^(.*fluffychat.*)$" - "workspace 3, ^(.*element-desktop.*)$" - "workspace 4, ^(.*qpwgraph.*)$" - "workspace 4, ^(.*mpv.*)$" - "workspace 5, ^(.*Monero.*)$" - "workspace 5, ^(.*org\.bitcoin\..*)$" - "workspace 5, ^(.*Bitcoin Core - preston.*)$" - "workspace 5, ^(.*org\.getmonero\..*)$" - "workspace 5, ^(.*Monero - preston.*)$" - "workspace 5, ^(.*electrum.*)$" - "pseudo,fcitx" - ]; - bind = [ - "$mod, F, exec, firefox" - "$mod, T, exec, tor-browser" - "$mod, Return, exec, kitty" - "$mod, E, exec, emacs" - "$mod, B, exec, bitcoin-qt" - "$mod, M, exec, monero-wallet-gui" - "$mod, V, exec, vesktop" - "$mod, D, exec, wofi --show run" - "$mod, P, exec, bash ${scripts}/powermenu.sh" - "$mod, Q, killactive" - "$mod SHIFT, H, movewindow, l" - "$mod SHIFT, L, movewindow, r" - "$mod SHIFT, K, movewindow, u" - "$mod SHIFT, J, movewindow, d" - "$mod, H, movefocus, l" - "$mod, L, movefocus, r" - "$mod, K, movefocus, u" - "$mod, J, movefocus, d" - ", XF86AudioPlay, exec, mpc toggle" - ", Print, exec, grim" - ] - ++ ( - builtins.concatLists (builtins.genList - ( - x: - let - ws = - let - c = (x + 1) / 10; - in - builtins.toString (x + 1 - (c * 10)); - in - [ - "$mod, ${ws}, workspace, ${toString (x + 1)}" - "$mod SHIFT, ${ws}, movetoworkspace, ${toString (x + 1)}" - ] - ) - 10) - ); - bindm = [ - "$mod, mouse:272, movewindow" - "$mod, mouse:273, resizewindow" - "$mod ALT, mouse:272, resizewindow" - ]; - binde = [ - ", XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+" - ", XF86AudioLowerVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%-" - ", XF86AudioNext, exec, mpc next" - ", XF86AudioPrev, exec, mpc prev" - ", XF86MonBrightnessUp , exec, xbacklight -inc 10" - ", XF86MonBrightnessDown, exec, xbacklight -dec 10" - ]; - decoration = { - blur = { - enabled = true; - size = 5; - passes = 2; + wayland.windowManager.hyprland = { + enable = lib.mkDefault config.monorepo.profiles.hyprland.enable; + package = pkgs.hyprland; + xwayland.enable = true; + systemd.enable = true; + settings = { + "$mod" = "SUPER"; + exec-once = [ + "waybar" + "swww-daemon --format xrgb" + "swww img ${wallpapers}/imagination.png" + "fcitx5-remote -r" + "fcitx5 -d --replace" + "fcitx5-remote -r" + "emacs" + "firefox" + ]; + env = [ + "LIBVA_DRIVER_NAME,nvidia" + "XDG_SESSION_TYPE,wayland" + "GBM_BACKEND,nvidia-drm" + "__GLX_VENDOR_LIBRARY_NAME,nvidia" + "ELECTRON_OZONE_PLATFORM_HINT,auto" + ]; + blurls = [ + "waybar" + ]; + monitor = [ + "Unknown-1,disable" + ]; + windowrule = [ + "workspace 1, ^(.*emacs.*)$" + "workspace 2, ^(.*firefox.*)$" + "workspace 2, ^(.*Tor Browser.*)$" + "workspace 2, ^(.*Chromium-browser.*)$" + "workspace 2, ^(.*chromium.*)$" + "workspace 3, ^(.*discord.*)$" + "workspace 3, ^(.*vesktop.*)$" + "workspace 3, ^(.*fluffychat.*)$" + "workspace 3, ^(.*element-desktop.*)$" + "workspace 4, ^(.*qpwgraph.*)$" + "workspace 4, ^(.*mpv.*)$" + "workspace 5, ^(.*Monero.*)$" + "workspace 5, ^(.*org\.bitcoin\..*)$" + "workspace 5, ^(.*Bitcoin Core - preston.*)$" + "workspace 5, ^(.*org\.getmonero\..*)$" + "workspace 5, ^(.*Monero - preston.*)$" + "workspace 5, ^(.*electrum.*)$" + "pseudo,fcitx" + ]; + bind = [ + "$mod, F, exec, firefox" + "$mod, T, exec, tor-browser" + "$mod, Return, exec, kitty" + "$mod, E, exec, emacs" + "$mod, B, exec, bitcoin-qt" + "$mod, M, exec, monero-wallet-gui" + "$mod, V, exec, vesktop" + "$mod, D, exec, wofi --show run" + "$mod, P, exec, bash ${scripts}/powermenu.sh" + "$mod, Q, killactive" + "$mod SHIFT, H, movewindow, l" + "$mod SHIFT, L, movewindow, r" + "$mod SHIFT, K, movewindow, u" + "$mod SHIFT, J, movewindow, d" + "$mod, H, movefocus, l" + "$mod, L, movefocus, r" + "$mod, K, movefocus, u" + "$mod, J, movefocus, d" + ", XF86AudioPlay, exec, mpc toggle" + ", Print, exec, grim" + ] + ++ ( + builtins.concatLists (builtins.genList + ( + x: + let + ws = + let + c = (x + 1) / 10; + in + builtins.toString (x + 1 - (c * 10)); + in + [ + "$mod, ${ws}, workspace, ${toString (x + 1)}" + "$mod SHIFT, ${ws}, movetoworkspace, ${toString (x + 1)}" + ] + ) + 10) + ); + bindm = [ + "$mod, mouse:272, movewindow" + "$mod, mouse:273, resizewindow" + "$mod ALT, mouse:272, resizewindow" + ]; + binde = [ + ", XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+" + ", XF86AudioLowerVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%-" + ", XF86AudioNext, exec, mpc next" + ", XF86AudioPrev, exec, mpc prev" + ", XF86MonBrightnessUp , exec, xbacklight -inc 10" + ", XF86MonBrightnessDown, exec, xbacklight -dec 10" + ]; + decoration = { + blur = { + enabled = true; + size = 5; + passes = 2; + }; + rounding = 5; }; - rounding = 5; - }; - input = { - kb_options = "caps:swapescape"; - repeat_delay = 300; - repeat_rate = 50; - natural_scroll = true; - touchpad = { + input = { + kb_options = "caps:swapescape"; + repeat_delay = 300; + repeat_rate = 50; natural_scroll = true; - disable_while_typing = true; - tap-to-click = true; + touchpad = { + natural_scroll = true; + disable_while_typing = true; + tap-to-click = true; + }; + }; + cursor = { + no_hardware_cursors = true; + }; + misc = { + force_default_wallpaper = 0; + disable_hyprland_logo = true; }; - }; - cursor = { - no_hardware_cursors = true; - }; - misc = { - force_default_wallpaper = 0; - disable_hyprland_logo = true; }; }; } diff --git a/nix/modules/home/kitty.nix b/nix/modules/home/kitty.nix index c716bef..973581a 100644 --- a/nix/modules/home/kitty.nix +++ b/nix/modules/home/kitty.nix @@ -1,51 +1,53 @@ { lib, config, ... }: { - enable = lib.mkDefault config.monorepo.profiles.home.hyprland.enable; - settings = { - enable_audio_bell = false; - font_family = "Iosevka Nerd Font"; - font_size = 14; - confirm_os_window_close = 0; - background_opacity = "0.9"; - # Catppuccin theme - foreground = "#cdd6f4"; - background = "#1e1e2e"; - selection_foreground = "#1e1e2e"; - selection_background = "#f5e0dc"; - cursor = "#f5e0dc"; - cursor_text_color = "#1e1e2e"; - url_color = "#f5e0dc"; - active_border_color = "#B4BEFE"; - inactive_border_color = "#6C7086"; - bell_border_color = "#F9E2AF"; - wayland_titlebar_color = "#1E1E2E"; - macos_titlebar_color = "#1E1E2E"; - active_tab_foreground = "#11111B"; - active_tab_background = "#CBA6F7"; - inactive_tab_foreground = "#CDD6F4"; - inactive_tab_background = "#181825"; - tab_bar_background = "#11111B"; - mark1_foreground = "#1E1E2E"; - mark1_background = "#B4BEFE"; - mark2_foreground = "#1E1E2E"; - mark2_background = "#CBA6F7"; - mark3_foreground = "#1E1E2E"; - mark3_background = "#74C7EC"; - color0 = "#45475A"; - color8 = "#585B70"; - color1 = "#F38BA8"; - color9 = "#F38BA8"; - color2 = "#A6E3A1"; - color10 = "#A6E3A1"; - color3 = "#F9E2AF"; - color11 = "#F9E2AF"; - color4 = "#89B4FA"; - color12 = "#89B4FA"; - color5 = "#F5C2E7"; - color13 = "#F5C2E7"; - color6 = "#94E2D5"; - color14 = "#94E2D5"; - color7 = "#BAC2DE"; - color15 = "#A6ADC8"; + programs.kitty = { + enable = lib.mkDefault config.monorepo.profiles.hyprland.enable; + settings = { + enable_audio_bell = false; + font_family = "Iosevka Nerd Font"; + font_size = 14; + confirm_os_window_close = 0; + background_opacity = "0.9"; + # Catppuccin theme + foreground = "#cdd6f4"; + background = "#1e1e2e"; + selection_foreground = "#1e1e2e"; + selection_background = "#f5e0dc"; + cursor = "#f5e0dc"; + cursor_text_color = "#1e1e2e"; + url_color = "#f5e0dc"; + active_border_color = "#B4BEFE"; + inactive_border_color = "#6C7086"; + bell_border_color = "#F9E2AF"; + wayland_titlebar_color = "#1E1E2E"; + macos_titlebar_color = "#1E1E2E"; + active_tab_foreground = "#11111B"; + active_tab_background = "#CBA6F7"; + inactive_tab_foreground = "#CDD6F4"; + inactive_tab_background = "#181825"; + tab_bar_background = "#11111B"; + mark1_foreground = "#1E1E2E"; + mark1_background = "#B4BEFE"; + mark2_foreground = "#1E1E2E"; + mark2_background = "#CBA6F7"; + mark3_foreground = "#1E1E2E"; + mark3_background = "#74C7EC"; + color0 = "#45475A"; + color8 = "#585B70"; + color1 = "#F38BA8"; + color9 = "#F38BA8"; + color2 = "#A6E3A1"; + color10 = "#A6E3A1"; + color3 = "#F9E2AF"; + color11 = "#F9E2AF"; + color4 = "#89B4FA"; + color12 = "#89B4FA"; + color5 = "#F5C2E7"; + color13 = "#F5C2E7"; + color6 = "#94E2D5"; + color14 = "#94E2D5"; + color7 = "#BAC2DE"; + color15 = "#A6ADC8"; + }; }; } diff --git a/nix/modules/home/mako.nix b/nix/modules/home/mako.nix index 3b7db8d..2a93508 100644 --- a/nix/modules/home/mako.nix +++ b/nix/modules/home/mako.nix @@ -1,13 +1,15 @@ { lib, config, ... }: { - enable = lib.mkDefault config.monorepo.profiles.home.enable; - backgroundColor = "#11111bf8"; - textColor = "#cdd6f4"; - borderColor = "#89b4faff"; - borderRadius = 1; - font = "Fira Code 10"; - defaultTimeout = 3000; - extraConfig = '' + services.mako = { + enable = true; + backgroundColor = "#11111bf8"; + textColor = "#cdd6f4"; + borderColor = "#89b4faff"; + borderRadius = 1; + font = "Fira Code 10"; + defaultTimeout = 3000; + extraConfig = '' on-notify=exec mpv /home/${config.monorepo.vars.userName}/sounds/notification.wav --no-config --no-video ''; + }; } diff --git a/nix/modules/home/mbsync.nix b/nix/modules/home/mbsync.nix index e509c27..67d971a 100644 --- a/nix/modules/home/mbsync.nix +++ b/nix/modules/home/mbsync.nix @@ -1,10 +1,11 @@ { lib, config, ... }: { - enable = lib.mkDefault config.profiles.home.email.enable; - extraConfig = '' + programs.mbsync = { + enable = lib.mkDefault config.monorepo.profiles.email.enable; + extraConfig = '' IMAPAccount ret2pop - Host ${config.profiles.home.email.imapsServer} - User ${config.profiles.email.email} + Host ${config.monorepo.profiles.email.imapsServer} + User ${config.monorepo.profiles.email.email} PassCmd "cat ${config.sops.secrets.mail.path}" Port 993 TLSType IMAPS @@ -28,4 +29,5 @@ Expunge None SyncState * ''; + }; } diff --git a/nix/modules/home/mpd.nix b/nix/modules/home/mpd.nix index eee23b3..434387c 100644 --- a/nix/modules/home/mpd.nix +++ b/nix/modules/home/mpd.nix @@ -1,11 +1,12 @@ { lib, config, ... }: { - enable = lib.mkDefault config.monorepo.profiles.home.music.enable; - dbFile = "/home/${config.vars.userName}/.config/mpd/db"; - dataDir = "/home/${config.vars.userName}/.config/mpd/"; + services.mpd = { + enable = lib.mkDefault config.monorepo.profiles.music.enable; + dbFile = "/home/${config.monorepo.vars.userName}/.config/mpd/db"; + dataDir = "/home/${config.monorepo.vars.userName}/.config/mpd/"; network.port = 6600; - musicDirectory = "/home/${config.vars.userName}/music"; - playlistDirectory = "/home/${config.vars.userName}/.config/mpd/playlists"; + musicDirectory = "/home/${config.monorepo.vars.userName}/music"; + playlistDirectory = "/home/${config.monorepo.vars.userName}/.config/mpd/playlists"; network.listenAddress = "0.0.0.0"; extraConfig = '' audio_output { @@ -24,4 +25,5 @@ tags "yes" # httpd supports sending tags to listening streams. } ''; + }; } diff --git a/nix/modules/home/mpv.nix b/nix/modules/home/mpv.nix new file mode 100644 index 0000000..42f5687 --- /dev/null +++ b/nix/modules/home/mpv.nix @@ -0,0 +1,12 @@ +{ lib, config, ... }: +{ + programs.mpv = { + enable = true; + config = { + profile = "gpu-hq"; + force-window = true; + ytdl-format = "bestvideo+bestaudio"; + cache-default = 4000000; + }; + }; +} diff --git a/nix/modules/home/msmtp.nix b/nix/modules/home/msmtp.nix index d965c18..6d69922 100644 --- a/nix/modules/home/msmtp.nix +++ b/nix/modules/home/msmtp.nix @@ -1,7 +1,8 @@ { lib, config, ... }: { - enable = lib.mkDefault config.monorepo.profiles.home.email.enable; - extraConfig = '' + programs.msmtp = { + enable = lib.mkDefault config.monorepo.profiles.email.enable; + extraConfig = '' # Set default values for all following accounts. defaults auth on @@ -12,14 +13,15 @@ # Gmail account ${config.monorepo.vars.userName} - host ${config.monorepo.profiles.home.email.smtpsServer} + host ${config.monorepo.profiles.email.smtpsServer} port 587 - from ${config.monorepo.profiles.home.email.email} - user ${config.monorepo.profiles.home.email.email} + from ${config.monorepo.profiles.email.email} + user ${config.monorepo.profiles.email.email} passwordeval "cat ${config.sops.secrets.mail.path}" # Set a default account account default : ${config.monorepo.vars.userName} ''; + }; } diff --git a/nix/modules/home/secrets.nix b/nix/modules/home/secrets.nix index d24129c..29e8c4c 100644 --- a/nix/modules/home/secrets.nix +++ b/nix/modules/home/secrets.nix @@ -1,18 +1,20 @@ { config, ... }: { - defaultSopsFile = ../../secrets/secrets.yaml; - age = { - keyFile = "/home/${config.vars.userName}/.ssh/keys.txt"; - }; - secrets.mail = { - format = "yaml"; - path = "${config.sops.defaultSymlinkPath}/mail"; - }; - secrets.digikey = { - format = "yaml"; - path = "${config.sops.defaultSymlinkPath}/digikey"; - }; + sops = { + defaultSopsFile = ../../secrets/secrets.yaml; + age = { + keyFile = "/home/${config.monorepo.vars.userName}/.ssh/keys.txt"; + }; + secrets.mail = { + format = "yaml"; + path = "${config.sops.defaultSymlinkPath}/mail"; + }; + secrets.digikey = { + format = "yaml"; + path = "${config.sops.defaultSymlinkPath}/digikey"; + }; - defaultSymlinkPath = "/run/user/1000/secrets"; - defaultSecretsMountPoint = "/run/user/1000/secrets.d"; + defaultSymlinkPath = "/run/user/1000/secrets"; + defaultSecretsMountPoint = "/run/user/1000/secrets.d"; + }; } diff --git a/nix/modules/home/user.nix b/nix/modules/home/user.nix index 597eb16..1e4c13e 100644 --- a/nix/modules/home/user.nix +++ b/nix/modules/home/user.nix @@ -1,6 +1,5 @@ { lib, config, pkgs, ... }: { - sops = import ./sops.nix; home = { activation.startup-files = lib.hm.dag.entryAfter [ "installPackages" ] '' if [ ! -d "/home/${config.monorepo.vars.userName}/email/ret2pop/" ]; then @@ -14,7 +13,6 @@ fi touch /home/${config.monorepo.vars.userName}/org/agenda.org touch /home/${config.monorepo.vars.userName}/org/notes.org - touch /home/${config.monorepo.vars.userName}/.monorepo ''; enableNixpkgsReleaseCheck = false; @@ -33,14 +31,17 @@ graphviz jq # Apps - octaveFull vesktop grim swww + octaveFull vesktop grim swww vim # Sound/media - pavucontrol alsa-utils imagemagick ffmpeg vim + pavucontrol alsa-utils imagemagick ffmpeg helvum # Net curl rsync git + # Tor + torsocks tor-browser + # fonts noto-fonts noto-fonts-cjk-sans @@ -58,23 +59,10 @@ acpilight pfetch libnotify - - # Shell script - (writeShellScriptBin "post-install" '' -cd $HOME -ping -q -c1 google.com &>/dev/null && echo "online! Proceeding with the post-install..." || nmtui -sudo chown -R "$(whoami)":users ./monorepo - -sudo nixos-rebuild switch --flake ./monorepo/nix#continuity -echo "Post install done! Now install your ssh and gpg keys. Log in again." -sleep 3 -exit -'') ]; }; services = { - mako = import ./mako.nix; gpg-agent = { pinentryPackage = pkgs.pinentry-emacs; enable = true; @@ -83,27 +71,9 @@ exit allow-loopback-pinentry ''; }; - gammastep = import ./gammastep.nix; - mpd = import ./mpd.nix; - }; - - programs = { - mpv = import ./mpv.nix; - yt-dlp = import ./yt-dlp.nix; - wofi = import ./wofi.nix; - kitty = import ./kitty.nix; - firefox = import ./firefox.nix; - waybar = import ./waybar.nix; - zsh = import ./zsh.nix; - emacs = import ./emacs.nix; - mbsync = import ./mbsync.nix; - msmtp = import ./msmtp.nix; - bash.enable = true; - git = import ./git.nix; - home-manager.enable = lib.mkDefault config.monorepo.profiles.home.enable; }; - wayland.windowManager.hyprland = import ./hyprland.nix; + programs.bash.enable = true; gtk = { enable = true; @@ -111,17 +81,6 @@ exit iconTheme = null; }; - i18n.inputMethod = { - enabled = "fcitx5"; - fcitx5.addons = with pkgs; [ - fcitx5-gtk - fcitx5-chinese-addons - fcitx5-configtool - fcitx5-mozc - fcitx5-rime - ]; - }; - fonts.fontconfig.enable = true; - nixpkgs.config.cudaSupport = false; + nixpkgs.config.cudaSupport = lib.mkDefault config.monorepo.profiles.cuda.enable; } diff --git a/nix/modules/home/waybar.nix b/nix/modules/home/waybar.nix index 3ef81e8..8e797a5 100644 --- a/nix/modules/home/waybar.nix +++ b/nix/modules/home/waybar.nix @@ -1,7 +1,8 @@ { lib, config, ... }: { - enable = lib.mkDefault config.monorepo.profiles.hyprland.enable; - style = '' + programs.waybar = { + enable = lib.mkDefault config.monorepo.profiles.hyprland.enable; + style = '' * { border: none; border-radius: 0px; @@ -247,25 +248,26 @@ font-weight: bold; } ''; - settings = { - mainBar = { - layer = "top"; - position = "top"; - height = 50; + settings = { + mainBar = { + layer = "top"; + position = "top"; + height = 50; - output = config.vars.monitors; + output = config.monorepo.vars.monitors; - modules-left = [ "hyprland/workspaces" ]; - modules-center = [ "hyprland/window" ]; - modules-right = [ "battery" "clock" ]; + modules-left = [ "hyprland/workspaces" ]; + modules-center = [ "hyprland/window" ]; + modules-right = [ "battery" "clock" ]; - battery = { - format = "{icon} {capacity}%"; - format-icons = ["" "" "" "" "" ]; - }; + battery = { + format = "{icon} {capacity}%"; + format-icons = ["" "" "" "" "" ]; + }; - clock = { - format = "⏰ {:%a %d, %b %H:%M}"; + clock = { + format = "⏰ {:%a %d, %b %H:%M}"; + }; }; }; }; diff --git a/nix/modules/home/wofi.nix b/nix/modules/home/wofi.nix index d2b1e53..f6c4179 100644 --- a/nix/modules/home/wofi.nix +++ b/nix/modules/home/wofi.nix @@ -1,23 +1,24 @@ { lib, config, ... }: { - enable = lib.mkDefault config.monorepo.profiles.home.enable; - settings = { - location = "bottom-right"; - allow_markup = true; - show = "drun"; - width = 750; - height = 400; - always_parse_args = true; - show_all = false; - term = "kitty"; - hide_scroll = true; - print_command = true; - insensitive = true; - prompt = "Run what, Commander?"; - columns = 2; - }; - - style = '' + programs.wofi = { + enable = true; + settings = { + location = "bottom-right"; + allow_markup = true; + show = "drun"; + width = 750; + height = 400; + always_parse_args = true; + show_all = false; + term = "kitty"; + hide_scroll = true; + print_command = true; + insensitive = true; + prompt = "Run what, Commander?"; + columns = 2; + }; + + style = '' @define-color rosewater #f5e0dc; @define-color rosewater-rgb rgb(245, 224, 220); @define-color flamingo #f2cdcd; @@ -183,4 +184,5 @@ background-color: @lavender!important; } ''; + }; } diff --git a/nix/modules/home/yt-dlp.nix b/nix/modules/home/yt-dlp.nix index 729fb8f..5ed35f5 100644 --- a/nix/modules/home/yt-dlp.nix +++ b/nix/modules/home/yt-dlp.nix @@ -1,11 +1,13 @@ { lib, config, ... }: { - enable = lib.mkDefault config.monorepo.profiles.home.video.enable; - settings = { - embed-thumbnail = true; - embed-subs = true; - sub-langs = "all"; - downloader = "aria2c"; - downloader-args = "aria2c:'-c -x8 -s8 -k1M'"; + programs.yt-dlp = { + enable = true; + settings = { + embed-thumbnail = true; + embed-subs = true; + sub-langs = "all"; + downloader = "aria2c"; + downloader-args = "aria2c:'-c -x8 -s8 -k1M'"; + }; }; } diff --git a/nix/modules/home/zsh.nix b/nix/modules/home/zsh.nix index d56dd69..7e2821e 100644 --- a/nix/modules/home/zsh.nix +++ b/nix/modules/home/zsh.nix @@ -1,41 +1,40 @@ { lib, config, pkgs, ... }: { - enable = lib.mkDefault config.monorepo.profiles.home.enable; - initExtra = '' + programs.zsh = { + enable = true; + initExtra = '' umask 0077 export EXTRA_CCFLAGS="-I/usr/include" source ${pkgs.zsh-vi-mode}/share/zsh-vi-mode/zsh-vi-mode.plugin.zsh export QT_QPA_PLATFORM="wayland" ''; - localVariables = { - EDITOR = "emacsclient --create-frame --alternate-editor=vim"; - INPUT_METHOD = "fcitx"; - QT_IM_MODULE = "fcitx"; - GTK_IM_MODULE = "fcitx"; - XMODIFIERS = "@im=fcitx"; - XIM_SERVERS = "fcitx"; - WXSUPPRESS_SIZER_FLAGS_CHECK = "1"; - }; + localVariables = { + EDITOR = "emacsclient --create-frame --alternate-editor=vim"; + INPUT_METHOD = "fcitx"; + QT_IM_MODULE = "fcitx"; + GTK_IM_MODULE = "fcitx"; + XMODIFIERS = "@im=fcitx"; + XIM_SERVERS = "fcitx"; + WXSUPPRESS_SIZER_FLAGS_CHECK = "1"; + }; - shellAliases = { - c = "clear"; - g = "git"; - v = "vim"; - py = "python3"; - rb = "sudo nixos-rebuild switch --flake .#continuity"; - nfu = "cd ~/monorepo/nix && git add . && git commit -m \"new flake lock\" && nix flake update"; - usite - = "cd