diff --git a/configs/dms-darp8/settings.json b/configs/dms-darp8/settings.json index 6fa5f0a..235af34 100644 --- a/configs/dms-darp8/settings.json +++ b/configs/dms-darp8/settings.json @@ -10,6 +10,8 @@ "dockTransparency": 1, "widgetBackgroundColor": "sch", "widgetColorMode": "colorful", + "controlCenterTileColorMode": "primary", + "buttonColorMode": "primary", "cornerRadius": 10, "niriLayoutGapsOverride": -1, "niriLayoutRadiusOverride": -1, @@ -20,12 +22,30 @@ "mangoLayoutGapsOverride": -1, "mangoLayoutRadiusOverride": -1, "mangoLayoutBorderSize": -1, + "firstDayOfWeek": -1, "use24HourClock": true, "showSeconds": false, + "padHours12Hour": false, "useFahrenheit": false, + "windSpeedUnit": "kmh", "nightModeEnabled": false, "animationSpeed": 4, "customAnimationDuration": 350, + "syncComponentAnimationSpeeds": true, + "popoutAnimationSpeed": 1, + "popoutCustomAnimationDuration": 150, + "modalAnimationSpeed": 1, + "modalCustomAnimationDuration": 150, + "enableRippleEffects": true, + "m3ElevationEnabled": true, + "m3ElevationIntensity": 12, + "m3ElevationOpacity": 30, + "m3ElevationColorMode": "default", + "m3ElevationLightDirection": "top", + "m3ElevationCustomColor": "#000000", + "modalElevationEnabled": true, + "popoutElevationEnabled": true, + "barElevationEnabled": false, "wallpaperFillMode": "Fill", "blurredWallpaperLayer": false, "blurWallpaperOnOverview": false, @@ -110,7 +130,9 @@ "showWorkspacePadding": false, "workspaceScrolling": false, "showWorkspaceApps": true, + "workspaceDragReorder": true, "maxWorkspaceIcons": 3, + "workspaceAppIconSizeOffset": 0, "groupWorkspaceApps": true, "workspaceFollowFocus": false, "showOccupiedWorkspacesOnly": false, @@ -128,12 +150,23 @@ "scrollTitleEnabled": true, "audioVisualizerEnabled": true, "audioScrollMode": "volume", + "audioWheelScrollAmount": 5, "clockCompactMode": false, "focusedWindowCompactMode": false, "runningAppsCompactMode": true, + "barMaxVisibleApps": 0, + "barMaxVisibleRunningApps": 0, + "barShowOverflowBadge": true, + "appsDockHideIndicators": false, + "appsDockColorizeActive": false, + "appsDockActiveColorMode": "primary", + "appsDockEnlargeOnHover": false, + "appsDockEnlargePercentage": 125, + "appsDockIconSizePercentage": 100, "keyboardLayoutNameCompactMode": true, "runningAppsCurrentWorkspace": true, "runningAppsGroupByApp": false, + "runningAppsCurrentMonitor": false, "appIdSubstitutions": [ { "pattern": "Spotify", @@ -167,14 +200,25 @@ "mediaSize": 1, "appLauncherViewMode": "list", "spotlightModalViewMode": "grid", + "browserPickerViewMode": "grid", + "browserUsageHistory": {}, + "appPickerViewMode": "grid", + "filePickerUsageHistory": {}, "sortAppsAlphabetically": false, "appLauncherGridColumns": 4, "spotlightCloseNiriOverview": true, + "spotlightSectionViewModes": {}, + "appDrawerSectionViewModes": {}, "niriOverviewOverlayEnabled": true, + "dankLauncherV2Size": "compact", + "dankLauncherV2BorderEnabled": false, + "dankLauncherV2BorderThickness": 2, + "dankLauncherV2BorderColor": "primary", + "dankLauncherV2ShowFooter": true, + "dankLauncherV2UnloadOnClose": false, "useAutoLocation": true, "weatherEnabled": true, "networkPreference": "wifi", - "vpnLastConnected": "", "iconTheme": "System Default", "cursorSettings": { "theme": "System Default", @@ -243,9 +287,9 @@ "terminalsAlwaysDark": false, "runDmsMatugenTemplates": true, "matugenTemplateGtk": true, - "matugenTemplateNiri": true, + "matugenTemplateNiri": false, "matugenTemplateHyprland": true, - "matugenTemplateMangowc": true, + "matugenTemplateMangowc": false, "matugenTemplateQt5ct": true, "matugenTemplateQt6ct": true, "matugenTemplateFirefox": true, @@ -262,6 +306,7 @@ "matugenTemplateDgop": true, "matugenTemplateKcolorscheme": true, "matugenTemplateVscode": true, + "matugenTemplateEmacs": true, "showDock": false, "dockAutoHide": false, "dockSmartAutoHide": false, @@ -278,7 +323,19 @@ "dockBorderOpacity": 1, "dockBorderThickness": 1, "dockIsolateDisplays": false, + "dockLauncherEnabled": false, + "dockLauncherLogoMode": "apps", + "dockLauncherLogoCustomPath": "", + "dockLauncherLogoColorOverride": "", + "dockLauncherLogoSizeOffset": 0, + "dockLauncherLogoBrightness": 0.5, + "dockLauncherLogoContrast": 1, + "dockMaxVisibleApps": 0, + "dockMaxVisibleRunningApps": 0, + "dockShowOverflowBadge": true, "notificationOverlayEnabled": false, + "notificationPopupShadowEnabled": true, + "notificationPopupPrivacyMode": false, "modalDarkenBackground": true, "lockScreenShowPowerActions": true, "lockScreenShowSystemIcons": true, @@ -286,28 +343,39 @@ "lockScreenShowDate": true, "lockScreenShowProfileImage": true, "lockScreenShowPasswordField": true, + "lockScreenShowMediaPlayer": true, "lockScreenPowerOffMonitorsOnLock": false, + "lockAtStartup": false, "enableFprint": false, "maxFprintTries": 3, + "enableU2f": false, + "u2fMode": "or", "lockScreenActiveMonitor": "all", "lockScreenInactiveColor": "#000000", "lockScreenNotificationMode": 0, + "lockScreenVideoEnabled": false, + "lockScreenVideoPath": "", + "lockScreenVideoCycling": false, "hideBrightnessSlider": false, "notificationTimeoutLow": 5000, "notificationTimeoutNormal": 5000, "notificationTimeoutCritical": 0, "notificationCompactMode": false, "notificationPopupPosition": 0, + "notificationAnimationSpeed": 1, + "notificationCustomAnimationDuration": 400, "notificationHistoryEnabled": true, "notificationHistoryMaxCount": 50, "notificationHistoryMaxAgeDays": 7, "notificationHistorySaveLow": true, "notificationHistorySaveNormal": true, "notificationHistorySaveCritical": true, + "notificationRules": [], "osdAlwaysShowValue": false, "osdPosition": 5, "osdVolumeEnabled": true, "osdMediaVolumeEnabled": true, + "osdMediaPlaybackEnabled": false, "osdBrightnessEnabled": true, "osdIdleInhibitorEnabled": true, "osdMicMuteEnabled": true, @@ -347,18 +415,23 @@ "hyprlandOutputSettings": { "eDP-1": { "bitdepth": 10, - "colorManagement": "auto" + "colorManagement": "wide" }, "DP-1": { "bitdepth": 10 } }, + "displayProfiles": {}, + "activeDisplayProfile": {}, + "displayProfileAutoSelect": false, + "displayShowDisconnected": false, + "displaySnapToEdge": true, "barConfigs": [ { "id": "default", "name": "Main Bar", "enabled": true, - "position": 0, + "position": 3, "screenPreferences": [ "all" ], @@ -510,5 +583,8 @@ "trigger": "?" } }, - "configVersion": 5 + "clipboardEnterToPaste": false, + "launcherPluginVisibility": {}, + "launcherPluginOrder": [], + "configVersion": 6 } \ No newline at end of file diff --git a/configs/ghostty/config b/configs/ghostty/config index 6758d87..cf9ded5 100644 --- a/configs/ghostty/config +++ b/configs/ghostty/config @@ -37,5 +37,5 @@ cursor-style = block # cursor-color = #ffffff mouse-hide-while-typing = true -config-file = ./config-dankcolors +config-file = ./themes/dankcolors app-notifications = no-clipboard-copy,no-config-reload diff --git a/configs/hypr-darp8/hypr-colors.conf b/configs/hypr-darp8/hypr-colors.conf index 80b9aa1..e9616bd 100644 --- a/configs/hypr-darp8/hypr-colors.conf +++ b/configs/hypr-darp8/hypr-colors.conf @@ -1,151 +1,151 @@ -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$background = rgba(151217ff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$background = rgba(101419ff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg $error = rgba(ffb4abff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg $error_container = rgba(93000aff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$inverse_on_surface = rgba(322f34ff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$inverse_on_surface = rgba(2e3036ff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$inverse_primary = rgba(6f5191ff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$inverse_primary = rgba(005fadff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$inverse_surface = rgba(e7e0e7ff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$inverse_surface = rgba(e1e2eaff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$on_background = rgba(e7e0e7ff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$on_background = rgba(e1e2eaff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg $on_error = rgba(690005ff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg $on_error_container = rgba(ffdad6ff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$on_primary = rgba(3f2160ff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$on_primary = rgba(00315dff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$on_primary_container = rgba(fbf0ffff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$on_primary_container = rgba(000000ff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$on_primary_fixed = rgba(290849ff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$on_primary_fixed = rgba(001c39ff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$on_primary_fixed_variant = rgba(563978ff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$on_primary_fixed_variant = rgba(004784ff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$on_secondary = rgba(372b44ff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$on_secondary = rgba(19314fff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$on_secondary_container = rgba(ecd9faff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$on_secondary_container = rgba(d6e5ffff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$on_secondary_fixed = rgba(22162eff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$on_secondary_fixed = rgba(001c39ff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$on_secondary_fixed_variant = rgba(4e415cff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$on_secondary_fixed_variant = rgba(314867ff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$on_surface = rgba(e7e0e7ff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$on_surface = rgba(e1e2eaff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$on_surface_variant = rgba(cdc3d0ff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$on_surface_variant = rgba(c1c7d3ff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$on_tertiary = rgba(343200ff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$on_tertiary = rgba(4b2800ff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$on_tertiary_container = rgba(232200ff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$on_tertiary_container = rgba(000000ff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$on_tertiary_fixed = rgba(1e1c00ff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$on_tertiary_fixed = rgba(2d1600ff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$on_tertiary_fixed_variant = rgba(4b4900ff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$on_tertiary_fixed_variant = rgba(6a3b00ff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$outline = rgba(968e9aff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$outline = rgba(8b919dff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$outline_variant = rgba(4a454fff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$outline_variant = rgba(414751ff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$primary = rgba(dbb8ffff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$primary = rgba(a4c9ffff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$primary_container = rgba(624484ff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$primary_container = rgba(4d93e7ff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$primary_fixed = rgba(efdbffff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$primary_fixed = rgba(d4e3ffff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$primary_fixed_dim = rgba(dbb8ffff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$primary_fixed_dim = rgba(a4c9ffff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg $scrim = rgba(000000ff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$secondary = rgba(d1c0e0ff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$secondary = rgba(b1c8eeff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$secondary_container = rgba(4e415cff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$secondary_container = rgba(334a6aff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$secondary_fixed = rgba(eedcfdff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$secondary_fixed = rgba(d4e3ffff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$secondary_fixed_dim = rgba(d1c0e0ff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$secondary_fixed_dim = rgba(b1c8eeff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg $shadow = rgba(000000ff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$source_color = rgba(624484ff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$source_color = rgba(3680d3ff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$surface = rgba(151217ff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$surface = rgba(101419ff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$surface_bright = rgba(3b383dff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$surface_bright = rgba(36393fff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$surface_container = rgba(211f23ff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$surface_container = rgba(1d2025ff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$surface_container_high = rgba(2c292eff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$surface_container_high = rgba(272a30ff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$surface_container_highest = rgba(373438ff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$surface_container_highest = rgba(32353bff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$surface_container_low = rgba(1d1b1fff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$surface_container_low = rgba(191c21ff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$surface_container_lowest = rgba(100d12ff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$surface_container_lowest = rgba(0b0e13ff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$surface_dim = rgba(151217ff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$surface_dim = rgba(101419ff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$surface_tint = rgba(dbb8ffff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$surface_tint = rgba(a4c9ffff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$surface_variant = rgba(4a454fff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$surface_variant = rgba(414751ff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$tertiary = rgba(cfcb6fff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$tertiary = rgba(ffb873ff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$tertiary_container = rgba(b3af57ff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$tertiary_container = rgba(d07d1bff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$tertiary_fixed = rgba(ebe688ff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$tertiary_fixed = rgba(ffdcbfff) -$image = /home/liamm/pictures/wallpapers/frieren-fern.png -$tertiary_fixed_dim = rgba(cfca6fff) +$image = /home/liamm/Pictures/Wallpapers/frieren-flower-crown.jpeg +$tertiary_fixed_dim = rgba(ffb873ff) diff --git a/configs/hypr/hyprland.conf b/configs/hypr/hyprland.conf index df3d43d..8aea429 100644 --- a/configs/hypr/hyprland.conf +++ b/configs/hypr/hyprland.conf @@ -129,13 +129,13 @@ quirks { } plugin { - hyprexpo { - columns = 3 - gap_size = 5 - bg_col = $background - workspace_method = center current - gesture_distance = 300 - } + # hyprexpo { + # columns = 3 + # gap_size = 5 + # bg_col = $background + # workspace_method = center current + # gesture_distance = 300 + # } } # Window Rules @@ -257,7 +257,7 @@ $mainCtrlShift = $mainCtrl SHIFT bind = $mainShift, N, exec, dms ipc call night toggle bind = $mainCtrl, B, exec, dms ipc call bar toggle - bind = $mainMod, G, hyprexpo:expo, toggle + # bind = $mainMod, G, hyprexpo:expo, toggle bind = $mainShift, P, pseudo, bind = $mainMod, C, killactive, bind = $altMod, F4, killactive, diff --git a/flake.lock b/flake.lock index b15aa2a..7482dc6 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ "quickshell": "quickshell" }, "locked": { - "lastModified": 1772344471, - "narHash": "sha256-z1vcFNo8frLoLzfVntNCRlvHmRgn/OZ53t+IA7JkuKs=", + "lastModified": 1773060802, + "narHash": "sha256-NH3aKI1AmJsfsL3AZLZFkJccd1cZ/eOp6weB3/ViMfg=", "owner": "AvengeMedia", "repo": "DankMaterialShell", - "rev": "f0fcc77bdbd54693cba354faa951d9ff6cd878ec", + "rev": "86f9cf43765784f2478e6ee3aa36b0dc7af9c1b7", "type": "github" }, "original": { @@ -94,7 +94,7 @@ }, "locked": { "lastModified": 1772373854, - "narHash": "sha256-4VumE5iTZ6Lsx4r+vNXHJwnbdBDQOMy07ZHsLnS9SoA=", + "narHash": "sha256-SC7GkiWtYBxDzlHFsQErmSsk5SGWCLNyDTcCnbUpjzU=", "path": "/home/liamm/nix-pkgs/fred", "type": "path" }, @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1772330611, - "narHash": "sha256-UZjPc/d5XRxvjDbk4veAO4XFdvx6BUum2l40V688Xq8=", + "lastModified": 1772985285, + "narHash": "sha256-wEEmvfqJcl9J0wyMgMrj1TixOgInBW/6tLPhWGoZE3s=", "owner": "nix-community", "repo": "home-manager", - "rev": "58fd7ff0eec2cda43e705c4c0585729ec471d400", + "rev": "5be5d8245cbc7bc0c09fbb5f38f23f223c543f85", "type": "github" }, "original": { @@ -222,11 +222,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1772360122, - "narHash": "sha256-IwfjSqC5XSgijGoopQCP34yq9+YEyfUU5J861JsGFgE=", + "lastModified": 1773082851, + "narHash": "sha256-xeeeJ1gt4SoskgHW67PVX5p7cDlZFSyX5n4eUSPjxT8=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "f41e3c220366c4432cbef04c7d7a3f28a5d702b4", + "rev": "e32eeb1d454b029a24ca71f410896bf52839085d", "type": "github" }, "original": { @@ -383,11 +383,11 @@ ] }, "locked": { - "lastModified": 1758927902, - "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=", + "lastModified": 1772459629, + "narHash": "sha256-/iwvNUYShmmnwmz/czEUh6+0eF5vCMv0xtDW0STPIuM=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da", + "rev": "7615ee388de18239a4ab1400946f3d0e498a8186", "type": "github" }, "original": { @@ -418,11 +418,11 @@ ] }, "locked": { - "lastModified": 1771026035, - "narHash": "sha256-JR23Fff3Pj0wKDD8eDlaBGvt/cfNQ2bvq4a0RZMP2sk=", + "lastModified": 1772475266, + "narHash": "sha256-VAVogGwodlxKT99r2O77BzcM1prJU8/krweRW9Kes2o=", "owner": "hyprwm", "repo": "hyprpwcenter", - "rev": "c296d652590b19c920571790fb285949b1ff197f", + "rev": "987eed29636a4533bcd10fab8eae230bcc68a000", "type": "github" }, "original": { @@ -509,11 +509,11 @@ ] }, "locked": { - "lastModified": 1770316569, - "narHash": "sha256-+d7rTPCLXQB437N3gnK3Z311KpYhZWMMGCQxJNLg8Ao=", + "lastModified": 1772462885, + "narHash": "sha256-5pHXrQK9zasMnIo6yME6EOXmWGFMSnCITcfKshhKJ9I=", "owner": "hyprwm", "repo": "hyprtoolkit", - "rev": "37d92178cb385756c1e135ae6ffd23b158c54f8c", + "rev": "9af245a69fa6b286b88ddfc340afd288e00a6998", "type": "github" }, "original": { @@ -586,11 +586,11 @@ ] }, "locked": { - "lastModified": 1755184602, - "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=", + "lastModified": 1772459835, + "narHash": "sha256-978jRz/y/9TKmZb/qD4lEYHCQGHpEXGqy+8X2lFZsak=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d", + "rev": "0a692d4a645165eebd65f109146b8861e3a925e7", "type": "github" }, "original": { @@ -630,11 +630,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1770197578, - "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", + "lastModified": 1772433332, + "narHash": "sha256-izhTDFKsg6KeVBxJS9EblGeQ8y+O8eCa6RcW874vxEc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", + "rev": "cf59864ef8aa2e178cccedbe2c178185b0365705", "type": "github" }, "original": { @@ -646,11 +646,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1772198003, - "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=", + "lastModified": 1772963539, + "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61", + "rev": "9dcb002ca1690658be4a04645215baea8b95f31d", "type": "github" }, "original": { diff --git a/hosts/darp8/configuration.nix b/hosts/darp8/configuration.nix index 03de0ee..0fe8697 100644 --- a/hosts/darp8/configuration.nix +++ b/hosts/darp8/configuration.nix @@ -23,22 +23,8 @@ }; system76.enableAll = true; }; - - swapDevices = [ { - device = "/var/swapfile"; - size = 24 * 1024; - } ]; - boot = { - resumeDevice = "/dev/disk/by-uuid/c7704142-d0b9-4a85-af1c-ce776b895c0f"; - kernelParams = [ - "resume_offset=13629440" - "mem_sleep_default=s2idle" - ]; kernelPackages = pkgs.linuxPackages_latest; - initrd.postMountCommands = lib.mkAfter '' - swapon /mnt-root/var/swapfile - ''; }; services = { @@ -64,10 +50,10 @@ }; }; - sleep.extraConfig = '' - HibernateDelaySec=15m - SuspendState=mem - ''; + sleep.settings.Sleep = { + HibernateDelaySec="15m"; + SuspendState="mem"; + }; }; home-manager = { @@ -78,7 +64,7 @@ }; backupFileExtension = ".bak"; }; - + # This option defines the first version of NixOS you have installed on this particular machine # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration, # and migrated your data accordingly. diff --git a/hosts/darp8/hardware-configuration.nix b/hosts/darp8/hardware-configuration.nix index 87bd349..1c76255 100644 --- a/hosts/darp8/hardware-configuration.nix +++ b/hosts/darp8/hardware-configuration.nix @@ -14,31 +14,20 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/c7704142-d0b9-4a85-af1c-ce776b895c0f"; - fsType = "ext4"; - }; - - fileSystems."/home" = - { device = "/dev/disk/by-uuid/bf7180c8-72f0-483a-8306-821276eda3e5"; + { device = "/dev/disk/by-uuid/95c6d153-b238-430d-9755-58a38f6f7409"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/E27A-231B"; + { device = "/dev/disk/by-uuid/3161-399E"; fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; }; - swapDevices = [ ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp46s0.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true; + swapDevices = + [ { device = "/dev/disk/by-uuid/a3a8cbf0-066f-46f6-a5cd-e427428617e2"; } + ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; } diff --git a/hosts/darp8/pkgs.nix b/hosts/darp8/pkgs.nix index 265a3a5..25d6bb0 100644 --- a/hosts/darp8/pkgs.nix +++ b/hosts/darp8/pkgs.nix @@ -13,7 +13,6 @@ android-studio genymotion praat - prismlauncher mcpelauncher-ui-qt ]; diff --git a/hosts/desktop/pkgs.nix b/hosts/desktop/pkgs.nix index 617dd7c..ee6f5df 100644 --- a/hosts/desktop/pkgs.nix +++ b/hosts/desktop/pkgs.nix @@ -10,21 +10,14 @@ # BEGIN PER-HOST PACKAGES home.packages = with pkgs; [ - adw-gtk3 android-studio genymotion fred hexchat krita - kdePackages.qt6ct - libsForQt5.qt5ct paper-icon-theme - # papirus-icon-theme shotcut - tela-icon-theme - tela-circle-icon-theme nvtopPackages.nvidia - prismlauncher ]; # BEGIN PER-HOST PROGRAMS diff --git a/hosts/graphical/configuration.nix b/hosts/graphical/configuration.nix index 844bf81..18df912 100644 --- a/hosts/graphical/configuration.nix +++ b/hosts/graphical/configuration.nix @@ -90,12 +90,12 @@ noto-fonts-cjk-sans noto-fonts-cjk-serif noto-fonts-color-emoji - liberation_ttf - fira-code-symbols + # liberation_ttf + # fira-code-symbols mplus-outline-fonts.githubRelease - dina-font - nerd-fonts.fira-code - nerd-fonts.droid-sans-mono + # dina-font + # nerd-fonts.fira-code + # nerd-fonts.droid-sans-mono ]; fontconfig = { @@ -160,7 +160,14 @@ # hyprlock.enable = true; dconf.enable = true; - nix-ld.enable = true; + nix-ld = { + enable = true; + libraries = with pkgs; [ + fontconfig + libxkbcommon + vulkan-loader + ]; + }; mtr.enable = true; }; diff --git a/hosts/graphical/pkgs.nix b/hosts/graphical/pkgs.nix index e593e04..0d2e687 100644 --- a/hosts/graphical/pkgs.nix +++ b/hosts/graphical/pkgs.nix @@ -6,65 +6,49 @@ { # BEGIN PACKAGES home.packages = with pkgs; [ + adw-gtk3 arc-icon-theme audacity - # android-studio bibata-cursors brave - # brightnessctl btop - # comma emacs-all-the-icons-fonts emacs-gtk emacsPackages.pdf-tools exfatprogs fastfetch ffmpeg - # filezilla floorp-bin focus fuzzel fzf - # genymotion gimp - # grim gtk4 gvfs grimblast - # htop hyprpicker hyprpwcenter imagemagick - # hyprsysteminfo - # kdePackages.kdenlive - # kdePackages.polkit-kde-agent-1 + kdePackages.kdenlive + kdePackages.qt6ct keepassxc - # libreoffice + libsForQt5.qt5ct localsend materia-theme mpv mupdf - # networkmanagerapplet nwg-displays nwg-look openvpn - # pamixer - # pavucontrol - # powertop - # prismlauncher - # protonvpn-gui - # qbittorrent + prismlauncher signal-desktop - # slurp - # teams-for-linux + tela-icon-theme + tela-circle-icon-theme texliveFull thunar thunar-volman tree - # waybar wev - # wlr-randr - # wlsunset zoom-us ];