modularize

mod/desktop/audio.nix

@@ -0,0 +1,28 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+let
+  cfg = config.desktop.audio;
+  inherit (lib) mkEnableOption mkIf;
+in
+{
+  options.desktop.audio.enable = mkEnableOption "Audio";
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [
+      pavucontrol
+      alsa-utils
+    ];
+
+    services.pulseaudio.enable = false;
+    services.pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+    };
+  };
+}

mod/desktop/default.nix

@@ -0,0 +1,76 @@
+{
+  inputs,
+  lib,
+  config,
+  options,
+  ...
+}:
+let
+  cfg = config.desktop;
+  inherit (lib) mkEnableOption mkIf;
+in
+{
+  imports = [
+    ./audio.nix
+    ./fonts.nix
+    ./gpg.nix
+    ./network.nix
+    ./services.nix
+    ./window-manager.nix
+    ./software
+    inputs.nixos-config-hidden.nixosModules.pc
+    inputs.home-manager.nixosModules.home-manager
+    {
+      home-manager.users."hd" = lib.mkAliasDefinitions options.home;
+      # install to /etc/profiles, not ~/.nix-profile
+      home-manager.useUserPackages = true;
+      # dont use home.nixpkgs
+      home-manager.useGlobalPkgs = true;
+    }
+
+  ];
+
+  options = {
+    desktop.enable = mkEnableOption "Desktop Configuration";
+    home = lib.mkOption {
+      type = lib.types.attrsOf lib.types.str;
+      default = { };
+      description = "home-manager configuration.";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    desktop = {
+      audio.enable = true;
+      fonts.enable = true;
+      gpg.enable = true;
+      network.enable = true;
+      services.enable = true;
+      software.enable = true;
+      wm.enable = true;
+    };
+
+    nixpkgs.config.allowUnfreePredicate =
+      pkg:
+      builtins.elem (lib.getName pkg) [
+        "nvidia-x11"
+        "nvidia-settings"
+        "vscode"
+        "obsidian"
+        "steam"
+        "steam-unwrapped"
+        "gateway" # jetbrains
+        "spotify"
+        "rust-rover"
+      ];
+
+    programs.nix-ld.enable = true;
+
+    home = {
+      home.stateVersion = config.system.stateVersion;
+      imports = [ ../../mod-hm ];
+    };
+
+    security.protectKernelImage = true;
+  };
+}

mod/desktop/fonts.nix

@@ -0,0 +1,25 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+let
+  cfg = config.desktop.fonts;
+  inherit (lib) mkEnableOption mkIf;
+in
+{
+  options.desktop.fonts.enable = mkEnableOption "Fonts";
+  config = mkIf cfg.enable {
+    fonts = {
+      packages = with pkgs; [
+        noto-fonts
+        noto-fonts-cjk-sans
+        noto-fonts-emoji
+        nerd-fonts.noto
+      ];
+      fontDir.enable = true;
+      fontconfig.defaultFonts.monospace = [ "Noto Nerd Font Mono" ];
+    };
+  };
+}

mod/desktop/gpg.nix

@@ -0,0 +1,33 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.desktop.gpg;
+  inherit (lib) mkEnableOption mkIf;
+in
+{
+  options.desktop.gpg.enable = mkEnableOption "GPG";
+  config = mkIf cfg.enable {
+    home = {
+      home.packages = with pkgs; [
+        seahorse
+        libsecret
+        gnome-keyring
+      ];
+      programs.gpg = {
+        enable = true;
+      };
+      services.gpg-agent = {
+        enable = true;
+        enableSshSupport = true;
+        pinentry.package = pkgs.pinentry-gtk2;
+      };
+    };
+    services.gnome.gnome-keyring = {
+      enable = true;
+    };
+  };
+}

mod/desktop/network.nix

@@ -0,0 +1,87 @@
+{
+  host,
+  var,
+  config,
+  lib,
+  ...
+}:
+let
+  cfg = config.desktop.network;
+  inherit (lib) mkEnableOption mkIf;
+in
+{
+  options.desktop.network = {
+    enable = mkEnableOption "All Network Options";
+  };
+
+  config = mkIf cfg.enable {
+
+    hardware.bluetooth.enable = true;
+    systemd.network.wait-online.enable = false;
+
+    services = {
+      mullvad-vpn.enable = true;
+      blueman.enable = true;
+      resolved = {
+        # TODO: find out why doh breaks moodle...
+        enable = true;
+      };
+    };
+
+    networking = {
+      enableIPv6 = true;
+
+      wireguard.enable = true;
+      wg-quick = {
+        interfaces = {
+          "onet" = {
+            address = var.wg.wireguard-network.${host}.ips;
+            privateKeyFile = var.wg.keyFile;
+            peers = [ (lib.removeAttrs var.wg.wireguard-network."roam" [ "ips" ]) ];
+          };
+        };
+      };
+
+      networkmanager = {
+        enable = true;
+        wifi.macAddress = "random";
+        ensureProfiles.profiles = {
+          "tuda-vpn" = {
+            connection = {
+              autoconnect = "false";
+              id = "tuda-vpn";
+              type = "vpn";
+            };
+            ipv4 = {
+              method = "auto";
+            };
+            ipv6 = {
+              addr-gen-mode = "stable-privacy";
+              method = "auto";
+            };
+            vpn = {
+              authtype = "password";
+              autoconnect-flags = "0";
+              certsigs-flags = "0";
+              cookie-flags = "2";
+              disable_udp = "no";
+              enable_csd_trojan = "no";
+              gateway = "vpn.hrz.tu-darmstadt.de";
+              gateway-flags = "2";
+              gwcert-flags = "2";
+              lasthost-flags = "0";
+              pem_passphrase_fsid = "no";
+              prevent_invalid_cert = "no";
+              protocol = "anyconnect";
+              resolve-flags = "2";
+              service-type = "org.freedesktop.NetworkManager.openconnect";
+              stoken_source = "disabled";
+              xmlconfig-flags = "0";
+              password-flags = 0;
+            };
+          };
+        };
+      };
+    };
+  };
+}

mod/desktop/services.nix

@@ -0,0 +1,49 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+let
+  cfg = config.desktop.services;
+  inherit (lib) mkEnableOption mkIf;
+in
+{
+  options.desktop.services.enable = mkEnableOption "Services";
+
+  config = mkIf cfg.enable {
+    services = {
+      printing.enable = true;
+      avahi = {
+        enable = true;
+        nssmdns4 = true;
+        openFirewall = true;
+      };
+      udisks2.enable = true;
+      emacs.enable = true;
+    };
+
+    home.services.protonmail-bridge = {
+      enable = true;
+      path = with pkgs; [
+        pass
+        gnome-keyring
+      ];
+    };
+
+    home.services.unison' = {
+      # TODO: parameterize
+      enable = true;
+      pairs = {
+        "docs".roots = [
+          "/home/hd/Documents"
+          "ssh://roam//home/hd/Documents"
+        ];
+        "desktop".roots = [
+          "/home/hd/Desktop"
+          "ssh://roam//home/hd/Desktop"
+        ];
+      };
+    };
+  };
+}

mod/desktop/software/default.nix

@@ -0,0 +1,59 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.desktop.software;
+  inherit (lib) mkEnableOption mkIf;
+in
+{
+  imports = [ ./development.nix ];
+
+  options.desktop.software.enable = mkEnableOption "Software";
+
+  config = mkIf cfg.enable {
+    desktop.software.development.enable = true;
+
+    environment.systemPackages = with pkgs; [
+      bitwarden
+      calibre
+      element-desktop
+      kitty
+      nil
+      obsidian
+      signal-desktop
+      spotify
+      tor-browser
+      vesktop
+      vlc
+      wireguard-tools
+      zotero
+      zulip
+    ];
+
+    virtualisation = {
+      docker.enable = true;
+    };
+
+    programs = {
+      firefox.enable = true;
+      kdeconnect.enable = true;
+    };
+
+    home = {
+      programs.thunderbird = {
+        enable = true;
+        package = pkgs.thunderbird-latest;
+        profiles.default = {
+          isDefault = true;
+          withExternalGnupg = true;
+        };
+      };
+    };
+
+    # Some excludes
+    services.xserver.excludePackages = [ pkgs.xterm ];
+  };
+}

mod/desktop/software/development.nix

@@ -0,0 +1,35 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+let
+  cfg = config.desktop.software.development;
+  inherit (lib) mkEnableOption mkIf;
+in
+{
+  options.desktop.software.development.enable = mkEnableOption "Dev Software";
+
+  config = mkIf cfg.enable {
+    documentation.dev.enable = true;
+
+    environment.systemPackages = with pkgs; [
+      vscode
+      binutils
+      clang
+      gcc
+      gdb
+      gnumake
+      man-pages
+      man-pages-posix
+      nixfmt-rfc-style
+      python313
+      python313Packages.mypy
+      rustup
+      emacs
+      jetbrains.gateway
+      jetbrains.rust-rover
+    ];
+  };
+}

mod/desktop/window-manager.nix

@@ -0,0 +1,22 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+let
+  cfg = config.desktop.wm;
+  inherit (lib) mkEnableOption mkIf;
+in
+{
+  options.desktop.wm.enable = mkEnableOption "Window Manager";
+
+  config = mkIf cfg.enable {
+    # Enable the KDE Plasma Desktop Environment.
+    services.displayManager.sddm = {
+      enable = true;
+      wayland.enable = true;
+    };
+    services.desktopManager.plasma6.enable = true;
+  };
+}