finish overhaul

modules/hypr/default.nix

@@ -2,6 +2,7 @@
 
 {
   services.hyprpolkitagent.enable = true;
+	programs.hyprshot.enable = true;
 	wayland.windowManager.hyprland.enable = true;
 	wayland.windowManager.hyprland.package = null;
 	wayland.windowManager.hyprland.portalPackage = null;
@@ -12,12 +13,13 @@
 # See https://wiki.hyprland.org/Configuring/Monitors/
 monitor = HDMI-A-1, 3840x2160@120, 0x0, auto, bitdepth, 10, sdrsaturation, 1, sdrbrightness, 1
 #monitor = HDMI-A-1, disable
+monitor = eDP-1, 2560x1600@60, 0x0, 1.6,
 #monitor = sunshine, highres@highrr, 0x0, 1
 monitor = DP-1, highres@highrr, 0x0, 1
 #monitor = DP-1, highres@highrr, 0x0, 1, bitdepth, 10, cm, hdr, sdrsaturation, 1, sdrbrightness, 1
 exec-once = hyprctl dispatch workspace 1
 #exec-once = linux-wallpaperengine --screen-root HDMI-A-1 --silent --fps 60 3000562427
-exec-once = noctalia-shell& sleep 2 && noctalia-shell ipc call lockScreen lock
+exec-once = noctalia-shell& sleep 3 && noctalia-shell ipc call lockScreen lock
 exec-once = pw-metadata -n settings 0 clock.force-quantum 2048
 # exec-once = ashell
 exec-once = systemctl --user start hyprpolkitagent
@@ -51,7 +53,11 @@ input {
     follow_mouse = 1
 
     touchpad {
-        natural_scroll = no
+        natural_scroll = yes
+				tap-to-click = false
+				drag_3fg = yes
+				clickfinger_behavior = yes
+				tap-and-drag = no
     }
 
     sensitivity = 0 # -1.0 - 1.0, 0 means no modification.

modules/noctalia/default.nix

@@ -6,6 +6,8 @@
 		settings = {
 			general = {
 				avatarImage = "/home/joshuaelm/NixOS-configs/pfp.jpg";
+				shadowOffsetX = 3;
+				shadowOffsetY = 3;
 			};
 			bar = lib.mkForce {
 				position = "top";
@@ -16,10 +18,10 @@
         capsuleOpacity = 1;
         backgroundOpacity = 1;
         useSeparateOpacity = false;
-        floating = false;
+        floating = true;
         marginVertical = 4;
-        marginHorizontal = 4;
-        outerCorners = true;
+        marginHorizontal = 18;
+        outerCorners = false;
         exclusive = true;
         hideOnOverview = false;
 				widgets = {
@@ -40,9 +42,18 @@
 						}
 					];
 					right = [
+						{
+							id = "AudioVisualizer";
+						}
 						{
 							id = "Tray";
 						}
+						{
+							id = "plugin:screenshot";
+						}
+						{
+							id = "plugin:screen-recorder";
+						}
 						{
 							id = "Volume";
 						}
@@ -60,6 +71,16 @@
 			};
 			appLauncher = {
 				terminalCommand = "kitty -e";
+				position = "top-center";
+			};
+			sessionMenu = {
+				position = "top_left";
+			};
+			dock = {
+				enabled = false;
+			};
+			osd = {
+				location = "center_right";
 			};
 			location = {
 				monthBeforeDay = true;
@@ -77,5 +98,39 @@
         hideWeatherCityName = false;
 			};
 		};
+		plugins = {
+			sources = [
+				{
+					enabled = true;
+          name = "Official Noctalia Plugins";
+          url = "https://github.com/noctalia-dev/noctalia-plugins";
+			}
+			];
+			states = {
+				screen-recorder = {
+					enabled = true;
+				};
+				fancy-audiovisualizer = {
+          enabled = true;
+       	};
+				screenshot = {
+					enabled = true;
+				};
+				kagi-quick-search = {
+					enabled = true;
+				};
+			};
+			version = "1";
+		};
+		
+		pluginSettings = {
+			screen-recorder = {
+				videoCodec = "av1";
+			};
+			kagi-quick-search = {
+				kagiSessionToken = "Ub-qBZk0teotZem9-oDpZsvS8B-6Cof9D0Juqexr_Ow.Oi1cHu5d-9o2UupeBO1ndQ_6CsvoFo2lfEWDnxlnqWc";
+			};
+		};
+		
 	};
 }

modules/stylix/default.nix

@@ -1,11 +1,9 @@
 { pkgs, ... }:
 {
   stylix.enable = true;
-  stylix.polarity = "dark";
+	stylix.polarity = "light";
   #stylix.targets.plymouth.enable = false;
   stylix.targets.kitty.enable =  true;
-  stylix.targets.hyprpaper.enable = true;
-  stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/nord.yaml";
   stylix.targets.zen-browser.profileNames = [ "default" ];
   stylix.targets.zen-browser.enable = true;
   # blue aura house
@@ -32,9 +30,22 @@
 	};*/
 
 	# Icy Mountains with Ocean Night
-	stylix.image = pkgs.fetchurl {
+	/*stylix.image = pkgs.fetchurl {
 		url = "https://gitea.base.jeditemple.com/joshuaelm/Wallpapers/raw/branch/main/generic/Icy%20Mountains%20Blue%20Night.png";
 		hash = "sha256-X67ljSsASOXIzNti6cMmLYJ5pO14C3tdWmVpZ/n2R6E=";
+	};*/
+
+	# Whale In Coral Reef Ghibli
+	/*stylix.image = pkgs.fetchurl {
+		url = "https://gitea.base.jeditemple.com/joshuaelm/Wallpapers/raw/branch/main/generic/89299256_p0.png";
+		hash = "sha256-OWgf4+fhH4MiRCHp1UC+pVn/XP4A+tkVbizIcjMaXAw=";
+	};*/
+
+	# Girl playing piano in flower field
+  stylix.image = pkgs.fetchurl {
+		url = "https://gitea.base.jeditemple.com/joshuaelm/Wallpapers/raw/branch/main/generic/88677104_p0.png";
+		hash = "sha256-IIKzA4DgWg9P48A+x/vBKjaD7seNBtkh/0wSXY2O3x8=";
 	};
+	stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/atelier-plateau-light.yaml";
 
 }