sisko/home: Configure hypr* in nix

hosts/sisko/configuration.nix

@@ -1,14 +1,13 @@
 { config, pkgs, lib, ... }:
 
 {
-  imports =
-    [
-      ../../base.nix
-      ../../common/metrics-exporters.nix
-      ./hardware-configuration.nix
-      ./desktop.nix
+  imports = [
+    ../../base.nix
+    ../../common/metrics-exporters.nix
+    ./hardware-configuration.nix
   ];
 
+  # Networking
   networking = {
     hostName = "sisko";
     # networkmanager.enable = true;
@@ -23,11 +22,25 @@
     };
     hostId = "b716d781";
   };
-
   hardware.bluetooth.enable = true;
+
+  # Video
+  hardware.graphics = {
+    enable = true;
+    enable32Bit = true;
+  };
+  hardware.amdgpu.opencl.enable = true;
+
+  # Audio
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    pulse.enable = true;
+    jack.enable = true;
+  };
+
+  # Other hardware / devices
   hardware.rtl-sdr.enable = true;
-  sops.defaultSopsFile = ../../secrets/sisko/sisko.yaml;
-  environment.variables = { EDITOR = "vim"; };
 
   users.users.felixalb.extraGroups = [
     "dialout"
@@ -36,6 +49,32 @@
     "plugdev"
   ];
 
+  # Desktop
+  programs.hyprland = {
+    # See configuration (through home-manager) in home/hypr
+    enable = true;
+    withUWSM = true;
+  };
+  services.displayManager.ly.enable = true;
+  services.xserver.enable = true;
+  services.xserver.desktopManager.xfce.enable = true;
+
+  fonts = {
+    fontDir.enable = true;
+    packages = with pkgs; [
+      fira-code
+      font-awesome
+      hack-font
+      nerd-fonts.hack
+      noto-fonts
+      noto-fonts-cjk-sans
+      noto-fonts-color-emoji
+    ];
+  };
+
+
+  # Programs
+  # TODO - Move to Home-Manager
   programs = {
     alvr = {
       enable = true;
@@ -58,7 +97,12 @@
 
     virt-manager.enable = true;
   };
+  environment.variables = {
+    SSH_AUTH_SOCK = "/run/user/${toString config.users.users.felixalb.uid}/keyring/ssh";
+    EDITOR = "vim";
+  };
 
+  # Virtualization
   virtualisation = {
     libvirtd.enable = true;
     spiceUSBRedirection.enable = true;
@@ -71,6 +115,7 @@
   virtualisation.docker.enable = true;
   virtualisation.oci-containers.backend = "docker";
 
+  # Nix / meta
   nixpkgs.config = {
     allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
       "discord"
@@ -85,6 +130,7 @@
     rocmSupport = true;
   };
 
+  sops.defaultSopsFile = ../../secrets/sisko/sisko.yaml;
   services.fwupd.enable = true;
   system.stateVersion = "24.11";
 }

hosts/sisko/desktop.nix

@@ -1,70 +0,0 @@
-{ config, pkgs, lib, ... }:
-{
-  # Video
-  hardware.graphics = {
-    enable = true;
-    enable32Bit = true;
-  };
-  hardware.amdgpu.opencl.enable = true;
-  services.displayManager.ly.enable = true;
-  services.xserver.enable = true;
-
-  services.xserver.desktopManager.xfce.enable = true;
-
-  programs.hyprland = {
-    enable = true;
-    xwayland.enable = true;
-  };
-
-  # Audio
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    pulse.enable = true;
-    jack.enable = true;
-  };
-
-  # Misc
-  fonts = {
-    fontDir.enable = true;
-    packages = with pkgs; [
-      fira-code
-      font-awesome
-      hack-font
-      nerd-fonts.hack
-      noto-fonts
-      noto-fonts-cjk-sans
-      noto-fonts-color-emoji
-    ];
-  };
-
-  environment.sessionVariables = {
-    NIXOS_OZONE_WL = "1";
-    SSH_AUTH_SOCK = "/run/user/${toString config.users.users.felixalb.uid}/keyring/ssh";
-  };
-
-  services.gnome.gnome-keyring.enable = true;
-
-  # Dark mode
-  home-manager.users.felixalb = {
-    dconf.settings = {
-      "org/gnome/desktop/interface" = {
-        color-scheme = "prefer-dark";
-      };
-    };
-
-    gtk = {
-      enable = true;
-      theme = {
-        name = "Adwaita-dark";
-        package = pkgs.gnome-themes-extra;
-      };
-    };
-  };
-
-  qt = {
-    enable = true;
-    platformTheme = "gnome";
-    style = "adwaita-dark";
-  };
-}

hosts/sisko/home.nix

@@ -4,8 +4,12 @@
   imports = [
     ./../../home/base.nix
     ./../../home/alacritty.nix
+    ./../../home/hypr/default.nix
+    ./../../home/waybar.nix
   ];
 
+  wayland.windowManager.hyprland.enable = true;
+
   home.packages = with pkgs; [
     # GUI Applications
     cantata
@@ -41,19 +45,10 @@
     snicat
 
     # Window Manager Extras
-    bibata-cursors
     cliphist
-    hyprcursor
-    hypridle
-    hyprlock
-    hyprpaper
-    hyprshot
     nautilus
     networkmanager
     rofi-rbw-wayland
-    swaynotificationcenter
-    waybar
-    wl-clipboard
 
     # Misc tools
     abcde
@@ -95,7 +90,7 @@
     rbw = {
       enable = true;
       settings = {
-        base_url = "https://pw.feal.no";
+        base_url = "https://pw.home.feal.no";
         email = "felix@albrigtsen.it";
         pinentry = pkgs.pinentry-gnome3;
       };
@@ -104,6 +99,7 @@
       enable = true;
       theme = "iggy";
     };
+    waybar.enable = true;
     zsh = {
       shellAliases."rebuild" = "sudo nixos-rebuild switch --flake /config";
       prezto.pmodules = [ "ssh" ];
@@ -111,6 +107,8 @@
   };
 
   services = {
+    gnome-keyring.enable = true;
+
     mpd = let
       home = config.home.homeDirectory;
     in {
@@ -127,17 +125,29 @@
     };
   };
 
-  home.pointerCursor = {
-    name = "Bibata-Modern-Ice";
-    package = pkgs.bibata-cursors;
-    size = 24;
-    gtk.enable = true;
-    x11 = {
-      enable = true;
-      defaultCursor = true;
+
+  # Dark mode
+  dconf.settings = {
+    "org/gnome/desktop/interface" = {
+      color-scheme = "prefer-dark";
     };
   };
 
+  gtk = {
+    enable = true;
+    theme = {
+      name = "Adwaita-dark";
+      package = pkgs.gnome-themes-extra;
+    };
+    gtk4.theme = config.gtk.theme;
+  };
+
+  qt = {
+    enable = true;
+    platformTheme.name = "adwaita";
+    style.name = "adwaita-dark";
+  };
+
   xdg.mimeApps = {
     enable = true;