machines/mynix/default.nix

@@ -13,7 +13,6 @@
     width = 3440;
     height = 1440;
     refresh = 100;
-    desktops.niri.output.connectors = ["DP-1"];
 
     programs.looking-glass = {
       enable = true;

machines/myork/default.nix

@@ -1,8 +1,11 @@
 {
   config,
   inputs,
+  pkgs,
   ...
-}: {
+}: let
+  brightnessctl = "${pkgs.brightnessctl}/bin/brightnessctl";
+in {
   imports = [
     inputs.nixos-hardware.nixosModules.framework-13-7040-amd
 
@@ -15,7 +18,6 @@
     width = 2256;
     height = 1504;
     scale = 1.5;
-    desktops.niri.output.connectors = ["eDP-1"];
 
     # BUG: Phoenix support not currently functional
     # https://github.com/Cryolitia/ryzen_smu/issues/1
@@ -52,6 +54,19 @@
   };
 
   home-manager.users.${config.custom.username} = {
+    programs.niri.settings.outputs = {
+      "eDP-1" = {
+        background-color = "#073642";
+
+        mode = with config.custom; {
+          inherit width height;
+          refresh = refresh + 0.0;
+        };
+
+        scale = config.custom.scale;
+      };
+    };
+
     wayland.windowManager.hyprland.settings = {
       device = [
         {

options/custom/default.nix

@@ -63,7 +63,7 @@ in {
 
     font = {
       emoji = mkOption {default = "Noto Color Emoji";};
-      monospace = mkOption {default = "IosevkaTerm NFP SemiBold";};
+      monospace = mkOption {default = "IosevkaTermSlab NFP Medium";};
       sans-serif = mkOption {default = "Outfit";};
       serif = mkOption {default = "Liberation Serif";};
     };

options/custom/desktops/niri/default.nix

@@ -24,7 +24,6 @@ in {
         input.enable = true;
         layout.enable = true;
         misc.enable = true;
-        output.enable = true;
         rules.enable = true;
       };
 

options/custom/desktops/niri/layout.nix

@@ -17,7 +17,7 @@ in {
         gap = config.custom.gap / 2;
       in {
         gaps = gap;
-        #// center-focused-column = mkIf config.custom.ultrawide "always";
+        center-focused-column = mkIf config.custom.ultrawide "always";
         always-center-single-column = true;
 
         # TODO: Uncomment after next release > v1.10.1
@@ -25,12 +25,12 @@ in {
         #// empty-workspace-above-first = true;
 
         preset-column-widths = [
-          {proportion = 0.75;}
           {proportion = 0.5;}
-          {proportion = 0.25;}
+          {proportion = 0.3;}
+          {proportion = 0.7;} # Default
         ];
 
-        default-column-width = {}; # Window-defined
+        default-column-width = {proportion = 0.7;};
 
         preset-window-heights = [
           {proportion = 0.7;}

options/custom/desktops/niri/output.nix

@@ -1,35 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-with lib; let
-  cfg = config.custom.desktops.niri.output;
-in {
-  options.custom.desktops.niri.output = {
-    enable = mkOption {default = false;};
-    connectors = mkOption {default = [];};
-  };
-
-  config = mkIf cfg.enable {
-    home-manager.sharedModules = [
-      {
-        # https://github.com/YaLTeR/niri/wiki/Configuration:-Outputs
-        programs.niri.settings.outputs = listToAttrs (forEach cfg.connectors (connector: {
-          name = connector;
-
-          value = {
-            background-color = "#073642";
-
-            mode = with config.custom; {
-              inherit width height;
-              refresh = refresh + 0.0; # Convert to float
-            };
-
-            scale = config.custom.scale;
-          };
-        }));
-      }
-    ];
-  };
-}

options/custom/programs/kitty.nix

@@ -17,7 +17,7 @@ in {
 
       font = {
         name = config.custom.font.monospace;
-        size = 14;
+        size = 13;
       };
 
       # https://sw.kovidgoyal.net/kitty/conf/

options/custom/programs/starship/default.nix

@@ -88,8 +88,8 @@ in {
 
                 # https://starship.rs/config/#character
                 character = {
-                  error_symbol = "[](bold red)";
+                  error_symbol = "[](bold red) ";
-                  success_symbol = "[](bold)";
+                  success_symbol = "[](bold) ";
                 };
 
                 # https://starship.rs/config/#command-duration

options/custom/programs/waybar/default.nix

@@ -76,7 +76,6 @@ in {
               font: 18px '${font}';
               margin: 0;
               padding: 0;
-              text-shadow: none;
             }
 
             .horizontal > box {