desktop building?

2025-07-20 18:35:14 -05:00
parent 91be65bc39
commit 608a6ce9b8
51 changed files with 535 additions and 299 deletions
--- a/systems/x86_64-linux/desktop/configuration.nix
+++ b/systems/x86_64-linux/desktop/configuration.nix
@@ -52,16 +52,16 @@ let
  ];
 in
 {
-  nix = {
-    settings = {
-      substituters = [
-        "https://cache.mjallen.dev"
-      ];
-      trusted-public-keys = [
-        "cache.mjallen.dev-1:IzFmKCd8/gggI6lcCXsW65qQwiCLGFFN9t9s2iw7Lvc="
-      ];
-    };
-  };
+  # nix = {
+  #   settings = {
+  #     substituters = [
+  #       "https://cache.mjallen.dev"
+  #     ];
+  #     trusted-public-keys = [
+  #       "cache.mjallen.dev-1:IzFmKCd8/gggI6lcCXsW65qQwiCLGFFN9t9s2iw7Lvc="
+  #     ];
+  #   };
+  # };

  chaotic.mesa-git.enable = false;

@@ -76,7 +76,7 @@ in
  hardware = {
    # Enable the QMK firmware flashing tool.
    keyboard = {
-      qmk.enable = true;
+      qmk.enable = false;
    };

    # Enable Sane and Brother printer support.
--- a/systems/x86_64-linux/desktop/default.nix
+++ b/systems/x86_64-linux/desktop/default.nix
@@ -28,6 +28,9 @@
    ./nix.nix
    ./sops.nix
    ./users.nix
+
+
+    ./specialisations/hyprland
  ];

  ${namespace} = {
--- a/systems/x86_64-linux/desktop/hyprland-settings.nix
+++ b/systems/x86_64-linux/desktop/hyprland-settings.nix
@@ -1,97 +1,97 @@
-let
-  theme = import ../../modules/nixos/hyprland/theme.nix;
-  defaultOpacity = theme.waybar.defaultOpacity;
-  defaultBorderRadius = theme.waybar.defaultBorderRadius;
-  defaultCenterOptions = theme.waybar.defaultCenterOptions;
-  borderLeft = theme.waybar.borderLeft;
-  borderRight = theme.waybar.borderRight;
+# let
+#   theme = import ../../modules/nixos/hyprland/theme.nix;
+#   defaultOpacity = theme.waybar.defaultOpacity;
+#   defaultBorderRadius = theme.waybar.defaultBorderRadius;
+#   defaultCenterOptions = theme.waybar.defaultCenterOptions;
+#   borderLeft = theme.waybar.borderLeft;
+#   borderRight = theme.waybar.borderRight;

-  # Displays
-  displayLeft = {
-    input = "DP-1";
-    resolution = "3840x2160";
-    refreshRate = "240.00000";
-  };
-  displayRight = {
-    input = "DP-2";
-    resolution = "3840x2160";
-    refreshRate = "240.00000";
-  };
-in
-{
-  primaryDisplay = displayLeft;
-  networkInterface = "wlp9s0";
+#   # Displays
+#   displayLeft = {
+#     input = "DP-1";
+#     resolution = "3840x2160";
+#     refreshRate = "240.00000";
+#   };
+#   displayRight = {
+#     input = "DP-2";
+#     resolution = "3840x2160";
+#     refreshRate = "240.00000";
+#   };
+# in
+# {
+#   primaryDisplay = displayLeft;
+#   networkInterface = "wlp9s0";

-  wallpaper = [
-    "${displayLeft.input}, /run/wallpaper.jpg"
-    "${displayRight.input}, /run/wallpaper.jpg"
-  ];
+#   wallpaper = [
+#     "${displayLeft.input}, /run/wallpaper.jpg"
+#     "${displayRight.input}, /run/wallpaper.jpg"
+#   ];

-  monitor = [
-    "${displayLeft.input},${displayLeft.resolution}@${displayLeft.refreshRate},0x0,1,bitdepth,10,cm,hdr,sdrbrightness,1.2,sdrsaturation,0.98"
-    "${displayRight.input},${displayRight.resolution}@${displayRight.refreshRate},3840x0,1,bitdepth,10,cm,hdr,sdrbrightness,1.5,sdrsaturation,0.98"
-  ];
+#   monitor = [
+#     "${displayLeft.input},${displayLeft.resolution}@${displayLeft.refreshRate},0x0,1,bitdepth,10,cm,hdr,sdrbrightness,1.2,sdrsaturation,0.98"
+#     "${displayRight.input},${displayRight.resolution}@${displayRight.refreshRate},3840x0,1,bitdepth,10,cm,hdr,sdrbrightness,1.5,sdrsaturation,0.98"
+#   ];
  
-  workspace = [
-    "name:firefox, monitor:${displayRight.input}, default:false, special, class:(.*firefox.*)"
-    "name:discord, monitor:${displayRight.input}, default:true, special, title:(.*vesktop.*), title:(.*Apple Music.*)"
-    "name:steam, monitor:${displayLeft.input}, default:false, special, class:(.*[Ss]team.*)"
-  ];
+#   workspace = [
+#     "name:firefox, monitor:${displayRight.input}, default:false, special, class:(.*firefox.*)"
+#     "name:discord, monitor:${displayRight.input}, default:true, special, title:(.*vesktop.*), title:(.*Apple Music.*)"
+#     "name:steam, monitor:${displayLeft.input}, default:false, special, class:(.*[Ss]team.*)"
+#   ];

-  windowRule = [
-    "size 2160 7680, tag:horizonrdp"
-  ];
+#   windowRule = [
+#     "size 2160 7680, tag:horizonrdp"
+#   ];

-  extraConfig = ''
-    exec-once = nm-applet
-    exec-once = [silent] firefox
-    exec-once = [silent] vesktop
-    exec-once = [silent] chromium --app="https://music.apple.com"
-    exec-once = [silent] steam
-  '';
+#   extraConfig = ''
+#     exec-once = nm-applet
+#     exec-once = [silent] firefox
+#     exec-once = [silent] vesktop
+#     exec-once = [silent] chromium --app="https://music.apple.com"
+#     exec-once = [silent] steam
+#   '';

-  waybar = {
+#   waybar = {

-    layer = "bottom";
+#     layer = "bottom";

-    modules-right = [
-      "tray"
-      "custom/lights"
-      "temperature"
-      "temperature#gpu"
-      "keyboard-state#capslock"
-      "keyboard-state#numlock"
-      "wireplumber#sink"
-      "wireplumber#source"
-      "bluetooth"
-      "network"
-      "idle_inhibitor"
-      "clock"
-      "custom/weather"
-    ];
+#     modules-right = [
+#       "tray"
+#       "custom/lights"
+#       "temperature"
+#       "temperature#gpu"
+#       "keyboard-state#capslock"
+#       "keyboard-state#numlock"
+#       "wireplumber#sink"
+#       "wireplumber#source"
+#       "bluetooth"
+#       "network"
+#       "idle_inhibitor"
+#       "clock"
+#       "custom/weather"
+#     ];
    
-    extraModules = {
-      "custom/lights" = {
-        tooltip = false;
-        exec = "waybar-hass --get_light light.living_room_lights";
-        interval = "once";
-        format = "{text}";#"󱉓";
-        on-click = "waybar-hass --toggle_light light.living_room_lights";
-        return-type = "json";
-      };
-    };
+#     extraModules = {
+#       "custom/lights" = {
+#         tooltip = false;
+#         exec = "waybar-hass --get_light light.living_room_lights";
+#         interval = "once";
+#         format = "{text}";#"󱉓";
+#         on-click = "waybar-hass --toggle_light light.living_room_lights";
+#         return-type = "json";
+#       };
+#     };

-    extraModulesStyle = ''
-      #custom-lights {
-        color: ${theme.nord.frost.nord8};
-        background-color: ${theme.nord.polarNight.nord0};
-        ${defaultOpacity}
-        ${borderLeft}
-      }
+#     extraModulesStyle = ''
+#       #custom-lights {
+#         color: ${theme.nord.frost.nord8};
+#         background-color: ${theme.nord.polarNight.nord0};
+#         ${defaultOpacity}
+#         ${borderLeft}
+#       }

-      #custom-lights:hover {
-        background: ${theme.nord.polarNight.nord3};
-      }
-    '';
-  };
-}
+#       #custom-lights:hover {
+#         background: ${theme.nord.polarNight.nord3};
+#       }
+#     '';
+#   };
+# }
--- a/systems/x86_64-linux/desktop/specialisations/hyprland/default.nix
+++ b/systems/x86_64-linux/desktop/specialisations/hyprland/default.nix
@@ -1,10 +1,56 @@
-{ namespace, ... }:
+{ lib, namespace, ... }:
+let
+  # Displays
+  displayLeft = {
+    input = "DP-1";
+    resolution = "3840x2160";
+    refreshRate = "240.00000";
+  };
+  displayRight = {
+    input = "DP-2";
+    resolution = "3840x2160";
+    refreshRate = "240.00000";
+  };
+in
 {
+  specialisation.hyprland.inheritParentConfig = true;
  specialisation.hyprland.configuration = {
+    home-manager.users.matt = import ./home/default.nix;
    ${namespace} = {
      desktop = {
-        hyprland.enable = true;
-        gnome.enable = false;
+        hyprland = {
+          enable = true;
+          primaryDisplay = "DP-1";
+
+          wallpaper = [
+            "${displayLeft.input}, /run/wallpaper.jpg"
+            "${displayRight.input}, /run/wallpaper.jpg"
+          ];
+
+          monitor = [
+            "${displayLeft.input},${displayLeft.resolution}@${displayLeft.refreshRate},0x0,1,bitdepth,10,cm,hdr,sdrbrightness,1.2,sdrsaturation,0.98"
+            "${displayRight.input},${displayRight.resolution}@${displayRight.refreshRate},3840x0,1,bitdepth,10,cm,hdr,sdrbrightness,1.5,sdrsaturation,0.98"
+          ];
+  
+          workspace = [
+            "name:firefox, monitor:${displayRight.input}, default:false, special, class:(.*firefox.*)"
+            "name:discord, monitor:${displayRight.input}, default:true, special, title:(.*vesktop.*), title:(.*Apple Music.*)"
+            "name:steam, monitor:${displayLeft.input}, default:false, special, class:(.*[Ss]team.*)"
+          ];
+
+          windowRule = [
+            "size 2160 7680, tag:horizonrdp"
+          ];
+
+          extraConfig = ''
+            exec-once = nm-applet
+            exec-once = [silent] firefox
+            exec-once = [silent] vesktop
+            exec-once = [silent] chromium --app="https://music.apple.com"
+            exec-once = [silent] steam
+          '';
+        };
+        gnome.enable = lib.mkForce false;
      };
    };
    environment.etc."specialisation".text = "hyprland";
--- a/systems/x86_64-linux/desktop/specialisations/hyprland/home/default.nix
+++ b/systems/x86_64-linux/desktop/specialisations/hyprland/home/default.nix
@@ -0,0 +1,86 @@
+{ pkgs, ... }:
+let
+  theme = import ../../../../../../modules/home/desktop/theme/nord.nix;
+  fontName = "JetBrainsMono NFM";
+  fontPackage = pkgs.nerd-fonts.jetbrains-mono;
+in
+{
+  mjallen = {
+    desktop.hyprland = { 
+      enable = true;
+      defaultApps = {
+        browser = pkgs.firefox;
+      };
+    };
+    programs = {
+      btop.enable = true;
+      kitty = {
+        enable = true;
+        font = {
+          name = fontName;
+          package = fontPackage;
+        };
+      };
+      mako = {
+        enable = true;
+        fontName = fontName;
+      };
+      nwg-dock.enable = true;
+      nwg-drawer.enable = true;
+      nwg-panel = {
+        enable = true;
+        defaultApps = {
+          browser = pkgs.firefox;
+        };
+      };
+      waybar = {
+        enable = true;
+
+        networkInterface = "wlp9s0";
+        layer = "bottom";
+
+        modules-right = [
+          "tray"
+          "custom/lights"
+          "temperature"
+          "temperature#gpu"
+          "keyboard-state#capslock"
+          "keyboard-state#numlock"
+          "wireplumber#sink"
+          "wireplumber#source"
+          "bluetooth"
+          "network"
+          "idle_inhibitor"
+          "clock"
+          "custom/weather"
+        ];
+
+        extraModules = {
+          "custom/lights" = {
+            tooltip = false;
+            exec = "waybar-hass --get_light light.living_room_lights";
+            interval = "once";
+            format = "{text}";#"󱉓";
+            on-click = "waybar-hass --toggle_light light.living_room_lights";
+            return-type = "json";
+          };
+        };
+
+        extraModulesStyle = ''
+          #custom-lights {
+            color: ${theme.frost.nord8};
+            background-color: ${theme.polarNight.nord0};
+            ${theme.defaultOpacity}
+            ${theme.borderLeft}
+          }
+
+          #custom-lights:hover {
+            background: ${theme.polarNight.nord3};
+          }
+        '';
+      };
+      wlogout.enable = true;
+      wofi.enable = true;
+    };
+  };
+}