Back to hyprland...

Switch sww back to hyprpaper as well

home/default.nix

@@ -1,8 +1,17 @@
 { pkgs, wallpapers, ... }:
 
 {
-  imports =
+  imports = [
-    [ ./git ./ssh ./tui ./tmux ./alacritty ./firefox ./zathura ./emacs ];
+    ./git
+    ./ssh
+    ./tui
+    ./tmux
+    ./hyprland
+    ./alacritty
+    ./firefox
+    ./zathura
+    ./emacs
+  ];
   home.packages = with pkgs; [ bitwarden signal-desktop libreoffice zotero ];
   programs.home-manager.enable = true;
   xdg.configFile."wallpapers/default.jpg".source = wallpapers.outputs.default;

home/hyprland/default.nix

@@ -298,71 +298,15 @@ in {
 
       exec-once = ${pkgs.libsForQt5.polkit-kde-agent}/bin/polkit-kde-authentication-agent-1
       exec-once = ${pkgs.waybar}/bin/waybar
-      exec-once = ${pkgs.swww}/bin/swww init && ${pkgs.swww}/bin/swww img ${wallpapers.outputs.default}
       exec-once = ${pkgs.mako}/bin/mako
+      exec-once = ${pkgs.hyprpaper}/bin/hyprpaper
     '';
   };
-  xdg.configFile."hypr/macchiato.conf".text = ''
+  xdg.configFile = {
-    $rosewaterAlpha = f4dbd6
+    "hypr/hyprpaper.conf".text = ''
-    $flamingoAlpha  = f0c6c6
+      preload = ${wallpapers.outputs.default}
-    $pinkAlpha      = f5bde6
+      wallpaper = ,${wallpapers.outputs.default}
-    $mauveAlpha     = c6a0f6
-    $redAlpha       = ed8796
-    $maroonAlpha    = ee99a0
-    $peachAlpha     = f5a97f
-    $yellowAlpha    = eed49f
-    $greenAlpha     = a6da95
-    $tealAlpha      = 8bd5ca
-    $skyAlpha       = 91d7e3
-    $sapphireAlpha  = 7dc4e4
-    $blueAlpha      = 8aadf4
-    $lavenderAlpha  = b7bdf8
-
-    $textAlpha      = cad3f5
-    $subtext1Alpha  = b8c0e0
-    $subtext0Alpha  = a5adcb
-
-    $overlay2Alpha  = 939ab7
-    $overlay1Alpha  = 8087a2
-    $overlay0Alpha  = 6e738d
-
-    $surface2Alpha  = 5b6078
-    $surface1Alpha  = 494d64
-    $surface0Alpha  = 363a4f
-
-    $baseAlpha      = 24273a
-    $mantleAlpha    = 1e2030
-    $crustAlpha     = 181926
-
-    $rosewater = 0xfff5e0dc
-    $flamingo  = 0xfff2cdcd
-    $pink      = 0xfff5c2e7
-    $mauve     = 0xffcba6f7
-    $red       = 0xfff38ba8
-    $maroon    = 0xffeba0ac
-    $peach     = 0xfffab387
-    $yellow    = 0xfff9e2af
-    $green     = 0xffa6e3a1
-    $teal      = 0xff94e2d5
-    $sky       = 0xff89dceb
-    $sapphire  = 0xff74c7ec
-    $blue      = 0xff89b4fa
-    $lavender  = 0xffb4befe
-
-    $text      = 0xffcdd6f4
-    $subtext1  = 0xffbac2de
-    $subtext0  = 0xffa6adc8
-
-    $overlay2  = 0xff9399b2
-    $overlay1  = 0xff7f849c
-    $overlay0  = 0xff6c7086
-
-    $surface2  = 0xff585b70
-    $surface1  = 0xff45475a
-    $surface0  = 0xff313244
-
-    $base      = 0xff1e1e2e
-    $mantle    = 0xff181825
-    $crust     = 0xff11111b
     '';
+    "hypr/macchiato.conf".source = ./macchiato.conf;
+  };
 }

home/hyprland/macchiato.conf

@@ -0,0 +1,61 @@
+$rosewaterAlpha = f4dbd6
+$flamingoAlpha  = f0c6c6
+$pinkAlpha      = f5bde6
+$mauveAlpha     = c6a0f6
+$redAlpha       = ed8796
+$maroonAlpha    = ee99a0
+$peachAlpha     = f5a97f
+$yellowAlpha    = eed49f
+$greenAlpha     = a6da95
+$tealAlpha      = 8bd5ca
+$skyAlpha       = 91d7e3
+$sapphireAlpha  = 7dc4e4
+$blueAlpha      = 8aadf4
+$lavenderAlpha  = b7bdf8
+
+$textAlpha      = cad3f5
+$subtext1Alpha  = b8c0e0
+$subtext0Alpha  = a5adcb
+
+$overlay2Alpha  = 939ab7
+$overlay1Alpha  = 8087a2
+$overlay0Alpha  = 6e738d
+
+$surface2Alpha  = 5b6078
+$surface1Alpha  = 494d64
+$surface0Alpha  = 363a4f
+
+$baseAlpha      = 24273a
+$mantleAlpha    = 1e2030
+$crustAlpha     = 181926
+
+$rosewater = 0xfff5e0dc
+$flamingo  = 0xfff2cdcd
+$pink      = 0xfff5c2e7
+$mauve     = 0xffcba6f7
+$red       = 0xfff38ba8
+$maroon    = 0xffeba0ac
+$peach     = 0xfffab387
+$yellow    = 0xfff9e2af
+$green     = 0xffa6e3a1
+$teal      = 0xff94e2d5
+$sky       = 0xff89dceb
+$sapphire  = 0xff74c7ec
+$blue      = 0xff89b4fa
+$lavender  = 0xffb4befe
+
+$text      = 0xffcdd6f4
+$subtext1  = 0xffbac2de
+$subtext0  = 0xffa6adc8
+
+$overlay2  = 0xff9399b2
+$overlay1  = 0xff7f849c
+$overlay0  = 0xff6c7086
+
+$surface2  = 0xff585b70
+$surface1  = 0xff45475a
+$surface0  = 0xff313244
+
+$base      = 0xff1e1e2e
+$mantle    = 0xff181825
+$crust     = 0xff11111b

hosts/Ronin/configuration.nix

@@ -9,7 +9,7 @@ in {
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
-    ../plasma.nix
+    ../hyprland.nix
     ../../services/${hostName}.nix
   ];
   # Bootloader.
@@ -32,6 +32,13 @@ in {
   '';
   programs.light.enable = true;
   users.users.${user} = userConfig;
+  services.greetd = {
+    enable = true;
+    settings = {
+      default_session.user = user;
+      initial_session.user = user;
+    };
+  };
 
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions

hosts/Ronin/home.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, shellConfig, ... }:
+{ pkgs, lib, shellConfig, wallpapers, ... }:
 let
   username = "elitherl";
   homeDirectory = "/home/${username}";
@@ -81,8 +81,7 @@ in {
           {
             name = "Physics Summary";
             tags = [ "JET" "operations" ];
-            url =
+            url = "https://users.euro-fusion.org/pages/physics-summary/LatestSession.php";
-              "https://users.euro-fusion.org/pages/physics-summary/LatestSession.php";
           }
           {
             name = "JSPO";
@@ -146,4 +145,55 @@ in {
       }];
     };
   };
+  services.kanshi.profiles = {
+    undocked = {
+      outputs = [{
+        criteria = "eDP-1";
+        mode = "1920x1080";
+        position = "0,0";
+        scale = 1.0;
+        status = "enable";
+      }];
+      exec = "hyprctl hyprpaper wallpaper \",${wallpapers.outputs.default}\"";
+    };
+    work = {
+      outputs = [
+        {
+          criteria = "eDP-1";
+          status = "disable";
+        }
+        {
+          criteria = "Iiyama North America PLB2403WS 0574281251316";
+          position = "1280,185";
+          status = "enable";
+        }
+        {
+          criteria = "Dell Inc. DELL U2417H 5K9YD872FY1L";
+          position = "3200,0";
+          status = "enable";
+        }
+      ];
+      exec = "hyprctl hyprpaper wallpaper \",${wallpapers.outputs.default}\"";
+    };
+    home = {
+      outputs = [
+        {
+          criteria = "Acer Technologies ED270R TJMEE0043W01";
+          position = "0,0";
+          status = "enable";
+        }
+        {
+          criteria = "eDP-1";
+          status = "disable";
+        }
+      ];
+      exec = "hyprctl hyprpaper wallpaper \",${wallpapers.outputs.default}\"";
+    };
+  };
+  xdg.configFile."hypr/display.conf".text = ''
+    monitor=eDP-1,preferred,auto,1
+    monitor=desc:Iiyama North America PLB2403WS 0574281251316,preferred,1280x185,1
+    monitor=desc:Dell Inc. DELL U2417H 5K9YD872FY1L,preferred,3200x0,1,transform,1
+    monitor=desc:Acer Technologies ED270R TJMEE0043W01,highrr,0x0,1
+  '';
 }

hosts/hyprland.nix

@@ -2,8 +2,9 @@
   imports = [ ./desktop.nix hyprland.nixosModules.default ];
   environment.systemPackages = with pkgs; [
     xdg-utils
+    wlr-randr
     gsettings-desktop-schemas
-    swww
+    hyprpaper
     pipewire
     wireplumber
     wl-clipboard