configuration.nix

@@ -65,9 +65,6 @@
           # https://github.com/NixOS/nixpkgs/pull/369808
           freerdp3 = dcsunset.freerdp3;
 
-          # TODO: Remove when on stable
-          ghostty = unstable.ghostty;
-
           ### Development
           #// ciscoPacketTracer8 = local.ciscoPacketTracer8;
         }

options/custom/desktops/niri/default.nix

@@ -107,7 +107,6 @@ in {
           # https://github.com/YaLTeR/niri/wiki/Configuration:-Debug-Options
           # https://github.com/sodiboo/niri-flake/blob/main/docs.md#programsnirisettingsdebug
           settings.debug = {
-            disable-cursor-plane = []; # Software cursor
             #// disable-direct-scanout = [];
           };
         };

options/custom/desktops/niri/misc.nix

@@ -30,9 +30,8 @@ in {
             inherit size;
             theme = name;
 
-            # BUG: Heavily increases CPU usage with cursor movement
             #// hide-after-inactive-ms = 1000 * 15; # Milliseconds
-            #// hide-when-typing = true;
+            hide-when-typing = true;
           };
 
           # HACK: Inherit home-manager environment variables in lieu of upstream fix

options/custom/programs/default.nix

@@ -10,7 +10,6 @@ with lib; {
       direnv.enable = true;
       fastfetch.enable = true;
       fish.enable = true;
-      ghostty.enable = true;
       git.enable = true;
       htop.enable = true;
       man.enable = true;
@@ -33,6 +32,7 @@ with lib; {
       dconf.enable = true;
       firefox.enable = true;
       #// foot.enable = true;
+      ghostty.enable = true;
       #// gnome-terminal.enable = true;
       #// kdeconnect.enable = true;
       kitty.enable = true;

options/custom/programs/ghostty.nix

@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }:
 with lib; let
@@ -9,13 +8,10 @@ with lib; let
 in {
   options.custom.programs.ghostty = {
     enable = mkOption {default = false;};
-    minimal = mkOption {default = false;};
   };
 
   config = mkIf cfg.enable {
-    environment.systemPackages = mkIf cfg.minimal [pkgs.ghostty]; # Terminfo
-
-    home-manager.sharedModules = mkIf (!cfg.minimal) [
+    home-manager.sharedModules = [
       {
         # https://ghostty.org/
         programs.ghostty = {

options/custom/services/pipewire.nix

@@ -8,45 +8,35 @@ with lib; let
 in {
   options.custom.services.pipewire.enable = mkOption {default = false;};
 
-  config = mkIf cfg.enable ({
-      #!! Realtime priority may cause desync
-      #// security.rtkit.enable = true;
+  config = mkIf cfg.enable {
+    #!! Realtime priority may cause desync
+    #// security.rtkit.enable = true;
 
-      services = {
-        # https://wiki.nixos.org/wiki/PipeWire
-        # https://gitlab.freedesktop.org/pipewire/pipewire
-        pipewire = {
-          enable = true;
-          pulse.enable = true;
+    services = {
+      pulseaudio.enable = false;
 
-          alsa = {
-            enable = true;
-            support32Bit = true;
-          };
+      # https://wiki.nixos.org/wiki/PipeWire
+      # https://gitlab.freedesktop.org/pipewire/pipewire
+      pipewire = {
+        enable = true;
+        alsa.enable = true;
+        alsa.support32Bit = true;
+        pulse.enable = true;
 
-          # Avoid resampling if possible
-          # https://wiki.archlinux.org/title/PipeWire#Changing_the_allowed_sample_rate(s)
-          extraConfig.pipewire = {
-            "10-sample-rate"."context.properties"."default.clock.allowed-rates" = [
-              32000
-              44100
-              48000
-              88200
-              96000
-              176400
-              192000
-            ];
-          };
+        # Avoid resampling if possible
+        # https://wiki.archlinux.org/title/PipeWire#Changing_the_allowed_sample_rate(s)
+        extraConfig.pipewire = {
+          "10-sample-rate"."context.properties"."default.clock.allowed-rates" = [
+            32000
+            44100
+            48000
+            88200
+            96000
+            176400
+            192000
+          ];
         };
       };
-    }
-    // (
-      if versionAtLeast version "25.05"
-      then {
-        services.pulseaudio.enable = false;
-      }
-      else {
-        hardware.pulseaudio.enable = false;
-      }
-    ));
+    };
+  };
 }

profiles/sbc/default.nix

@@ -1,11 +1,7 @@
 {config, ...}: {
   custom = {
     profile = "sbc";
-
-    programs = {
-      fastfetch.greet = true;
-      ghostty.minimal = true;
-    };
+    programs.fastfetch.greet = true;
 
     containers = {
       enable = true;

profiles/server/default.nix

@@ -1,11 +1,7 @@
 {config, ...}: {
   custom = {
     profile = "server";
-
-    programs = {
-      fastfetch.greet = true;
-      ghostty.minimal = true;
-    };
+    programs.fastfetch.greet = true;
 
     containers = {
       enable = true;
@@ -18,10 +14,10 @@
       #// headscale.enable = true;
       mastodon.enable = true;
       netbox.enable = true;
-      #// nextcloud.enable = true;
+      nextcloud.enable = true;
       owncast.enable = true;
-      #// redlib.enable = true;
-      #// searxng.enable = true;
+      redlib.enable = true;
+      searxng.enable = true;
     };
 
     services = {