modules: move shared pc modules from desktop to pc

30 files changed, 11 insertions, 539 deletions

diff --git a/modules/desktop/software/access/default.nix b/modules/desktop/software/access/default.nix
deleted file mode 100644
index 32d5500..0000000
--- a/modules/desktop/software/access/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  imports = [
-    ./gnupg.nix
-    ./ssh.nix
-  ];
-}
diff --git a/modules/desktop/software/access/gnupg.nix b/modules/desktop/software/access/gnupg.nix
deleted file mode 100644
index e60da30..0000000
--- a/modules/desktop/software/access/gnupg.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ pkgs, ... }:
-{
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-    pinentryPackage = pkgs.pinentry-curses;
-    enableExtraSocket = true;
-    enableBrowserSocket = true;
-
-    settings = {
-      enable-ssh-support = "";
-      ttyname = "$GPG_TTY";
-      default-cache-ttl = 34560000; # 60
-      max-cache-ttl = 34560000; # 120
-      allow-loopback-pinentry = "";
-    };
-  };
-}
diff --git a/modules/desktop/software/access/ssh.nix b/modules/desktop/software/access/ssh.nix
deleted file mode 100644
index b514049..0000000
--- a/modules/desktop/software/access/ssh.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ lib, config, ... }:
-{
-  programs.ssh.startAgent = false;
-  security.pam.sshAgentAuth.enable = true;
-
-  services.fail2ban.jails.sshd.settings = {
-    enabled = true;
-    filter = "sshd[mode=aggressive]";
-    port = lib.strings.concatStringsSep "," (map toString config.services.openssh.ports);
-  };
-}
diff --git a/modules/desktop/software/default.nix b/modules/desktop/software/default.nix
index 179f4ad..01e196c 100644
--- a/modules/desktop/software/default.nix
+++ b/modules/desktop/software/default.nix
@@ -1,40 +1,13 @@
-{ pkgs, ... }:
 {
   imports = [
-    ./access
     ./boot
-    ./desktop
-    ./multimedia
     ./services
+    ./video
     ./aagl.nix
-    ./encryption.nix
     ./gaming.nix
-    ./input.nix
-    ./locale.nix
     ./programs.nix
-    ./shell.nix
     ./systemd.nix
-    ./users.nix
   ];
 
-  environment.enableAllTerminfo = true;
   services.displayManager.ly.enable = true;
-
-  system = {
-    autoUpgrade = {
-      enable = false;
-      allowReboot = false;
-    };
-
-    switch = {
-      enable = false;
-      enableNg = true;
-    };
-  };
-
-  console = {
-    earlySetup = true;
-    font = "ter-v16n";
-    packages = [ pkgs.terminus_font ];
-  };
 }
diff --git a/modules/desktop/software/desktop/default.nix b/modules/desktop/software/desktop/default.nix
deleted file mode 100644
index bd2c811..0000000
--- a/modules/desktop/software/desktop/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  imports = [
-    ./gtk.nix
-    ./xdg-portal.nix
-  ];
-}
diff --git a/modules/desktop/software/desktop/gtk.nix b/modules/desktop/software/desktop/gtk.nix
deleted file mode 100644
index 4357e75..0000000
--- a/modules/desktop/software/desktop/gtk.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.systemPackages = with pkgs; [
-    gtk2
-    gtk3
-    gtk4
-  ];
-}
diff --git a/modules/desktop/software/desktop/xdg-portal.nix b/modules/desktop/software/desktop/xdg-portal.nix
deleted file mode 100644
index 72bcb97..0000000
--- a/modules/desktop/software/desktop/xdg-portal.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ pkgs, ... }:
-{
-  xdg.portal = {
-    enable = true;
-    config.common.default = "*";
-    # wlr.enable = true;
-    # xdgOpenUsePortal = true;
-
-    extraPortals = with pkgs; [
-      xdg-desktop-portal-wlr
-      xdg-desktop-portal-gtk
-      xdg-desktop-portal-gnome
-    ];
-  };
-}
diff --git a/modules/desktop/software/encryption.nix b/modules/desktop/software/encryption.nix
deleted file mode 100644
index 53a24bb..0000000
--- a/modules/desktop/software/encryption.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  boot = {
-    initrd.availableKernelModules = [
-      # "aesni_intel"
-      # "cryptd"
-      "usb_storage"
-    ];
-
-    # <https://wiki.archlinux.org/title/Dm-crypt/System_configuration#Timeout>
-    kernelParams = [
-      "luks.options=timeout=0"
-      "rd.luks.options=timeout=0"
-      "rootflags=x-systemd.device-timeout=0"
-    ];
-  };
-}
diff --git a/modules/desktop/software/input.nix b/modules/desktop/software/input.nix
deleted file mode 100644
index 5d43085..0000000
--- a/modules/desktop/software/input.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ pkgs, ... }:
-{
-  i18n = {
-    inputMethod = {
-      enable = true;
-      type = "fcitx5";
-
-      fcitx5 = {
-        waylandFrontend = true;
-
-        addons = with pkgs; [
-          fcitx5-configtool
-          fcitx5-gtk
-          fcitx5-hangul
-          fcitx5-mozc
-          fcitx5-rime
-          rime-data
-          catppuccin-fcitx5
-        ];
-      };
-    };
-  };
-}
diff --git a/modules/desktop/software/locale.nix b/modules/desktop/software/locale.nix
deleted file mode 100644
index aded640..0000000
--- a/modules/desktop/software/locale.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  location.provider = "geoclue2";
-  time.hardwareClockInLocalTime = false;
-}
diff --git a/modules/desktop/software/multimedia/audio/default.nix b/modules/desktop/software/multimedia/audio/default.nix
deleted file mode 100644
index f4e7f0a..0000000
--- a/modules/desktop/software/multimedia/audio/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  imports = [
-    ./pipewire.nix
-    # ./wireplumber.nix
-  ];
-}
diff --git a/modules/desktop/software/multimedia/audio/pipewire.nix b/modules/desktop/software/multimedia/audio/pipewire.nix
deleted file mode 100644
index 2824176..0000000
--- a/modules/desktop/software/multimedia/audio/pipewire.nix
+++ /dev/null
@@ -1,164 +0,0 @@
-# { lib, ... }:
-# let
-#   inherit (lib.modules) mkBefore;
-#   inherit (lib.lists) singleton;
-#   inherit (builtins) toString;
-#   mapOptionDefault = lib.attrsets.mapAttrs (_: lib.modules.mkOptionDefault);
-#   quantum = toString 64;
-#   rate = toString 48000;
-#   qr = "${quantum}/${rate}";
-# in
-{
-  services.pipewire = {
-    enable = true;
-    wireplumber.enable = true;
-    jack.enable = true;
-    pulse.enable = true;
-    audio.enable = true;
-
-    alsa = {
-      enable = true;
-      support32Bit = true;
-    };
-
-    extraConfig = {
-      pipewire = {
-        "10-logging" = {
-          "context.properties"."log.level" = 3;
-        };
-
-        # "10-defaults" = {
-        #   "context.properties" = mapOptionDefault {
-        #     "clock.power-of-two-quantum" = true;
-        #     "core.daemon" = true;
-        #     "core.name" = "pipewire-0";
-        #     "link.max-buffers" = 16;
-        #     "settings.check-quantum" = true;
-        #   };
-
-        #   "context.spa-libs" = mapOptionDefault {
-        #     "audio.convert.*" = "audioconvert/libspa-audioconvert";
-        #     "avb.*" = "avb/libspa-avb";
-        #     "api.alsa.*" = "alsa/libspa-alsa";
-        #     "api.v4l2.*" = "v4l2/libspa-v4l2";
-        #     "api.libcamera.*" = "libcamera/libspa-libcamera";
-        #     "api.bluez5.*" = "bluez5/libspa-bluez5";
-        #     "api.vulkan.*" = "vulkan/libspa-vulkan";
-        #     "api.jack.*" = "jack/libspa-jack";
-        #     "support.*" = "support/libspa-support";
-        #     "video.convert.*" = "videoconvert/libspa-videoconvert";
-        #   };
-        # };
-      };
-
-      # pipewire-pulse = {
-      #   "10-defaults" = {
-      #     "context.spa-libs" = mapOptionDefault {
-      #       "audio.convert.*" = "audioconvert/libspa-audioconvert";
-      #       "support.*" = "support/libspa-support";
-      #     };
-
-      #     "pulse.cmd" = mkBefore [
-      #       {
-      #         cmd = "load-module";
-      #         args = "module-always-sink";
-      #         flags = [ ];
-      #       }
-      #     ];
-
-      #     "pulse.properties" = {
-      #       "server.address" = mkBefore [ "unix:native" ];
-      #     };
-
-      #     "pulse.rules" = mkBefore [
-      #       {
-      #         matches = [
-      #           { "application.process.binary" = "teams"; }
-      #           { "application.process.binary" = "teams-insiders"; }
-      #           { "application.process.binary" = "skypeforlinux"; }
-      #         ];
-
-      #         actions.quirks = [ "force-s16-info" ];
-      #       }
-      #       {
-      #         matches = singleton { "application.process.binary" = "firefox"; };
-      #         actions.quirks = [ "remove-capture-dont-move" ];
-      #       }
-      #       {
-      #         matches = singleton { "application.name" = "~speech-dispatcher*"; };
-
-      #         actions = {
-      #           update-props = {
-      #             "pulse.min.req" = "1024/48000"; # 21 milliseconds
-      #             "pulse.min.quantum " = "1024/48000"; # 21 milliseconds
-      #           };
-      #         };
-      #       }
-      #     ];
-      #   };
-      # };
-
-      # pipewire."92-low-latency" = {
-      #   "context.properties" = {
-      #     "default.clock.rate" = rate;
-      #     "default.clock.quantum" = quantum;
-      #     "default.clock.min-quantum" = quantum;
-      #     "default.clock.max-quantum" = quantum;
-      #     "default.clock.allowed-rates" = [ rate ];
-      #   };
-
-      #   # "context.modules" = [
-      #   #   {
-      #   #     name = "libpipewire-module-rtkit";
-
-      #   #     flags = [
-      #   #       "ifexists"
-      #   #       "nofail"
-      #   #     ];
-
-      #   #     args = {
-      #   #       "nice.level" = -15;
-      #   #       "rt.prio" = 90;
-      #   #       "rt.time.soft" = 200000;
-      #   #       "rt.time.hard" = 200000;
-      #   #     };
-      #   #   }
-      #   #   {
-      #   #     name = "libpipewire-module-protocol-pulse";
-
-      #   #     args = {
-      #   #       "server.address" = [ "unix:native" ];
-      #   #       "pulse.min.quantum" = qr;
-      #   #       "pulse.min.req" = qr;
-      #   #       "pulse.min.frag" = qr;
-      #   #     };
-      #   #   }
-      #   # ];
-
-      #   "stream.properties" = {
-      #     "node.latency" = qr;
-      #     "resample.quality" = 1;
-      #   };
-      # };
-
-      # pipewire-pulse."92-low-latency" = {
-      #   "context.modules" = singleton {
-      #     name = "libpipewire-module-protocol-pulse";
-
-      #     args = {
-      #       "pulse.min.req" = qr;
-      #       "pulse.default.req" = qr;
-      #       "pulse.max.req" = qr;
-      #       "pulse.min.quantum" = qr;
-      #       "pulse.max.quantum" = qr;
-      #     };
-      #   };
-
-      #   "stream.properties" = {
-      #     "node.latency" = qr;
-      #     "resample.quality" = 4;
-      #   };
-      # };
-    };
-  };
-}
diff --git a/modules/desktop/software/multimedia/audio/wireplumber.nix b/modules/desktop/software/multimedia/audio/wireplumber.nix
deleted file mode 100644
index 970396f..0000000
--- a/modules/desktop/software/multimedia/audio/wireplumber.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-let
-  rate = builtins.toString 48000;
-in
-{
-  services.pipewire.wireplumber = {
-    enable = true;
-
-    extraConfig = {
-      "10-log-level-debug" = {
-        "context.properties"."log.level" = "D";
-      };
-
-      "10-default-volume" = {
-        "wireplumber.settings"."device.routes.default-sink-volume" = 1.0;
-      };
-
-      "92-low-latency" = {
-        "monitor.alsa.rules" = [
-          {
-            matches = [
-              { "device.name" = "~alsa_card.*"; }
-              { "node.name" = "~alsa_output.*"; }
-            ];
-
-            actions.update-props = {
-              "node.description" = "ALSA Low Latency Output";
-              "audio.rate" = rate;
-              "audio.format" = "S32LE";
-              "resample.quality" = 4;
-              "resample.disable" = false;
-              "session.suspend-timeout-seconds" = 0;
-              "api.alsa.period-size" = 2;
-              "api.alsa.headroom" = 128;
-              "api.alsa.period-num" = 2;
-              "api.alsa.disable-batch" = false;
-            };
-          }
-        ];
-      };
-    };
-  };
-}
diff --git a/modules/desktop/software/multimedia/default.nix b/modules/desktop/software/multimedia/default.nix
deleted file mode 100644
index 7bf261a..0000000
--- a/modules/desktop/software/multimedia/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  imports = [
-    ./audio
-    ./video
-  ];
-}
diff --git a/modules/desktop/software/multimedia/video/default.nix b/modules/desktop/software/multimedia/video/default.nix
deleted file mode 100644
index 31cdfd5..0000000
--- a/modules/desktop/software/multimedia/video/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ pkgs, ... }:
-{
-  imports = [
-    ./graphics.nix
-    ./libva.nix
-    ./nvidia.nix
-    ./vulkan.nix
-  ];
-
-  environment.systemPackages = [ pkgs.mediastreamer-openh264 ];
-}
diff --git a/modules/desktop/software/multimedia/video/vulkan.nix b/modules/desktop/software/multimedia/video/vulkan.nix
deleted file mode 100644
index be37e0e..0000000
--- a/modules/desktop/software/multimedia/video/vulkan.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.systemPackages = with pkgs; [
-    vulkan-loader
-    vulkan-validation-layers
-    vulkan-tools
-    vulkan-extension-layer
-  ];
-}
diff --git a/modules/desktop/software/services/adb.nix b/modules/desktop/software/services/adb.nix
deleted file mode 100644
index d106ead..0000000
--- a/modules/desktop/software/services/adb.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ pkgs, ... }:
-{
-  programs.adb.enable = true;
-
-  services.udev = {
-    packages = [ pkgs.android-udev-rules ];
-
-    extraRules = ''
-      SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", MODE="0666", GROUP="adbusers"
-    '';
-  };
-}
diff --git a/modules/desktop/software/services/ananicy.nix b/modules/desktop/software/services/ananicy.nix
deleted file mode 100644
index bdc9bbd..0000000
--- a/modules/desktop/software/services/ananicy.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ pkgs, ... }:
-{
-  services.ananicy = {
-    enable = false;
-    package = pkgs.ananicy-cpp;
-    rulesProvider = pkgs.ananicy-rules-cachyos;
-  };
-}
diff --git a/modules/desktop/software/services/dbus.nix b/modules/desktop/software/services/dbus.nix
deleted file mode 100644
index 8b25bf9..0000000
--- a/modules/desktop/software/services/dbus.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ pkgs, ... }:
-{
-  services.dbus = {
-    enable = true;
-    implementation = "broker";
-
-    packages = with pkgs; [
-      dconf
-      gcr
-      udisks2
-      # flatpak
-      # xdg-desktop-portal
-    ];
-  };
-}
diff --git a/modules/desktop/software/services/default.nix b/modules/desktop/software/services/default.nix
index 4b9ccf6..49fc20c 100644
--- a/modules/desktop/software/services/default.nix
+++ b/modules/desktop/software/services/default.nix
@@ -1,24 +1,8 @@
-{ pkgs, ... }:
 {
   imports = [
-    # ./adb.nix
-    ./ananicy.nix
-    ./dbus.nix
     ./libinput.nix
-    ./logrotate.nix
     ./ollama.nix
-    # ./printing.nix
-    ./xserver.nix
   ];
 
-  services = {
-    printing.enable = false;
-    gnome.gnome-keyring.enable = true;
-    fstrim.enable = false;
-    gvfs.enable = true;
-    udev.packages = with pkgs; [ pkgs.logitech-udev-rules ];
-    thermald.enable = true;
-    irqbalance.enable = true;
-    gpm.enable = true;
-  };
+  services.xserver.videoDrivers = [ "nvidia" ];
 }
diff --git a/modules/desktop/software/services/libinput.nix b/modules/desktop/software/services/libinput.nix
index 643f814..e010873 100644
--- a/modules/desktop/software/services/libinput.nix
+++ b/modules/desktop/software/services/libinput.nix
@@ -1,13 +1,7 @@
 {
   services.libinput = {
     enable = true;
-
-    mouse = {
-      accelProfile = "flat";
-    };
-
-    touchpad = {
-      accelProfile = "flat";
-    };
+    mouse.accelProfile = "flat";
+    touchpad.accelProfile = "flat";
   };
 }
diff --git a/modules/desktop/software/services/logrotate.nix b/modules/desktop/software/services/logrotate.nix
deleted file mode 100644
index 2dedf2e..0000000
--- a/modules/desktop/software/services/logrotate.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ pkgs, lib, ... }:
-{
-  services.logrotate.settings = {
-    "/var/log/audit/audit.log" = { };
-
-    header = {
-      global = true;
-      dateext = true;
-      dateformat = "-%Y-%m-%d";
-      nomail = true;
-      missingok = true;
-      copytruncate = true;
-      priority = 1;
-      frequency = "daily";
-      rotate = 7;
-      minage = 1;
-      compress = true;
-      compresscmd = "${lib.getExe' pkgs.zstd "zstd"}";
-      compressoptions = " -Xcompression-level 10";
-      compressext = "zst";
-      uncompresscmd = "${lib.getExe' pkgs.zstd "unzstd"}";
-    };
-  };
-}
diff --git a/modules/desktop/software/services/printing.nix b/modules/desktop/software/services/printing.nix
deleted file mode 100644
index f7a38de..0000000
--- a/modules/desktop/software/services/printing.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ pkgs, ... }:
-{
-  services = {
-    printing = {
-      enable = true;
-
-      drivers = with pkgs; [
-        gutenprint
-        hplip
-      ];
-    };
-
-    avahi = {
-      enable = true;
-      nssmdns4 = true;
-      openFirewall = true;
-    };
-  };
-}
diff --git a/modules/desktop/software/services/xserver.nix b/modules/desktop/software/services/xserver.nix
deleted file mode 100644
index f1833a4..0000000
--- a/modules/desktop/software/services/xserver.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  services.xserver = {
-    xkb = {
-      layout = "us";
-      options = "caps:escape";
-    };
-
-    videoDrivers = [ "nvidia" ];
-  };
-}
diff --git a/modules/desktop/software/shell.nix b/modules/desktop/software/shell.nix
deleted file mode 100644
index 0b3508f..0000000
--- a/modules/desktop/software/shell.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-{
-  environment = with pkgs; {
-    binsh = "${dash}/bin/dash";
-    shells = [ fish ];
-  };
-}
diff --git a/modules/desktop/software/users.nix b/modules/desktop/software/users.nix
deleted file mode 100644
index ab3fe03..0000000
--- a/modules/desktop/software/users.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ pkgs, secrets, ... }:
-let
-  initialHashedPassword = secrets.initial_hashed_password;
-in
-{
-  users = {
-    mutableUsers = false;
-
-    users = {
-      root = {
-        inherit initialHashedPassword;
-
-        shell = pkgs.bash;
-      };
-
-      ebisu = {
-        inherit initialHashedPassword;
-
-        isNormalUser = true;
-        shell = pkgs.fish;
-
-        extraGroups = [
-          "wheel"
-          "systemd-journal"
-          "audio"
-          "video"
-          "input"
-          "plugdev"
-          "lp"
-          "tss"
-          "power"
-          "nix"
-          "network"
-          "networkmanager"
-          "wireshark"
-          "mysql"
-          "docker"
-          "podman"
-          "git"
-          "libvirtd"
-          "kvm"
-        ];
-      };
-    };
-  };
-}
diff --git a/modules/desktop/software/video/default.nix b/modules/desktop/software/video/default.nix
new file mode 100644
index 0000000..280a7d9
--- /dev/null
+++ b/modules/desktop/software/video/default.nix
@@ -0,0 +1,7 @@
+{
+  imports = [
+    ./graphics.nix
+    ./libva.nix
+    ./nvidia.nix
+  ];
+}
diff --git a/modules/desktop/software/multimedia/video/graphics.nix b/modules/desktop/software/video/graphics.nix
index 13da295..13da295 100644
--- a/modules/desktop/software/multimedia/video/graphics.nix
+++ b/modules/desktop/software/video/graphics.nix
diff --git a/modules/desktop/software/multimedia/video/libva.nix b/modules/desktop/software/video/libva.nix
index d420495..d420495 100644
--- a/modules/desktop/software/multimedia/video/libva.nix
+++ b/modules/desktop/software/video/libva.nix
diff --git a/modules/desktop/software/multimedia/video/nvidia.nix b/modules/desktop/software/video/nvidia.nix
index c133bc2..c133bc2 100644
--- a/modules/desktop/software/multimedia/video/nvidia.nix
+++ b/modules/desktop/software/video/nvidia.nix