diff --git a/configs/dms-desktop/settings.json b/configs/dms-desktop/settings.json index 0fcae51..71aadcf 100644 --- a/configs/dms-desktop/settings.json +++ b/configs/dms-desktop/settings.json @@ -14,7 +14,7 @@ "useFahrenheit": false, "nightModeEnabled": false, "animationSpeed": 4, - "customAnimationDuration": 350, + "customAnimationDuration": 275, "wallpaperFillMode": "Fill", "blurredWallpaperLayer": false, "blurWallpaperOnOverview": false, @@ -127,9 +127,9 @@ "soundNewNotification": true, "soundVolumeChanged": true, "soundPluggedIn": true, - "acMonitorTimeout": 1800, + "acMonitorTimeout": 3600, "acLockTimeout": 300, - "acSuspendTimeout": 1800, + "acSuspendTimeout": 5400, "acSuspendBehavior": 0, "batteryMonitorTimeout": 0, "batteryLockTimeout": 0, @@ -225,7 +225,10 @@ "enabled": true, "position": 3, "screenPreferences": [ - "all" + { + "name": "DP-1", + "model": "M27Q3" + } ], "showOnLastDisplay": true, "leftWidgets": [ diff --git a/configs/hypr-desktop/hypr-colors.conf b/configs/hypr-desktop/hypr-colors.conf index 56fba21..6b37940 100644 --- a/configs/hypr-desktop/hypr-colors.conf +++ b/configs/hypr-desktop/hypr-colors.conf @@ -1,151 +1,151 @@ -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$background = rgba(1e100eff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$background = rgba(131315ff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg $error = rgba(ffb4abff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg $error_container = rgba(93000aff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$inverse_on_surface = rgba(3d2c2aff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$inverse_on_surface = rgba(303032ff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$inverse_primary = rgba(b6231fff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$inverse_primary = rgba(525e7aff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$inverse_surface = rgba(f8dcd9ff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$inverse_surface = rgba(e4e2e4ff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$on_background = rgba(f8dcd9ff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$on_background = rgba(e4e2e4ff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg $on_error = rgba(690005ff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg $on_error_container = rgba(ffdad6ff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$on_primary = rgba(690004ff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$on_primary = rgba(243049ff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$on_primary_container = rgba(000000ff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$on_primary_container = rgba(2d3952ff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$on_primary_fixed = rgba(410002ff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$on_primary_fixed = rgba(0e1b33ff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$on_primary_fixed_variant = rgba(930009ff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$on_primary_fixed_variant = rgba(3b4761ff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$on_secondary = rgba(5e1511ff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$on_secondary = rgba(2c303bff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$on_secondary_container = rgba(ffdcd8ff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$on_secondary_container = rgba(e0e3f2ff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$on_secondary_fixed = rgba(410102ff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$on_secondary_fixed = rgba(171b26ff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$on_secondary_fixed_variant = rgba(7d2c25ff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$on_secondary_fixed_variant = rgba(424752ff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$on_surface = rgba(f8dcd9ff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$on_surface = rgba(e4e2e4ff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$on_surface_variant = rgba(e3beb9ff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$on_surface_variant = rgba(c5c6ceff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$on_tertiary = rgba(00363dff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$on_tertiary = rgba(402d0aff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$on_tertiary_container = rgba(000000ff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$on_tertiary_container = rgba(493612ff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$on_tertiary_fixed = rgba(001f24ff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$on_tertiary_fixed = rgba(271900ff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$on_tertiary_fixed_variant = rgba(004f58ff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$on_tertiary_fixed_variant = rgba(58431eff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$outline = rgba(aa8985ff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$outline = rgba(8f9098ff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$outline_variant = rgba(5a403dff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$outline_variant = rgba(45474dff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$primary = rgba(ffb4abff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$primary = rgba(dee6ffff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$primary_container = rgba(fd564aff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$primary_container = rgba(becaeaff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$primary_fixed = rgba(ffdad5ff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$primary_fixed = rgba(d8e2ffff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$primary_fixed_dim = rgba(ffb4abff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$primary_fixed_dim = rgba(bac6e6ff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg $scrim = rgba(000000ff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$secondary = rgba(ffb4abff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$secondary = rgba(c3c6d4ff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$secondary_container = rgba(802e27ff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$secondary_container = rgba(454954ff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$secondary_fixed = rgba(ffdad5ff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$secondary_fixed = rgba(dfe2f0ff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$secondary_fixed_dim = rgba(ffb4abff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$secondary_fixed_dim = rgba(c3c6d4ff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg $shadow = rgba(000000ff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$source_color = rgba(e6463cff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$source_color = rgba(becaeaff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$surface = rgba(1e100eff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$surface = rgba(131315ff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$surface_bright = rgba(473533ff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$surface_bright = rgba(39393bff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$surface_container = rgba(2b1c1aff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$surface_container = rgba(1f1f21ff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$surface_container_high = rgba(362624ff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$surface_container_high = rgba(2a2a2cff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$surface_container_highest = rgba(42312eff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$surface_container_highest = rgba(353437ff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$surface_container_low = rgba(271816ff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$surface_container_low = rgba(1b1b1dff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$surface_container_lowest = rgba(180b09ff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$surface_container_lowest = rgba(0e0e10ff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$surface_dim = rgba(1e100eff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$surface_dim = rgba(131315ff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$surface_tint = rgba(ffb4abff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$surface_tint = rgba(bac6e6ff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$surface_variant = rgba(5a403dff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$surface_variant = rgba(45474dff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$tertiary = rgba(6ed5e6ff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$tertiary = rgba(ffe3b8ff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$tertiary_container = rgba(2b9eafff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$tertiary_container = rgba(e5c696ff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$tertiary_fixed = rgba(9af0ffff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$tertiary_fixed = rgba(fedeacff) -$image = /home/liamm/pictures/wallpapers/halloween-temple.png -$tertiary_fixed_dim = rgba(6ed5e6ff) +$image = /home/liamm/pictures/wallpapers/frieren-fight.jpeg +$tertiary_fixed_dim = rgba(e1c292ff) diff --git a/configs/hypr-desktop/hypr-monitors.conf b/configs/hypr-desktop/hypr-monitors.conf index 649e58b..50d3d3d 100644 --- a/configs/hypr-desktop/hypr-monitors.conf +++ b/configs/hypr-desktop/hypr-monitors.conf @@ -1,15 +1,17 @@ # Monitors monitor=DP-1,2560x1440@300,0x0,1 - monitor=HDMI-A-2,2560x1440@100,-1440x-480,1, transform, 1 + monitor=HDMI-A-2,2560x1440@100,0x0,1, transform, 1 monitor=,preferred,auto,1 # in case of hotplugging or new monitors + source = ./monitors.conf # Rule :: Workspace Monitor Linking - workspace = $ws_game, monitor:DP-1 - workspace = $ws_web, monitor:HDMI-A-2, default:true - workspace = $ws_chat, monitor:HDMI-A-2 - workspace = $ws_video, monitor:DP-1 - workspace = $ws_program, monitor:DP-1, default:true - workspace = $ws_extra, monitor:DP-1 + # workspace = $ws_game, monitor:DP-1 + # workspace = $ws_web, monitor:HDMI-A-2, default:true + # workspace = $ws_chat, monitor:HDMI-A-2 + # workspace = $ws_video, monitor:DP-1 + # workspace = $ws_program, monitor:DP-1, default:true + # workspace = $ws_extra, monitor:DP-1 + source = ./workspaces.conf diff --git a/configs/hypr/hyprland.conf b/configs/hypr/hyprland.conf index 4d2eca5..50f2e02 100644 --- a/configs/hypr/hyprland.conf +++ b/configs/hypr/hyprland.conf @@ -129,50 +129,52 @@ $idleInhibFo = idle_inhibit focus $ws = workspace - windowrule = match:class ^(floorp)$, $idleInhibFs - windowrule = match:class ^(firefox)$, $idleInhibFs - windowrule = match:class ^(ghostty)$, $idleInhibFs - windowrule = match:class ^(brave-browser)$, $idleInhibFs + windowrule = match:class ^(floorp)$, $idleInhibFs + windowrule = match:class ^(firefox)$, $idleInhibFs + windowrule = match:class ^(ghostty)$, $idleInhibFs + windowrule = match:class ^(brave-browser)$, $idleInhibFs - windowrule = match:class ^(mpv)$, $idleInhibFo - windowrule = match:class ^(firefox)$, $idleInhibFo - windowrule = match:class ^(floorp)$, $idleInhibFo - windowrule = match:class ^(spotify)$, $idleInhibFo - windowrule = match:class ^(Emacs|emacs)$, $idleInhibFo - windowrule = match:class ^(brave-browser)$, $idleInhibFo - windowrule = match:class ^(Discord|discord)$, $idleInhibFo + windowrule = match:class ^(mpv)$, $idleInhibFo + windowrule = match:class ^(firefox)$, $idleInhibFo + windowrule = match:class ^(floorp)$, $idleInhibFo + windowrule = match:class ^(spotify)$, $idleInhibFo + windowrule = match:class ^(Emacs|emacs)$, $idleInhibFo + windowrule = match:class ^(brave-browser)$, $idleInhibFo + windowrule = match:class ^(Discord|discord)$, $idleInhibFo - windowrule = match:class ^(Discord|discord)$, opacity 0.98 0.90 - windowrule = match:class ^(Emacs|emacs)$, opacity 0.96 0.90 + windowrule = match:class ^(Discord|discord)$, opacity 0.98 0.90 + windowrule = match:class ^(Emacs|emacs)$, opacity 0.96 0.90 - windowrule = match:class ^(.*desktop-portal.*)$, float on - windowrule = match:class ^(polkit.*agent.*)$, float on - windowrule = match:class ^(praat)$, float on - windowrule = match:class ^(network)$, float on - windowrule = match:class ^(nm-)$, float on - windowrule = match:class ^(Network)$, float on - windowrule = match:class ^(Rofi)$, float on - windowrule = match:class ^(Gimp)$, float on - windowrule = match:class ^(thunar)$, float on - windowrule = match:class ^(Nautilus)$, float on - windowrule = match:title ^(LmDev-.*)$, float on - windowrule = match:class ^(notification)$, float on - windowrule = match:class ^(Genymotion Player)$, float on - windowrule = match:class ^(launcher)$, float on - windowrule = match:class steam, match:title ^(Friends List)$, float on + windowrule = match:class ^(.*desktop-portal.*)$, float on + windowrule = match:class ^(org.quickshell)$, match:title Settings, float on + windowrule = match:class ^(polkit.*agent.*)$, float on + windowrule = match:class ^(praat)$, float on + windowrule = match:class ^(network)$, float on + windowrule = match:class ^(nm-)$, float on + windowrule = match:class ^(Network)$, float on + windowrule = match:class ^(Rofi)$, float on + windowrule = match:class ^(Gimp)$, float on + windowrule = match:class ^(thunar)$, float on + windowrule = match:class ^(Nautilus)$, float on + windowrule = match:title ^(LmDev-.*)$, float on + windowrule = match:class ^(notification)$, float on + windowrule = match:class ^(Genymotion Player)$, float on + windowrule = match:class ^(launcher)$, float on + windowrule = match:class steam, match:title ^(Friends List)$, float on - windowrule = match:class ^(Spotify)$, tile on - windowrule = match:title ^(Minecraft)$, tile on + windowrule = match:class ^(Spotify)$, tile on + windowrule = match:title ^(Minecraft)$, tile on - windowrule = match:class ^(KeePassXC)$, $ws $ws_shell - windowrule = match:class ^(firefox)$, $ws $ws_web - windowrule = match:class ^(floorp)$, $ws $ws_web - windowrule = match:class ^(brave-browser)$, $ws $ws_web - windowrule = match:class ^(Spotify)$, $ws $ws_music - windowrule = match:class ^(discord)$, $ws $ws_chat - windowrule = match:class ^(signal)$, match:title ^(Signal)$, $ws $ws_chat - windowrule = match:class ^(.*obs.*)$, $ws $ws_video - windowrule = match:title ^(Minecraft)$, $ws $ws_game + windowrule = match:class ^(KeePassXC)$, $ws $ws_shell + windowrule = match:class ^(firefox)$, $ws $ws_web + windowrule = match:class ^(floorp)$, $ws $ws_web + windowrule = match:class ^(brave-browser)$, $ws $ws_web + windowrule = match:class ^(Spotify)$, $ws $ws_music + windowrule = match:class ^(discord)$, $ws $ws_chat + windowrule = match:class ^(signal)$, match:title ^(Signal)$, $ws $ws_chat + windowrule = match:class ^(.*)$, match:title ^(.*WhatsApp.*)$, $ws $ws_chat + windowrule = match:class ^(.*obs.*)$, $ws $ws_video + windowrule = match:title ^(Minecraft)$, $ws $ws_game # Commands # :Alias: :Command: diff --git a/flake.lock b/flake.lock index 1bebb5b..8fa2292 100644 --- a/flake.lock +++ b/flake.lock @@ -71,11 +71,11 @@ ] }, "locked": { - "lastModified": 1763939855, - "narHash": "sha256-mG+v5TPArZmBw3XQBe5JSiuIS1Nm9CpsiCsfz25suL8=", + "lastModified": 1764173958, + "narHash": "sha256-TX083ovrIAb0D82Q638CWgDPvDLf85whKZHFLWg8Id8=", "owner": "AvengeMedia", "repo": "DankMaterialShell", - "rev": "43bea80cad922edea93544a5b96993fedaba0a6c", + "rev": "039c98b9e350cfc0d0fc791e7356a59088549c38", "type": "github" }, "original": { diff --git a/hosts/graphical/pkgs.nix b/hosts/graphical/pkgs.nix index 0038ba8..f6ba12c 100644 --- a/hosts/graphical/pkgs.nix +++ b/hosts/graphical/pkgs.nix @@ -44,6 +44,7 @@ mpv mupdf networkmanagerapplet + nwg-displays nwg-look openvpn pamixer