diff --git a/configs/dms-darp8/settings.json b/configs/dms-darp8/settings.json index 48e8c5d..620fcfa 100644 --- a/configs/dms-darp8/settings.json +++ b/configs/dms-darp8/settings.json @@ -7,7 +7,7 @@ "popupTransparency": 1, "dockTransparency": 1, "widgetBackgroundColor": "sch", - "widgetColorMode": "default", + "widgetColorMode": "colorful", "cornerRadius": 10, "use24HourClock": true, "showSeconds": false, @@ -100,12 +100,15 @@ "dwlShowAllTags": false, "workspaceNameIcons": {}, "waveProgressEnabled": true, + "scrollTitleEnabled": true, + "audioVisualizerEnabled": true, "clockCompactMode": false, "focusedWindowCompactMode": false, "runningAppsCompactMode": true, "keyboardLayoutNameCompactMode": true, "runningAppsCurrentWorkspace": true, "runningAppsGroupByApp": false, + "centeringMode": "index", "clockDateFormat": "", "lockDateFormat": "", "mediaSize": 1, @@ -114,6 +117,7 @@ "sortAppsAlphabetically": false, "appLauncherGridColumns": 4, "spotlightCloseNiriOverview": true, + "niriOverviewOverlayEnabled": true, "weatherLocation": "Dublin, Leinster", "weatherCoordinates": "53.3493795,-6.2605593", "useAutoLocation": true, @@ -147,12 +151,13 @@ "acLockTimeout": 300, "acSuspendTimeout": 900, "acSuspendBehavior": 0, + "acProfileName": "", "batteryMonitorTimeout": 600, "batteryLockTimeout": 300, "batterySuspendTimeout": 600, "batterySuspendBehavior": 2, + "batteryProfileName": "", "lockBeforeSuspend": true, - "preventIdleForMedia": true, "loginctlLockIntegration": true, "fadeToLockEnabled": false, "fadeToLockGracePeriod": 5, @@ -166,6 +171,22 @@ "qtThemingEnabled": false, "syncModeWithPortal": true, "terminalsAlwaysDark": false, + "runDmsMatugenTemplates": true, + "matugenTemplateGtk": true, + "matugenTemplateNiri": true, + "matugenTemplateQt5ct": true, + "matugenTemplateQt6ct": true, + "matugenTemplateFirefox": true, + "matugenTemplatePywalfox": true, + "matugenTemplateVesktop": true, + "matugenTemplateGhostty": true, + "matugenTemplateKitty": true, + "matugenTemplateFoot": true, + "matugenTemplateAlacritty": true, + "matugenTemplateWezterm": true, + "matugenTemplateDgop": true, + "matugenTemplateKcolorscheme": true, + "matugenTemplateVscode": true, "showDock": false, "dockAutoHide": false, "dockGroupByApp": false, @@ -176,11 +197,22 @@ "dockMargin": 0, "dockIconSize": 40, "dockIndicatorStyle": "circle", + "dockBorderEnabled": false, + "dockBorderColor": "surfaceText", + "dockBorderOpacity": 1, + "dockBorderThickness": 1, "notificationOverlayEnabled": false, "modalDarkenBackground": true, "lockScreenShowPowerActions": true, + "lockScreenShowSystemIcons": true, + "lockScreenShowTime": true, + "lockScreenShowDate": true, + "lockScreenShowProfileImage": true, + "lockScreenShowPasswordField": true, "enableFprint": false, "maxFprintTries": 3, + "lockScreenActiveMonitor": "all", + "lockScreenInactiveColor": "#000000", "hideBrightnessSlider": false, "notificationTimeoutLow": 5000, "notificationTimeoutNormal": 5000, @@ -195,6 +227,7 @@ "osdMicMuteEnabled": true, "osdCapsLockEnabled": true, "osdPowerProfileEnabled": false, + "osdAudioOutputEnabled": true, "powerActionConfirm": true, "powerActionHoldDuration": 1, "powerMenuActions": [ @@ -214,6 +247,7 @@ "customPowerActionHibernate": "", "customPowerActionReboot": "", "customPowerActionPowerOff": "", + "updaterHideWidget": false, "updaterUseCustomCommand": false, "updaterCustomCommand": "", "updaterTerminalAdditionalParams": "", @@ -224,6 +258,12 @@ ] }, "showOnLastDisplay": {}, + "niriOutputSettings": {}, + "hyprlandOutputSettings": { + "eDP-1": { + "bitdepth": 10 + } + }, "barConfigs": [ { "id": "default", @@ -289,8 +329,80 @@ "openOnOverview": false, "visible": true, "popupGapsAuto": true, - "popupGapsManual": 4 + "popupGapsManual": 4, + "maximizeDetection": true, + "widgetOutlineEnabled": true, + "widgetOutlineColor": "primary", + "widgetOutlineOpacity": 0.58, + "widgetOutlineThickness": 1 } ], - "configVersion": 2 + "desktopClockEnabled": false, + "desktopClockStyle": "analog", + "desktopClockTransparency": 0.8, + "desktopClockColorMode": "primary", + "desktopClockCustomColor": { + "r": 1, + "g": 1, + "b": 1, + "a": 1, + "hsvHue": -1, + "hsvSaturation": 0, + "hsvValue": 1, + "hslHue": -1, + "hslSaturation": 0, + "hslLightness": 1, + "valid": true + }, + "desktopClockShowDate": true, + "desktopClockShowAnalogNumbers": false, + "desktopClockShowAnalogSeconds": true, + "desktopClockX": -1, + "desktopClockY": -1, + "desktopClockWidth": 280, + "desktopClockHeight": 180, + "desktopClockDisplayPreferences": [ + "all" + ], + "systemMonitorEnabled": false, + "systemMonitorShowHeader": true, + "systemMonitorTransparency": 0.8, + "systemMonitorColorMode": "primary", + "systemMonitorCustomColor": { + "r": 1, + "g": 1, + "b": 1, + "a": 1, + "hsvHue": -1, + "hsvSaturation": 0, + "hsvValue": 1, + "hslHue": -1, + "hslSaturation": 0, + "hslLightness": 1, + "valid": true + }, + "systemMonitorShowCpu": true, + "systemMonitorShowCpuGraph": true, + "systemMonitorShowCpuTemp": true, + "systemMonitorShowGpuTemp": false, + "systemMonitorGpuPciId": "", + "systemMonitorShowMemory": true, + "systemMonitorShowMemoryGraph": true, + "systemMonitorShowNetwork": true, + "systemMonitorShowNetworkGraph": true, + "systemMonitorShowDisk": true, + "systemMonitorShowTopProcesses": false, + "systemMonitorTopProcessCount": 3, + "systemMonitorTopProcessSortBy": "cpu", + "systemMonitorGraphInterval": 60, + "systemMonitorX": -1, + "systemMonitorY": -1, + "systemMonitorWidth": 320, + "systemMonitorHeight": 480, + "systemMonitorDisplayPreferences": [ + "all" + ], + "systemMonitorVariants": [], + "desktopWidgetPositions": {}, + "configVersion": 3 } \ No newline at end of file diff --git a/configs/hypr-darp8/hypr-colors.conf b/configs/hypr-darp8/hypr-colors.conf index 05b6733..1ae3c73 100644 --- a/configs/hypr-darp8/hypr-colors.conf +++ b/configs/hypr-darp8/hypr-colors.conf @@ -1,151 +1,151 @@ -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$background = rgba(101414ff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$background = rgba(16121cff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg $error = rgba(ffb4abff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg $error_container = rgba(93000aff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$inverse_on_surface = rgba(2d3131ff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$inverse_on_surface = rgba(332e3aff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$inverse_primary = rgba(04696dff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$inverse_primary = rgba(7a23e9ff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$inverse_surface = rgba(e0e3e3ff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$inverse_surface = rgba(e8dfeeff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$on_background = rgba(e0e3e3ff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$on_background = rgba(e8dfeeff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg $on_error = rgba(690005ff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg $on_error_container = rgba(ffdad6ff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$on_primary = rgba(003739ff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$on_primary = rgba(42008aff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$on_primary_container = rgba(000000ff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$on_primary_container = rgba(ffffffff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$on_primary_fixed = rgba(002021ff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$on_primary_fixed = rgba(270057ff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$on_primary_fixed_variant = rgba(004f52ff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$on_primary_fixed_variant = rgba(5f00c0ff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$on_secondary = rgba(193536ff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$on_secondary = rgba(3e1973ff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$on_secondary_container = rgba(cbeaebff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$on_secondary_container = rgba(ead9ffff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$on_secondary_fixed = rgba(021f21ff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$on_secondary_fixed = rgba(270057ff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$on_secondary_fixed_variant = rgba(304b4dff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$on_secondary_fixed_variant = rgba(56338bff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$on_surface = rgba(e0e3e3ff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$on_surface = rgba(e8dfeeff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$on_surface_variant = rgba(bec9c9ff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$on_surface_variant = rgba(cdc2d8ff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$on_tertiary = rgba(512302ff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$on_tertiary = rgba(502500ff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$on_tertiary_container = rgba(000000ff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$on_tertiary_container = rgba(ffffffff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$on_tertiary_fixed = rgba(321200ff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$on_tertiary_fixed = rgba(301400ff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$on_tertiary_fixed_variant = rgba(6d3915ff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$on_tertiary_fixed_variant = rgba(713700ff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$outline = rgba(889393ff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$outline = rgba(968da1ff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$outline_variant = rgba(3f4949ff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$outline_variant = rgba(4b4455ff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$primary = rgba(85d3d7ff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$primary = rgba(d5baffff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$primary_container = rgba(4d9da1ff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$primary_container = rgba(8230f1ff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$primary_fixed = rgba(a1f0f4ff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$primary_fixed = rgba(ecdcffff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$primary_fixed_dim = rgba(85d3d7ff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$primary_fixed_dim = rgba(d5baffff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg $scrim = rgba(000000ff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$secondary = rgba(aecccdff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$secondary = rgba(d5baffff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$secondary_container = rgba(324e4fff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$secondary_container = rgba(56338bff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$secondary_fixed = rgba(cae8eaff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$secondary_fixed = rgba(ecdcffff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$secondary_fixed_dim = rgba(aecccdff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$secondary_fixed_dim = rgba(d5baffff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg $shadow = rgba(000000ff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$source_color = rgba(3a8b8fff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$source_color = rgba(8230f1ff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$surface = rgba(101414ff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$surface = rgba(16121cff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$surface_bright = rgba(363a3aff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$surface_bright = rgba(3c3743ff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$surface_container = rgba(1c2020ff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$surface_container = rgba(221e28ff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$surface_container_high = rgba(272b2bff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$surface_container_high = rgba(2d2833ff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$surface_container_highest = rgba(313536ff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$surface_container_highest = rgba(38333eff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$surface_container_low = rgba(181c1cff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$surface_container_low = rgba(1e1a24ff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$surface_container_lowest = rgba(0b0f0fff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$surface_container_lowest = rgba(100c16ff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$surface_dim = rgba(101414ff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$surface_dim = rgba(16121cff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$surface_tint = rgba(85d3d7ff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$surface_tint = rgba(d5baffff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$surface_variant = rgba(3f4949ff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$surface_variant = rgba(4b4455ff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$tertiary = rgba(ffb68cff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$tertiary = rgba(ffb785ff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$tertiary_container = rgba(c58157ff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$tertiary_container = rgba(a05000ff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$tertiary_fixed = rgba(ffdbc9ff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$tertiary_fixed = rgba(ffdcc6ff) -$image = /home/liamm/pictures/wallpapers/iceland-winter-mountains.jpg -$tertiary_fixed_dim = rgba(ffb68cff) +$image = /home/liamm/pictures/wallpapers/anime-purple-rain.jpg +$tertiary_fixed_dim = rgba(ffb785ff) diff --git a/flake.lock b/flake.lock index dc77945..c91ec97 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1763922789, - "narHash": "sha256-XnkWjCpeXfip9tqYdL0b0zzBDjq+dgdISvEdSVGdVyA=", + "lastModified": 1764714051, + "narHash": "sha256-AjcMlM3UoavFoLzr0YrcvsIxALShjyvwe+o7ikibpCM=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "a20a0e67a33b6848378a91b871b89588d3a12573", + "rev": "a43bedcceced5c21ad36578ed823e6099af78214", "type": "github" }, "original": { @@ -33,62 +33,10 @@ "type": "github" } }, - "aquamarine_2": { - "inputs": { - "hyprutils": [ - "hyprpwcenter", - "hyprutils" - ], - "hyprwayland-scanner": "hyprwayland-scanner_2", - "nixpkgs": [ - "hyprpwcenter", - "nixpkgs" - ], - "systems": [ - "hyprpwcenter", - "systems" - ] - }, - "locked": { - "lastModified": 1761420899, - "narHash": "sha256-kxGCip6GNbcbNWKu4J2iKbNYfFTS8Zbjg9CWp0zmFoM=", - "owner": "hyprwm", - "repo": "aquamarine", - "rev": "62479232aae42c1ef09c2c027c8cfd91df060897", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "aquamarine", - "type": "github" - } - }, - "dankMaterialShell": { - "inputs": { - "dgop": "dgop", - "nixpkgs": [ - "nixpkgs" - ], - "quickshell": "quickshell" - }, - "locked": { - "lastModified": 1765560618, - "narHash": "sha256-gZEYrkY/IJHQrackgNwpl0qFnRacBSpmvqa0ljkdieU=", - "owner": "AvengeMedia", - "repo": "DankMaterialShell", - "rev": "e95f7ce367470424e7636b40a0ba7af42ddcd94e", - "type": "github" - }, - "original": { - "owner": "AvengeMedia", - "repo": "DankMaterialShell", - "type": "github" - } - }, "dgop": { "inputs": { "nixpkgs": [ - "dankMaterialShell", + "dms", "nixpkgs" ] }, @@ -106,6 +54,28 @@ "type": "github" } }, + "dms": { + "inputs": { + "dgop": "dgop", + "nixpkgs": [ + "nixpkgs" + ], + "quickshell": "quickshell" + }, + "locked": { + "lastModified": 1766003680, + "narHash": "sha256-KQTgfR1xpskgfCg0hkFfMEgZGkZGDfcZdlyeJv/D/Sc=", + "owner": "AvengeMedia", + "repo": "DankMaterialShell", + "rev": "d97392d46e73949122e1a29d62b285809d210aef", + "type": "github" + }, + "original": { + "owner": "AvengeMedia", + "repo": "DankMaterialShell", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -167,11 +137,11 @@ ] }, "locked": { - "lastModified": 1762367206, - "narHash": "sha256-c/164YOPkV09BH8KIUdvVvJs3VF2LNIbE2piKGgXPxk=", + "lastModified": 1765980955, + "narHash": "sha256-rB45jv4uwC90vM9UZ70plfvY/2Kdygs+zlQ07dGQFk4=", "owner": "nix-community", "repo": "home-manager", - "rev": "af119feb17cb242398e0fb97f92b867d25882522", + "rev": "89c9508bbe9b40d36b3dc206c2483ef176f15173", "type": "github" }, "original": { @@ -238,35 +208,6 @@ "type": "github" } }, - "hyprgraphics_2": { - "inputs": { - "hyprutils": [ - "hyprpwcenter", - "hyprutils" - ], - "nixpkgs": [ - "hyprpwcenter", - "nixpkgs" - ], - "systems": [ - "hyprpwcenter", - "systems" - ] - }, - "locked": { - "lastModified": 1760445448, - "narHash": "sha256-fXGjL6dw31FPFRrmIemzGiNSlfvEJTJNsmadZi+qNhI=", - "owner": "hyprwm", - "repo": "hyprgraphics", - "rev": "50fb9f069219f338a11cf0bcccb9e58357d67757", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprgraphics", - "type": "github" - } - }, "hyprland": { "inputs": { "aquamarine": "aquamarine", @@ -277,17 +218,20 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs", + "hyprwire": "hyprwire", + "nixpkgs": [ + "nixpkgs" + ], "pre-commit-hooks": "pre-commit-hooks", "systems": "systems", "xdph": "xdph" }, "locked": { - "lastModified": 1764607679, - "narHash": "sha256-1Bsem6lhJWMQmkLIml5oKOL+z1dYMewZ6ql0K35Y3TA=", + "lastModified": 1765995792, + "narHash": "sha256-b9+ZUqxNaEOq26LsYDePOqIQtSEplK0Zr7iT5cnv3Mg=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "f82a8630d7a51dab4cc70924f500bf70e723db12", + "rev": "18901b8e593ebd05a7134dcdb8a7774206cf5646", "type": "github" }, "original": { @@ -329,11 +273,11 @@ ] }, "locked": { - "lastModified": 1763727565, - "narHash": "sha256-vRff/2R1U1jzPBy4OODqh2kfUzmizW/nfV2ROzTDIKo=", + "lastModified": 1764812575, + "narHash": "sha256-1bK1yGgaR82vajUrt6z+BSljQvFn91D74WJ/vJsydtE=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "7724d3a12a0453e7aae05f2ef39474219f05a4b4", + "rev": "fd321368a40c782cfa299991e5584ca338e36ebe", "type": "github" }, "original": { @@ -353,17 +297,16 @@ "nixpkgs" ], "systems": [ - "hyprland-plugins", "hyprland", "systems" ] }, "locked": { - "lastModified": 1764636589, - "narHash": "sha256-8j0QzbFF3QindJZ0DVEwLA1Ty1/4t4hcU5zHGQ2meI8=", + "lastModified": 1765207366, + "narHash": "sha256-s0jO2kEj5cLLTgTblKnAKjqt3MjYFnmyrQT3SxiUugM=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "8f796f7cec39e7a9aa2bb65d28006025e1bc14ae", + "rev": "e058ea23b80775cf20c675d064678416df2d9d04", "type": "github" }, "original": { @@ -397,32 +340,6 @@ "type": "github" } }, - "hyprland-qt-support": { - "inputs": { - "hyprlang": "hyprlang_3", - "nixpkgs": [ - "hyprsysteminfo", - "nixpkgs" - ], - "systems": [ - "hyprsysteminfo", - "systems" - ] - }, - "locked": { - "lastModified": 1737634706, - "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=", - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "rev": "8810df502cdee755993cb803eba7b23f189db795", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "type": "github" - } - }, "hyprlang": { "inputs": { "hyprutils": [ @@ -439,11 +356,11 @@ ] }, "locked": { - "lastModified": 1763819661, - "narHash": "sha256-0jLarTR/BLWdGlboM86bPVP2zKJNI2jvo3JietnDkOM=", + "lastModified": 1764612430, + "narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "a318deec0c12409ec39c68d2be8096b636dc2a5c", + "rev": "0d00dc118981531aa731150b6ea551ef037acddd", "type": "github" }, "original": { @@ -484,49 +401,33 @@ "type": "github" } }, - "hyprlang_3": { + "hyprpwcenter": { "inputs": { - "hyprutils": "hyprutils_3", - "nixpkgs": [ - "hyprsysteminfo", - "hyprland-qt-support", - "nixpkgs" + "aquamarine": [ + "hyprland", + "aquamarine" ], + "hyprgraphics": [ + "hyprland", + "hyprgraphics" + ], + "hyprtoolkit": "hyprtoolkit_2", + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": "nixpkgs", "systems": [ - "hyprsysteminfo", - "hyprland-qt-support", + "hyprland", "systems" ] }, "locked": { - "lastModified": 1737634606, - "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "f41271d35cc0f370d300413d756c2677f386af9d", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprpwcenter": { - "inputs": { - "aquamarine": "aquamarine_2", - "hyprgraphics": "hyprgraphics_2", - "hyprtoolkit": "hyprtoolkit_2", - "hyprutils": "hyprutils_2", - "nixpkgs": "nixpkgs_2", - "systems": "systems_2" - }, - "locked": { - "lastModified": 1762269187, - "narHash": "sha256-9tVqzNU1LZe0oXFo152Pbi0RI3ftY9GHzrxD4PYdAjs=", + "lastModified": 1765497163, + "narHash": "sha256-DNBvf2xQp1rjcd+RaAOAaZ9j+rph7JvcWZ/E+nVb+3c=", "owner": "hyprwm", "repo": "hyprpwcenter", - "rev": "8987aab182c51b91148c863c9057354ed79a9a24", + "rev": "9eecd6bbe34de260b262b8f284f7cf2a89cb6cb8", "type": "github" }, "original": { @@ -535,27 +436,6 @@ "type": "github" } }, - "hyprsysteminfo": { - "inputs": { - "hyprland-qt-support": "hyprland-qt-support", - "hyprutils": "hyprutils_4", - "nixpkgs": "nixpkgs_3", - "systems": "systems_3" - }, - "locked": { - "lastModified": 1759530744, - "narHash": "sha256-8kYeWF9A9YWlmMK/56CFWFwQRgjZ616ScWwL37binP8=", - "owner": "hyprwm", - "repo": "hyprsysteminfo", - "rev": "fe81610278676d26ff47f62770ac238220285d3a", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprsysteminfo", - "type": "github" - } - }, "hyprtoolkit": { "inputs": { "aquamarine": [ @@ -595,11 +475,11 @@ ] }, "locked": { - "lastModified": 1763503177, - "narHash": "sha256-VPoiswJBBmTLVuNncvT/8FpFR+sYcAi/LgP/zTZ+5rA=", + "lastModified": 1764592794, + "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=", "owner": "hyprwm", "repo": "hyprtoolkit", - "rev": "f4e1e12755567ecf39090203b8f43eace8279630", + "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e", "type": "github" }, "original": { @@ -623,7 +503,7 @@ "hyprpwcenter", "hyprutils" ], - "hyprwayland-scanner": "hyprwayland-scanner_3", + "hyprwayland-scanner": "hyprwayland-scanner_2", "nixpkgs": [ "hyprpwcenter", "nixpkgs" @@ -659,90 +539,11 @@ ] }, "locked": { - "lastModified": 1763996058, - "narHash": "sha256-DsqzFZvrEV+aDmavjaD4/bk5qxeZwhGxPWBQdpFyM9Y=", + "lastModified": 1764962281, + "narHash": "sha256-rGbEMhTTyTzw4iyz45lch5kXseqnqcEpmrHdy+zHsfo=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "0168583075baffa083032ed13a8bea8ea12f281a", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprutils_2": { - "inputs": { - "nixpkgs": [ - "hyprpwcenter", - "nixpkgs" - ], - "systems": [ - "hyprpwcenter", - "systems" - ] - }, - "locked": { - "lastModified": 1759619523, - "narHash": "sha256-r1ed7AR2ZEb2U8gy321/Xcp1ho2tzn+gG1te/Wxsj1A=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "3df7bde01efb3a3e8e678d1155f2aa3f19e177ef", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprutils_3": { - "inputs": { - "nixpkgs": [ - "hyprsysteminfo", - "hyprland-qt-support", - "hyprlang", - "nixpkgs" - ], - "systems": [ - "hyprsysteminfo", - "hyprland-qt-support", - "hyprlang", - "systems" - ] - }, - "locked": { - "lastModified": 1737632363, - "narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "006620eb29d54ea9086538891404c78563d1bae1", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprutils_4": { - "inputs": { - "nixpkgs": [ - "hyprsysteminfo", - "nixpkgs" - ], - "systems": [ - "hyprsysteminfo", - "systems" - ] - }, - "locked": { - "lastModified": 1737632363, - "narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "006620eb29d54ea9086538891404c78563d1bae1", + "rev": "fe686486ac867a1a24f99c753bb40ffed338e4b0", "type": "github" }, "original": { @@ -777,33 +578,6 @@ } }, "hyprwayland-scanner_2": { - "inputs": { - "nixpkgs": [ - "hyprpwcenter", - "aquamarine", - "nixpkgs" - ], - "systems": [ - "hyprpwcenter", - "aquamarine", - "systems" - ] - }, - "locked": { - "lastModified": 1751897909, - "narHash": "sha256-FnhBENxihITZldThvbO7883PdXC/2dzW4eiNvtoV5Ao=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "fcca0c61f988a9d092cbb33e906775014c61579d", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, - "hyprwayland-scanner_3": { "inputs": { "nixpkgs": [ "hyprpwcenter", @@ -830,23 +604,36 @@ "type": "github" } }, - "nixpkgs": { + "hyprwire": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, "locked": { - "lastModified": 1763966396, - "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", + "lastModified": 1764872015, + "narHash": "sha256-INI9AVrQG5nJZFvGPSiUZ9FEUZJLfGdsqjF1QSak7Gc=", + "owner": "hyprwm", + "repo": "hyprwire", + "rev": "7997451dcaab7b9d9d442f18985d514ec5891608", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", + "owner": "hyprwm", + "repo": "hyprwire", "type": "github" } }, - "nixpkgs_2": { + "nixpkgs": { "locked": { "lastModified": 1761373498, "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", @@ -862,29 +649,13 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_2": { "locked": { - "lastModified": 1737469691, - "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1762111121, - "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", + "lastModified": 1765779637, + "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", + "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", "type": "github" }, "original": { @@ -904,11 +675,11 @@ ] }, "locked": { - "lastModified": 1763988335, - "narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=", + "lastModified": 1765016596, + "narHash": "sha256-rhSqPNxDVow7OQKi4qS5H8Au0P4S3AYbawBSmJNUtBQ=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce", + "rev": "548fc44fca28a5e81c5d6b846e555e6b9c2a5a3c", "type": "github" }, "original": { @@ -920,7 +691,7 @@ "quickshell": { "inputs": { "nixpkgs": [ - "dankMaterialShell", + "dms", "nixpkgs" ] }, @@ -939,37 +710,19 @@ "url": "https://git.outfoxxed.me/quickshell/quickshell" } }, - "quickshell_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1763629934, - "narHash": "sha256-jWz10RbNAyylJbH4cUTLS/CsDjkd8gxfT8OsIgQIgEg=", - "owner": "quickshell-mirror", - "repo": "quickshell", - "rev": "ed036d514b0fdbce03158a0b331305be166f4555", - "type": "github" - }, - "original": { - "owner": "quickshell-mirror", - "repo": "quickshell", - "type": "github" - } - }, "root": { "inputs": { - "dankMaterialShell": "dankMaterialShell", + "dms": "dms", "focus-editor": "focus-editor", "home-manager": "home-manager", "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", "hyprpwcenter": "hyprpwcenter", - "hyprsysteminfo": "hyprsysteminfo", - "nixpkgs": "nixpkgs_4", - "quickshell": "quickshell_2" + "nixpkgs": "nixpkgs_2", + "quickshell": [ + "dms", + "quickshell" + ] } }, "systems": { @@ -987,36 +740,6 @@ "type": "github" } }, - "systems_2": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_3": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, "xdph": { "inputs": { "hyprland-protocols": [ diff --git a/flake.nix b/flake.nix index 09a1f27..ed52a2b 100644 --- a/flake.nix +++ b/flake.nix @@ -3,9 +3,8 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - hyprland.url = "github:hyprwm/Hyprland"; - dankMaterialShell = { + dms = { url = "github:AvengeMedia/DankMaterialShell"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -17,19 +16,26 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - hyprsysteminfo = { - url = "github:hyprwm/hyprsysteminfo"; - }; - hyprpwcenter = { - url = "github:hyprwm/hyprpwcenter"; + + hyprland = { + url = "github:hyprwm/Hyprland"; + inputs.nixpkgs.follows = "nixpkgs"; }; hyprland-plugins = { url = "github:hyprwm/hyprland-plugins"; inputs.hyprland.follows = "hyprland"; + inputs.systems.follows = "hyprland/systems"; }; + hyprpwcenter = { + url = "github:hyprwm/hyprpwcenter"; + inputs.hyprgraphics.follows = "hyprland/hyprgraphics"; + inputs.aquamarine.follows = "hyprland/aquamarine"; + inputs.hyprutils.follows = "hyprland/hyprutils"; + inputs.systems.follows = "hyprland/systems"; + }; + quickshell = { - url = "github:quickshell-mirror/quickshell"; - inputs.nixpkgs.follows = "nixpkgs"; + follows = "dms/quickshell"; }; }; diff --git a/hosts/darp8/home.nix b/hosts/darp8/home.nix index 539484a..5bebcec 100644 --- a/hosts/darp8/home.nix +++ b/hosts/darp8/home.nix @@ -19,9 +19,8 @@ ./services.nix # system services # general modules - ../../modules/home-manager/tmux.nix - - inputs.dankMaterialShell.homeModules.dankMaterialShell.default + # ../../modules/home-manager/tmux.nix + inputs.dms.homeModules.dank-material-shell ]; # You should not change this value, even if you update Home Manager. If you do diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix index d824e0a..bfe599a 100644 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -20,7 +20,7 @@ # general modules ../../modules/home-manager/tmux.nix - inputs.dankMaterialShell.homeModules.dankMaterialShell.default + inputs.dms.homeModules.dank-material-shell ]; # You should not change this value, even if you update Home Manager. If you do diff --git a/hosts/graphical/configuration.nix b/hosts/graphical/configuration.nix index ea938b7..844bf81 100644 --- a/hosts/graphical/configuration.nix +++ b/hosts/graphical/configuration.nix @@ -1,5 +1,9 @@ { cfg, config, lib, pkgs, inputs, hypr-plugin-dir, ... }: { + imports = [ + inputs.dms.nixosModules.greeter + ]; + boot = { loader.systemd-boot.enable = true; loader.efi.canTouchEfiVariables = true; @@ -43,33 +47,24 @@ }; services = { - avahi = { - enable = true; - nssmdns4 = true; - publish = { - enable = true; - userServices = true; - }; - }; + # for iphone screencasting + # avahi = { + # enable = true; + # nssmdns4 = true; + # publish = { + # enable = true; + # userServices = true; + # }; + # }; greetd = { enable = true; restart = true; - settings = { - default_session = { - command = "${pkgs.tuigreet}/bin/tuigreet --cmd Hyprland"; - }; - }; - }; - - udev = { - packages = with pkgs; [ - qmk-udev-rules - ]; - extraRules = '' - # Explicit Vial rule – this is the only one that reliably works - KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{serial}=="*vial:f64c2b3c*", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl" - ''; + # settings = { + # default_session = { + # command = "${pkgs.tuigreet}/bin/tuigreet --cmd start-hyprland"; + # }; + # }; }; libinput.enable = true; @@ -78,18 +73,16 @@ pulseaudio.enable = false; upower.enable = true; - }; security.pam.services.hyprlock = {}; - environment = { - etc = { - "greetd/environments".text = '' - Hyprland - river - ''; - }; - }; + # environment = { + # etc = { + # "greetd/environments".text = '' + # Hyprland + # ''; + # }; + # }; fonts = { packages = with pkgs; [ @@ -150,17 +143,22 @@ plugins = [ ]; }; - river-classic = { + dank-material-shell.greeter = { enable = true; - xwayland.enable = true; + compositor.name = "hyprland"; + configHome = "${cfg.homeDirectory}/.config"; }; + # river-classic = { + # enable = true; + # xwayland.enable = true; + # }; gnupg.agent = { enable = true; enableSSHSupport = true; }; - hyprlock.enable = true; + # hyprlock.enable = true; dconf.enable = true; nix-ld.enable = true; mtr.enable = true; @@ -170,24 +168,25 @@ environment.systemPackages = with pkgs; [ bat - bolt + # bolt discord fd file ghostty + git glib gnome-keyring libdrm libnotify mesa neovim - qmk + # qmk ripgrep spotify unzip - usbutils - uxplay - vial + # usbutils + # uxplay + # vial vim waypipe wget @@ -209,10 +208,10 @@ mime.enable = true; portal = { enable = true; - wlr.enable = true; + # wlr.enable = true; extraPortals = with pkgs;[ xdg-desktop-portal-gtk - xdg-desktop-portal-wlr + # xdg-desktop-portal-wlr ]; config = { common = { diff --git a/hosts/graphical/pkgs.nix b/hosts/graphical/pkgs.nix index 87f5d0a..32125d1 100644 --- a/hosts/graphical/pkgs.nix +++ b/hosts/graphical/pkgs.nix @@ -8,63 +8,63 @@ home.packages = with pkgs; [ arc-icon-theme audacity - android-studio - bat + # android-studio bibata-cursors brave - brightnessctl + # brightnessctl btop - comma + # comma emacs-all-the-icons-fonts + emacs-gtk emacsPackages.pdf-tools exfatprogs fastfetch ffmpeg - filezilla + # filezilla floorp-bin focus fuzzel fzf - genymotion + # genymotion gimp - grim + # grim gtk4 gvfs grimblast - htop + # htop hyprpicker hyprpwcenter imagemagick # hyprsysteminfo - kdePackages.kdenlive - kdePackages.polkit-kde-agent-1 + # kdePackages.kdenlive + # kdePackages.polkit-kde-agent-1 keepassxc - libreoffice + # libreoffice localsend materia-theme mpv mupdf - networkmanagerapplet + # networkmanagerapplet nwg-displays nwg-look openvpn - pamixer - pavucontrol - powertop - prismlauncher - protonvpn-gui - qbittorrent + # pamixer + # pavucontrol + # powertop + # prismlauncher + # protonvpn-gui + # qbittorrent signal-desktop - slurp - teams-for-linux + # slurp + # teams-for-linux texliveFull xfce.thunar xfce.thunar-volman tree - waybar + # waybar wev - wlr-randr - wlsunset + # wlr-randr + # wlsunset zoom-us ]; @@ -105,21 +105,14 @@ newbar = "pkill waybar; waybar &disown"; ping = "ping -c 5"; vi = "\\vim"; + vim = "nvim"; work = "nix develop --impure"; ".." = "cd .."; }; }; - dankMaterialShell = { + dank-material-shell = { enable = true; }; - emacs = { - enable = true; - package = pkgs.emacs-gtk; - extraPackages = epkgs: [ - epkgs.pdf-tools - epkgs.org-pdftools - ]; - }; feh.enable = true; git = { enable = true; @@ -129,12 +122,6 @@ user.name = "Liam Malone"; }; }; - neovim = { - enable = true; - package = pkgs.neovim-unwrapped; - vimAlias = true; - vimdiffAlias = true; - }; obs-studio = { enable = true; };