Changed Desktop

home/hyprland/default.nix

@@ -5,7 +5,9 @@
     ./hyprland.nix
     ./hypridle.nix
     ./hyprlock.nix
-    ./hyprpaper.nix
+    #./hyprpaper.nix
+    #./wpaperd.nix
+    ./swww.nix
     ./rofi # App Launcher
     ./mako.nix # Notifyer
     ./cava.nix # Music Visualizer
@@ -16,6 +18,8 @@
       import ../../home/hyprland/waybar/single.nix
     else if monitorSetup == "dual" then
       import ../../home/hyprland/waybar/dual.nix
+    else if monitorSetup == "side" then
+      import ../../home/hyprland/waybar/side.nix
     else
       { };
 

home/hyprland/hyprland.nix

@@ -23,6 +23,18 @@ in
     recursive = true;
   };
 
+  home.file.".config/hypr/avatar" = {
+    source = ../../avatar;
+    recursive = true;
+  };
+
+  home.file = {
+    "Pictures/Avatar" = {
+      source = ../../avatar;
+      recursive = true;
+    };
+  };
+
   home.pointerCursor = {
     gtk.enable = true;
     package = pkgs.bibata-cursors;
@@ -186,13 +198,9 @@ in
     # See further https://wiki.hypr.land/Configuring/Workspace-Rules/
     exec-once = [
       "waybar &"
-      "hyprpaper &"
-      "[workspace 8] obsidian"
-      "[workspace 1] floorp"
-      "[workspace 2] spotify"
-      "[workspace 2] kitty --class=cava-terminal -e cava"
-      "[workspace 3] thunderbird"
-      "[workspace 9] kitty"
+      #"hyprpaper &"
+      #"wpaperd -d"
+      "swww-daemon & disown"
     ];
 
     # Keybindings
@@ -209,7 +217,7 @@ in
       "${super}, M, exit, "
 
       # Rofi bindings
-      "${super}, f, exec, ${filebrowser}"
+      "${super}, F, exec, ${filebrowser}"
       "${super}, A, exec, ${apps}"
       "${super}, R, exec, ${menu}"
       "${super}, S, exec, ${power}"

home/hyprland/hyprlock.nix

@@ -83,7 +83,7 @@
 
       image = {
         monitor = "";
-        path = "~/.config/hypr/avatar.png";
+        path = "~/.config/hypr/avatar/avatar.png";
         size = 300;
         border_color = "$teal";
         position = "0, 75";

home/hyprland/hyprpaper.nix

@@ -1,5 +1,4 @@
 { pkgs, ... }:
-
 {
   home.packages = with pkgs; [
     hyprpaper
@@ -13,10 +12,14 @@
   };
 
   # Hyprpaper configuration
-  services.hyprpaper.enable = true;
-  services.hyprpaper.settings = {
-    preload = "Pictures/Wallpapers/tokio.png";
-    wallpaper = ", Pictures/Wallpapers/tokio.png";
+  services.hyprpaper = {
+    enable = true;
+    settings = {
+      preload = [
+        "Pictures/Wallpapers/tokio.png"
+      ];
+      wallpaper = ", Pictures/Wallpapers/tokio.png";
+    };
   };
 
 }

home/hyprland/swww.nix

@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+{
+  home.file = {
+    "Pictures/Wallpapers" = {
+      source = ../../wallpapers;
+      recursive = true;
+    };
+  };
+
+  home.packages = with pkgs; [ swww ];
+}

home/hyprland/waybar/common.nix

@@ -152,6 +152,13 @@
       interval = 60;
       tooltip = false;
     };
+
+    "custom/weather-side" = {
+      format = "{}";
+      exec = "curl -s 'wttr.in/52.281311,10.527029?format=1'";
+      interval = 60;
+      tooltip = false;
+    };
   };
 
 }

home/hyprland/waybar/configs/side.css

@@ -0,0 +1,17 @@
+@import "mocha.css";
+
+/* -- Global rules -- */
+* {
+  border: none;
+  font-family: "JetbrainsMono Nerd Font";
+  font-size: 15px;
+  min-height: 10px;
+}
+
+window#waybar {
+  background: @crust;
+}
+
+window#waybar.hidden {
+  opacity: 0.2;
+}

home/hyprland/waybar/default.nix

@@ -1,5 +1,6 @@
 {
   pkgs,
+  monitorSetup,
   ...
 }:
 {
@@ -8,9 +9,27 @@
     package = pkgs.waybar;
   };
 
-  home.file.".config/waybar" = {
-    source = ./configs;
-    # copy the scripts directory recursively
-    recursive = true;
-  };
+  home.file.".config/waybar/style.css" =
+    if monitorSetup == "side" then
+      {
+        source = ./configs/side.css;
+      }
+    else
+      {
+        source = ./configs/style.css;
+      };
+  home.file.".config/waybar/cava.sh".source = ./configs/cava.sh;
+  home.file.".config/waybar/mocha.css".source = ./configs/mocha.css;
+
+  /*
+    home.file.".config/waybar" = {
+      source = ./configs;
+      # copy the scripts directory recursively
+      recursive = true;
+    };
+
+      home.file.".config/waybar/style.css" = lib.mkIf (monitorSetup == "side") {
+        source = ./configs/side.css;
+      };
+  */
 }

home/hyprland/waybar/dual.nix

@@ -1,6 +1,6 @@
 let
   common = import ./common.nix;
-  hyprland = import ./hyprland.nix;
+  wm = import ./wm.nix;
 in
 {
   enable = true;
@@ -17,13 +17,14 @@ in
         ];
         modules-center = [
           "hyprland/workspaces"
+          "niri/workspaces"
         ];
         modules-right = [
           "group/hardware"
         ];
       }
       // common.widgets
-      // hyprland.widgets;
+      // wm.widgets;
 
     secondBar =
       {
@@ -32,11 +33,14 @@ in
         height = 30;
         output = [ "HDMI-A-2" ];
         modules-left = [ "group/media" ];
-        modules-center = [ "hyprland/workspaces" ];
+        modules-center = [
+          "hyprland/workspaces"
+          "niri/workspaces"
+        ];
         modules-right = [ "custom/weather" ];
       }
       // common.widgets
-      // hyprland.widgets;
+      // wm.widgets;
   };
 
 }

home/hyprland/waybar/side.nix

@@ -0,0 +1,36 @@
+let
+  common = import ./common.nix;
+  wm = import ./wm.nix;
+in
+{
+  enable = true;
+  settings = {
+    mainBar =
+      {
+        layer = "top";
+        position = "left";
+        #height = 30;
+        modules-left = [
+          "custom/nixicon"
+          "clock"
+          "custom/cava"
+          "mpris"
+          "wireplumber"
+        ];
+        modules-center = [
+          "hyprland/workspaces"
+          "niri/workspaces"
+        ];
+        modules-right = [
+          "custom/weather-side"
+          "cpu"
+          "network"
+          "memory"
+          "disk"
+          "temperature"
+        ];
+      }
+      // common.widgets
+      // wm.widgets;
+  };
+}

home/hyprland/waybar/single.nix

@@ -1,6 +1,6 @@
 let
   common = import ./common.nix;
-  hyprland = import ./hyprland.nix;
+  wm = import ./wm.nix;
 in
 {
   enable = true;
@@ -10,15 +10,6 @@ in
         layer = "top";
         position = "top";
         height = 30;
-        /*
-          Waybar should use every display available if not output is specified
-          output = [
-            "eDP-1"
-            "DP-1"
-            "HDMI-A-1"
-            "Virtual-1"
-          ];
-        */
         modules-left = [
           "custom/nixicon"
           "clock"
@@ -26,14 +17,14 @@ in
         ];
         modules-center = [
           "hyprland/workspaces"
+          "niri/workspaces"
         ];
         modules-right = [
           "custom/weather"
           "group/hardware"
         ];
-        # Widget configurations
       }
       // common.widgets
-      // hyprland.widgets;
+      // wm.widgets;
   };
 }

home/hyprland/waybar/wm.nix

@@ -7,5 +7,13 @@
         active = "";
       };
     };
+
+    "niri/workspaces" = {
+      format = "{icon}";
+      format-icons = {
+        default = "";
+        active = "";
+      };
+    };
   };
 }

home/hyprland/wpaperd.nix

@@ -0,0 +1,26 @@
+{ ... }:
+{
+  home.file = {
+    "Pictures/Wallpapers" = {
+      source = ../../wallpapers;
+      recursive = true;
+    };
+  };
+
+  services.wpaperd = {
+    enable = true;
+    settings = {
+      default = {
+        duration = "30m";
+        mode = "center";
+        sorting = "ascending";
+      };
+
+      any = {
+        path = "/home/phil/Pictures/Wallpapers/girl.png";
+      };
+
+    };
+  };
+
+}