From 8a1e40c3d04035f35266867d1c989f49f01b5c0d Mon Sep 17 00:00:00 2001 From: Liam Malone Date: Fri, 3 Oct 2025 13:57:32 +0100 Subject: [PATCH] dms shell --- configs/DankMaterialShell/settings.json | 161 +++++++++++++++++++ configs/emacs/eshell/history | 2 + configs/ghostty/config | 6 +- configs/hypr-desktop/hyprland.conf | 13 +- configs/hypr/hyprland.conf | 135 ++++++++-------- configs/nvim/lua/liamm/core/init.lua | 7 + configs/nvim/lua/liamm/core/options.lua | 1 + configs/nvim/lua/liamm/plugins/base.lua | 10 +- configs/nvim/lua/liamm/plugins/harpoon.lua | 21 --- configs/river/init | 3 +- configs/swaync/style.css | 6 +- configs/waybar/config.jsonc | 3 +- configs/waybar/modules.jsonc | 12 ++ flake.lock | 173 ++++++++++++++++----- flake.nix | 4 + hosts/darp8/configuration.nix | 10 +- hosts/darp8/file.nix | 5 + hosts/darp8/home.nix | 3 +- hosts/darp8/pkgs.nix | 9 +- 19 files changed, 428 insertions(+), 156 deletions(-) create mode 100644 configs/DankMaterialShell/settings.json diff --git a/configs/DankMaterialShell/settings.json b/configs/DankMaterialShell/settings.json new file mode 100644 index 0000000..559d2a4 --- /dev/null +++ b/configs/DankMaterialShell/settings.json @@ -0,0 +1,161 @@ +{ + "currentThemeName": "dynamic", + "customThemeFile": "", + "matugenScheme": "scheme-fidelity", + "dankBarTransparency": 0, + "dankBarWidgetTransparency": 1, + "popupTransparency": 1, + "dockTransparency": 1, + "use24HourClock": true, + "useFahrenheit": false, + "nightModeEnabled": false, + "weatherLocation": "Dublin, Leinster", + "weatherCoordinates": "53.3493795,-6.2605593", + "useAutoLocation": false, + "weatherEnabled": true, + "showLauncherButton": true, + "showWorkspaceSwitcher": true, + "showFocusedWindow": true, + "showWeather": true, + "showMusic": true, + "showClipboard": true, + "showCpuUsage": true, + "showMemUsage": true, + "showCpuTemp": true, + "showGpuTemp": true, + "selectedGpuIndex": 0, + "enabledGpuPciIds": [], + "showSystemTray": true, + "showClock": true, + "showNotificationButton": true, + "showBattery": true, + "showControlCenterButton": true, + "controlCenterShowNetworkIcon": true, + "controlCenterShowBluetoothIcon": true, + "controlCenterShowAudioIcon": true, + "controlCenterWidgets": [ + { + "id": "volumeSlider", + "enabled": true, + "width": 50 + }, + { + "id": "brightnessSlider", + "enabled": true, + "width": 50 + }, + { + "id": "wifi", + "enabled": true, + "width": 50 + }, + { + "id": "bluetooth", + "enabled": true, + "width": 50 + }, + { + "id": "audioOutput", + "enabled": true, + "width": 50 + }, + { + "id": "audioInput", + "enabled": true, + "width": 50 + }, + { + "id": "nightMode", + "enabled": true, + "width": 50 + }, + { + "id": "darkMode", + "enabled": true, + "width": 50 + } + ], + "showWorkspaceIndex": true, + "showWorkspacePadding": false, + "showWorkspaceApps": true, + "maxWorkspaceIcons": 3, + "workspacesPerMonitor": true, + "workspaceNameIcons": {}, + "waveProgressEnabled": true, + "clockCompactMode": false, + "focusedWindowCompactMode": false, + "runningAppsCompactMode": true, + "runningAppsCurrentWorkspace": true, + "clockDateFormat": "", + "lockDateFormat": "", + "mediaSize": 1, + "dankBarLeftWidgets": [ + "launcherButton", + "workspaceSwitcher", + "focusedWindow" + ], + "dankBarCenterWidgets": [ + "music", + "clock", + "weather" + ], + "dankBarRightWidgets": [ + "systemTray", + "clipboard", + "cpuUsage", + "memUsage", + "notificationButton", + "battery", + "controlCenterButton" + ], + "appLauncherViewMode": "list", + "spotlightModalViewMode": "grid", + "networkPreference": "auto", + "iconTheme": "System Default", + "useOSLogo": false, + "osLogoColorOverride": "", + "osLogoBrightness": 0.5, + "osLogoContrast": 1, + "fontFamily": "FiraCode Nerd Font Med", + "monoFontFamily": "Fira Code", + "fontWeight": 400, + "fontScale": 1, + "notepadUseMonospace": true, + "notepadFontFamily": "", + "notepadFontSize": 14, + "notepadShowLineNumbers": true, + "notepadTransparencyOverride": -1, + "notepadLastCustomTransparency": 0.7, + "gtkThemingEnabled": false, + "qtThemingEnabled": false, + "showDock": false, + "dockAutoHide": false, + "dockGroupByApp": false, + "dockOpenOnOverview": false, + "dockPosition": 1, + "dockSpacing": 4, + "dockBottomGap": 0, + "cornerRadius": 10, + "notificationOverlayEnabled": false, + "dankBarAutoHide": false, + "dankBarOpenOnOverview": false, + "dankBarVisible": true, + "dankBarSpacing": 3, + "dankBarBottomGap": 0, + "dankBarInnerPadding": 4, + "dankBarSquareCorners": false, + "dankBarNoBackground": false, + "dankBarGothCornersEnabled": false, + "dankBarPosition": 0, + "lockScreenShowPowerActions": true, + "hideBrightnessSlider": false, + "widgetBackgroundColor": "sch", + "surfaceBase": "s", + "notificationTimeoutLow": 5000, + "notificationTimeoutNormal": 5000, + "notificationTimeoutCritical": 0, + "notificationPopupPosition": 0, + "screenPreferences": {}, + "pluginSettings": {}, + "animationSpeed": 2 +} \ No newline at end of file diff --git a/configs/emacs/eshell/history b/configs/emacs/eshell/history index 9e2740c..bcaa91f 100644 --- a/configs/emacs/eshell/history +++ b/configs/emacs/eshell/history @@ -1 +1,3 @@ ls +clear +bash diff --git a/configs/ghostty/config b/configs/ghostty/config index 1de48e5..0797f50 100644 --- a/configs/ghostty/config +++ b/configs/ghostty/config @@ -10,8 +10,8 @@ keybind = ctrl+shift+o=ignore # Window Stuff background-opacity=0.9 confirm-close-surface = false -window-theme = dark -window-decoration = false +window-theme = system +window-decoration = true # Linux Specific gtk-wide-tabs = true @@ -33,3 +33,5 @@ cursor-style = block cursor-color = #ffffff mouse-hide-while-typing = true +config-file = ./config-dankcolors +app-notifications = no-clipboard-copy,no-config-reload diff --git a/configs/hypr-desktop/hyprland.conf b/configs/hypr-desktop/hyprland.conf index ddc34dd..604e0b6 100644 --- a/configs/hypr-desktop/hyprland.conf +++ b/configs/hypr-desktop/hyprland.conf @@ -1,12 +1,8 @@ # Startup -exec-once = dbus-update-activation-environment --systemd --all && systemctl --user stop hyprland-session.target && systemctl --user start hyprland-session.target -exec-once = wl-clipboard-history -t -exec-once = wl-paste -p --watch wl-copy -p '' -exec-once = hypridle -exec-once = QT_QPA_PLATFORM=wayland quickshell -exec-once = fcitx5 -d -exec-once = swww-daemon -exec-once = swaync +exec-once= bash -c "wl-paste --watch cliphist store &" +exec-once= fcitx5 -d +exec-once= wl-paste -p --watch wl-copy -p '' +exec-once= dms run # DankShell # Monitors @@ -20,7 +16,6 @@ env=HYPRCURSOR_SIZE,24 env=XDG_CURRENT_DESKTOP,Hyprland env=XDG_SESSION_TYPE,wayland env=XDG_SESSION_DESKTOP,Hyprland -env=GTK_THEME,Materia-dark env=QT_QPA_PLATFORM,Hyprland env=XCURSOR_THEME,Bibata-Modern-Ice env=XCURSOR_SIZE,24 diff --git a/configs/hypr/hyprland.conf b/configs/hypr/hyprland.conf index 6bf604e..719cf60 100644 --- a/configs/hypr/hyprland.conf +++ b/configs/hypr/hyprland.conf @@ -1,12 +1,8 @@ # Startup -exec-once=dbus-update-activation-environment --systemd --all && systemctl --user stop hyprland-session.target && systemctl --user start hyprland-session.target -exec-once=wl-clipboard-history -t -exec-once=wl-paste -p --watch wl-copy -p '' -exec-once=hypridle -exec-once=waybar -exec-once=fcitx5 -d -exec-once=swww-daemon -exec-once=swaync +exec-once= bash -c "wl-paste --watch cliphist store &" +exec-once= fcitx5 -d +exec-once= wl-paste -p --watch wl-copy -p '' +exec-once= dms run # DankShell # Monitors @@ -16,13 +12,11 @@ monitor=,preferred,auto,1,mirror,eDP-1 # Environment -env=WLR_NO_HARDWARE_CURSORS,1 env=HYPRCURSOR_THEME,Bibata-Modern-Ice env=HYPRCURSOR_SIZE,24 env=XDG_CURRENT_DESKTOP,Hyprland env=XDG_SESSION_TYPE,wayland env=XDG_SESSION_DESKTOP,Hyprland -env=GTK_THEME,Materia-dark env=QT_QPA_PLATFORM,wayland env=XCURSOR_THEME,Bibata-Modern-Ice env=XCURSOR_SIZE,24 @@ -49,12 +43,12 @@ $inactive_border=$gray animations { bezier=myBezier, 0.05, 0.9, 0.1, 1.05 - animation=windows, 1, 7, myBezier - animation=windowsOut, 1, 7, default, popin 80% - animation=border, 1, 10, default - animation=borderangle, 1, 8, default - animation=fade, 1, 7, default - animation=workspaces, 1, 6, default + animation=windows, 1, 6, myBezier + animation=windowsOut, 1, 6, default, popin 80% + animation=border, 1, 8, default + animation=borderangle, 1, 6, default + animation=fade, 1, 6, default + animation=workspaces, 1, 3, default enabled=true } @@ -103,11 +97,6 @@ general { layout=dwindle } -gestures { - workspace_swipe=true - workspace_swipe_forever=true -} - input { touchpad { disable_while_typing=true @@ -130,7 +119,7 @@ input { misc { disable_hyprland_logo=false - disable_splash_rendering=false + disable_splash_rendering=true key_press_enables_dpms=true mouse_move_enables_dpms=true } @@ -153,65 +142,76 @@ misc { # Window Rules -windowrule=idleinhibit fullscreen, class:firefox -windowrule=idleinhibit fullscreen, class:floorp -windowrule=idleinhibit fullscreen, class:ghostty -windowrule=idleinhibit focus, class:firefox -windowrule=idleinhibit focus, class:floorp -windowrule=idleinhibit focus, class:mpv -windowrule=idleinhibit focus, class:^(emacs)$ -windowrule=idleinhibit focus, class:^(Emacs)$ -windowrule=idleinhibit focus, class:^(discord)$ -windowrule=idleinhibit focus, class:^(spotify)$ -windowrule=idleinhibit focus, class:^(Discord|discord)$ -windowrule=opacity 0.98 0.9, class:^(Discord|discord)$ -windowrule=float, class:polkit-kde-authentication-agent-1 -windowrule=float, class:^(praat)$ -windowrule=float, class:^(network)$ -windowrule=float, class:^(nm-)$ -windowrule=float, class:^(Network)$ -windowrule=float, class:Rofi -windowrule=float, class:Gimp -windowrule=float, class:Nautilus -windowrule=float, class:notification -windowrule=float, class:^(launcher)$ -windowrule=tile, class:Spotify -windowrule=tile, title:Minecraft -windowrule=workspace 2, class:KeePassXC -windowrule=workspace 3, class:firefox -windowrule=workspace 3, class:floorp -windowrule=workspace 4, class:Spotify -windowrule=workspace 6, class:discord -windowrule=workspace 6, class:Signal -windowrule=workspace 10, title:Minecraft +windowrule = idleinhibit fullscreen, class:firefox +windowrule = idleinhibit fullscreen, class:floorp +windowrule = idleinhibit fullscreen, class:ghostty +windowrule = idleinhibit focus, class:firefox +windowrule = idleinhibit focus, class:floorp +windowrule = idleinhibit focus, class:mpv +windowrule = idleinhibit focus, class:^(emacs)$ +windowrule = idleinhibit focus, class:^(Emacs)$ +windowrule = idleinhibit focus, class:^(discord)$ +windowrule = idleinhibit focus, class:^(spotify)$ +windowrule = idleinhibit focus, class:^(Discord|discord)$ +windowrule = opacity 0.98 0.9, class:^(Discord|discord)$ +windowrule = float, class:polkit-kde-authentication-agent-1 +windowrule = float, class:^(praat)$ +windowrule = float, class:^(network)$ +windowrule = float, class:^(nm-)$ +windowrule = float, class:^(Network)$ +windowrule = float, class:Rofi +windowrule = float, class:Gimp +windowrule = float, class:Nautilus +windowrule = float, class:notification +windowrule = float, class:^(launcher)$ +windowrule = tile, class:Spotify +windowrule = tile, title:Minecraft +windowrule = workspace 2, class:KeePassXC +windowrule = workspace 3, class:firefox +windowrule = workspace 3, class:floorp +windowrule = workspace 4, class:Spotify +windowrule = workspace 6, class:discord +windowrule = workspace 6, class:Signal +windowrule = workspace 10, title:Minecraft + # Binds $altMod=ALT $ctrlMod=CTRL -$lock=hyprlock +# $lock=hyprlock +$lock=dms ipc call lock lock $mainMod=SUPER $screenshotarea=hyprctl keyword animation 'fadeOut,0,0,default'; grimblast copy area; hyprctl keyword animation 'fadeOut,1,4,default' # Binds :: Programs bind=$altMod, Return, exec, ghostty -bind=$altMod SHIFT, Return, exec, alacritty +bind=$altMod SHIFT, Return, exec, foot bind=$mainMod SHIFT, D, exec, discord --enable-blink-features=MiddleClickAutoscroll bind=$mainMod SHIFT, E, exec, emacsclient -c -a 'emacs' bind=$mainMode SHIFT, F, exec, focus-linux -bind=$mainMod, SPACE, exec, pkill fuzzel || fuzzel -bind=$mainMod, E, exec, nautilus +bind=$mainMod, Space, exec, dms ipc call spotlight toggle +bind=$mainMod, E, exec, thunar bind=$mainMod, S, exec, spotify bind=$mainMod, P, exec, hyprpicker -a -f hex bind=, Print, exec, $screenshotarea bind=SHIFT, Print, exec, grimblast --cursor copy output +bind=$mainMod, X, exec, dms ipc call powermenu toggle bind=$mainMod SHIFT, P, pseudo, bind=$mainMod, C, killactive, -bind=$mainMod, V, togglefloating, +bind=$mainMod SHIFT, F, togglefloating, bind=$mainMod SHIFT, S, togglesplit, -bind=$mainMod control, Q, exec, $lock +bind=$mainMod CTRL, Q, exec, $lock bind=$mainMod, F4, exit, +bind = SUPER, M, exec, dms ipc call processlist toggle +bind = $mainMod, I, exec, dms ipc call settings toggle +bind = $mainMod CTRL, P, exec, dms ipc call notepad toggle +bind = $mainMod CTRL, C, exec, dms ipc call control-center toggle + +# Night mode toggle +bind=$mainMod, N, exec, dms ipc call notifications toggle +bind=$mainMod SHIFT, N, exec, dms ipc call night toggle # bind = SUPER, grave, hyprexpo:expo, toggle # Commented out cos "version mismatch (bs)" @@ -268,15 +268,18 @@ bindm=$mainMod, mouse:273, resizewindow # Binds :: MultiMedia -binde=, XF86MonBrightnessDown, exec, brightnessctl set 10%- && $NIX_CONFIG_DIR/scripts/progress-notify.sh brightness -binde=, XF86MonBrightnessUp, exec, brightnessctl set 10%+ && $NIX_CONFIG_DIR/scripts/progress-notify.sh brightness -bindel=, XF86AudioRaiseVolume, exec, pamixer -i 5 && $NIX_CONFIG_DIR/scripts/progress-notify.sh audio -bindel=, XF86AudioLowerVolume, exec, pamixer -d 5 && $NIX_CONFIG_DIR/scripts/progress-notify.sh audio -bindel=, XF86AudioMute, exec, pamixer -t && $NIX_CONFIG_DIR/scripts/progress-notify.sh mute bindl=, XF86AudioPlay, exec, playerctl play-pause bindl=, XF86AudioNext, exec, playerctl next bindl=, XF86AudioPrev, exec, playerctl previous +bindl=, XF86AudioMute, exec, dms ipc call audio mute +bindl=, XF86AudioMicMute, exec, dms ipc call audio micmute +bindle=, XF86AudioRaiseVolume, exec, dms ipc call audio increment 3 +bindle=, XF86AudioLowerVolume, exec, dms ipc call audio decrement 3 + +bindle=, XF86MonBrightnessUp, exec, dms ipc call brightness increment 5 "" +bindle=, XF86MonBrightnessDown, exec, dms ipc call brightness decrement 5 "" + # Binds :: Submaps bind = $mainMod, R, submap, resize @@ -330,3 +333,7 @@ bind = , V, submap, reset bind=, escape,submap,reset submap = reset + +# Gestures + +gesture = 3, horizontal, workspace diff --git a/configs/nvim/lua/liamm/core/init.lua b/configs/nvim/lua/liamm/core/init.lua index de04ba5..3cd15b5 100644 --- a/configs/nvim/lua/liamm/core/init.lua +++ b/configs/nvim/lua/liamm/core/init.lua @@ -1,3 +1,10 @@ require("liamm.core.binds") require("liamm.core.keymap") require("liamm.core.options") + +vim.api.nvim_create_autocmd({"BufRead", "BufNewFile"}, { + pattern = "*.h", + callback = function() + vim.bo.filetype = "c" + end, +}) diff --git a/configs/nvim/lua/liamm/core/options.lua b/configs/nvim/lua/liamm/core/options.lua index 1fae0c1..f334c2f 100644 --- a/configs/nvim/lua/liamm/core/options.lua +++ b/configs/nvim/lua/liamm/core/options.lua @@ -67,3 +67,4 @@ end -- Fix markdown indentation settings vim.g.markdown_recommended_style = 0 + diff --git a/configs/nvim/lua/liamm/plugins/base.lua b/configs/nvim/lua/liamm/plugins/base.lua index 6c065b1..9dbe9bf 100644 --- a/configs/nvim/lua/liamm/plugins/base.lua +++ b/configs/nvim/lua/liamm/plugins/base.lua @@ -84,5 +84,13 @@ return { automatic_enable = false, }) end, - } + }, + + -- cats + -- { + -- "Panda-d3v/cute-cat.nvim", + -- opts = { + -- status = false, + -- }, + -- } } diff --git a/configs/nvim/lua/liamm/plugins/harpoon.lua b/configs/nvim/lua/liamm/plugins/harpoon.lua index d99d8ce..881dab3 100644 --- a/configs/nvim/lua/liamm/plugins/harpoon.lua +++ b/configs/nvim/lua/liamm/plugins/harpoon.lua @@ -1,25 +1,4 @@ local map = require("liamm.core.keymap").nnoremap --- return { --- "theprimeagen/harpoon", --- branch = "harpoon2", --- dependencies = { --- "nvim-lua/plenary.nvim", --- }, --- lazy = false, --- config = function() --- local harpoon = require("harpoon") --- --- ---@diagnostic disable-next-line: missing-parameter --- harpoon:setup() --- map("a", function() harpoon:list():append() end) --- map("h", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end) --- map("", function() harpoon:list():select(1) end) --- map("", function() harpoon:list():select(2) end) --- map("", function() harpoon:list():select(3) end) --- map("", function() harpoon:list():select(4) end) --- end, --- } - return { "ThePrimeagen/harpoon", branch = "harpoon2", diff --git a/configs/river/init b/configs/river/init index 285bcab..ef3f10f 100755 --- a/configs/river/init +++ b/configs/river/init @@ -18,6 +18,7 @@ function execs() { wlsunset -l "$longitude" -L "$latitude" & swww-daemon & hyprlock & + fcitx5 -d & } # Monitors @@ -93,7 +94,7 @@ function binds() { riverctl map normal Alt Return spawn ghostty riverctl map normal $mod+Shift D spawn "$discord" riverctl map normal $mod+Shift E spawn "$emacs" - riverctl map normal $mod Space spawn fuzzel + riverctl map normal $mod Space spawn wofi riverctl map normal $mod P spawn "$hyprpicker" riverctl map normal None Print spawn "$screenshotarea" riverctl map normal Shift Print spawn "$screenshot" diff --git a/configs/swaync/style.css b/configs/swaync/style.css index 9ee1df0..689365c 100644 --- a/configs/swaync/style.css +++ b/configs/swaync/style.css @@ -10,9 +10,9 @@ @define-color noti-close-bg alpha(darker(@background), 0.3); @define-color noti-close-bg-hover alpha(darker(@background), 0.5); -@define-color noti-bg-opaque rgb(48, 48, 48); -@define-color noti-bg-darker rgb(38, 38, 38); -@define-color noti-bg-focus rgba(68, 68, 68, 0.6); +@define-color noti-bg-opaque rgb(48, 48, 48, 0.5); +@define-color noti-bg-darker rgb(38, 38, 38, 0.5); +@define-color noti-bg-focus rgba(68, 68, 68, 0.2); .notification-row { outline: none; diff --git a/configs/waybar/config.jsonc b/configs/waybar/config.jsonc index a11e67c..77132b3 100644 --- a/configs/waybar/config.jsonc +++ b/configs/waybar/config.jsonc @@ -11,7 +11,8 @@ ], "modules-center": [ - "hyprland/workspaces" + "hyprland/workspaces", + "river/tags" ], "modules-right": [ diff --git a/configs/waybar/modules.jsonc b/configs/waybar/modules.jsonc index 52e8828..173ed5a 100644 --- a/configs/waybar/modules.jsonc +++ b/configs/waybar/modules.jsonc @@ -53,6 +53,18 @@ }, }, "river/tags": { + "num-tags": 9, + "tag-labels": [ + "", + "󰅩", + "󰖟", + "󰓇", + "", + "󰙯", + "", + "󰕧", + "" + ] }, "group/control-center": { "orientation": "inherit", diff --git a/flake.lock b/flake.lock index 7fe0b78..f0cf0d4 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1753216019, - "narHash": "sha256-zik7WISrR1ks2l6T1MZqZHb/OqroHdJnSnAehkE0kCk=", + "lastModified": 1755946532, + "narHash": "sha256-POePremlUY5GyA1zfbtic6XLxDaQcqHN6l+bIxdT5gc=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "be166e11d86ba4186db93e10c54a141058bdce49", + "rev": "81584dae2df6ac79f6b6dae0ecb7705e95129ada", "type": "github" }, "original": { @@ -33,6 +33,71 @@ "type": "github" } }, + "dankMaterialShell": { + "inputs": { + "dgop": "dgop", + "dms-cli": "dms-cli", + "nixpkgs": [ + "nixpkgs" + ], + "quickshell": "quickshell" + }, + "locked": { + "lastModified": 1759457446, + "narHash": "sha256-dxcxe8g1SeH4djECYJ7zjyi03JmHkhJBNO8268Vwtfs=", + "owner": "AvengeMedia", + "repo": "DankMaterialShell", + "rev": "b4ab9d96503d120304e63246d71488b2eb467f75", + "type": "github" + }, + "original": { + "owner": "AvengeMedia", + "repo": "DankMaterialShell", + "type": "github" + } + }, + "dgop": { + "inputs": { + "nixpkgs": [ + "dankMaterialShell", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1757252286, + "narHash": "sha256-QwWQzlxAGvIi6VAc8DQ6ONCKKwtPyaHQW1cQyGbP7Og=", + "owner": "AvengeMedia", + "repo": "dgop", + "rev": "a65a02ddf8bade9c109d055e644e4bd851183bd5", + "type": "github" + }, + "original": { + "owner": "AvengeMedia", + "repo": "dgop", + "type": "github" + } + }, + "dms-cli": { + "inputs": { + "nixpkgs": [ + "dankMaterialShell", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1757296630, + "narHash": "sha256-3H236F5oIKkqpfnwrvZQs4Y5imKb6JCMFGDkHs8VDjQ=", + "owner": "AvengeMedia", + "repo": "danklinux", + "rev": "dac591711ab30d6b071a5cec674a3d2e04665ee1", + "type": "github" + }, + "original": { + "owner": "AvengeMedia", + "repo": "danklinux", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -78,11 +143,11 @@ ] }, "locked": { - "lastModified": 1755121891, - "narHash": "sha256-UtYkukiGnPRJ5rpd4W/wFVrLMh8fqtNkqHTPgHEtrqU=", + "lastModified": 1759337100, + "narHash": "sha256-CcT3QvZ74NGfM+lSOILcCEeU+SnqXRvl1XCRHenZ0Us=", "owner": "nix-community", "repo": "home-manager", - "rev": "279ca5addcdcfa31ac852b3ecb39fc372684f426", + "rev": "004753ae6b04c4b18aa07192c1106800aaacf6c3", "type": "github" }, "original": { @@ -136,11 +201,11 @@ ] }, "locked": { - "lastModified": 1754305013, - "narHash": "sha256-u+M2f0Xf1lVHzIPQ7DsNCDkM1NYxykOSsRr4t3TbSM4=", + "lastModified": 1758192433, + "narHash": "sha256-CR6RnqEJSTiFgA6KQY4TTLUWbZ8RBnb+hxQqesuQNzQ=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "4c1d63a0f22135db123fc789f174b89544c6ec2d", + "rev": "c44e749dd611521dee940d00f7c444ee0ae4cfb7", "type": "github" }, "original": { @@ -165,11 +230,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1755184403, - "narHash": "sha256-VI+ZPD/uIFjzYW8IcyvBgvwyDIvUe4/xh/kOHTbITX8=", + "lastModified": 1759399554, + "narHash": "sha256-FsFugHj7He5siEcmoRUdMKHB8uMzyneK/fynPS57W4E=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "60d769a89908c29e19100059985db15a7b6bab6a", + "rev": "3bcfa94ee4189faaa4daf661949e88cf28c00d94", "type": "github" }, "original": { @@ -195,11 +260,11 @@ ] }, "locked": { - "lastModified": 1755183521, - "narHash": "sha256-wrP8TM2lb2x0+PyTc7Uc3yfVBeIlYW7+hFeG14N9Cr8=", + "lastModified": 1758895089, + "narHash": "sha256-HOIITlSwB5iuVEVLmWNGu8bvI83Y2IbN8SzJQmBDwvg=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "c1ddebb423acc7c88653c04de5ddafee64dac89a", + "rev": "4d940a10aff16b240533c9b6527a14ff91e5e5ae", "type": "github" }, "original": { @@ -288,11 +353,11 @@ ] }, "locked": { - "lastModified": 1753819801, - "narHash": "sha256-tHe6XeNeVeKapkNM3tcjW4RuD+tB2iwwoogWJOtsqTI=", + "lastModified": 1757694755, + "narHash": "sha256-j+w5QUUr2QT/jkxgVKecGYV8J7fpzXCMgzEEr6LG9ug=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "b308a818b9dcaa7ab8ccab891c1b84ebde2152bc", + "rev": "5ffdfc13ed03df1dae5084468d935f0a3f2c9a4c", "type": "github" }, "original": { @@ -317,11 +382,11 @@ ] }, "locked": { - "lastModified": 1753622892, - "narHash": "sha256-0K+A+gmOI8IklSg5It1nyRNv0kCNL51duwnhUO/B8JA=", + "lastModified": 1756810301, + "narHash": "sha256-wgZ3VW4VVtjK5dr0EiK9zKdJ/SOqGIBXVG85C3LVxQA=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "23f0debd2003f17bd65f851cd3f930cff8a8c809", + "rev": "3d63fb4a42c819f198deabd18c0c2c1ded1de931", "type": "github" }, "original": { @@ -342,11 +407,11 @@ ] }, "locked": { - "lastModified": 1754481650, - "narHash": "sha256-6u6HdEFJh5gY6VfyMQbhP7zDdVcqOrCDTkbiHJmAtMI=", + "lastModified": 1756117388, + "narHash": "sha256-oRDel6pNl/T2tI+nc/USU9ZP9w08dxtl7hiZxa0C/Wc=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "df6b8820c4a0835d83d0c7c7be86fbc555f1f7fd", + "rev": "b2ae3204845f5f2f79b4703b441252d8ad2ecfd0", "type": "github" }, "original": { @@ -367,11 +432,11 @@ ] }, "locked": { - "lastModified": 1751897909, - "narHash": "sha256-FnhBENxihITZldThvbO7883PdXC/2dzW4eiNvtoV5Ao=", + "lastModified": 1755184602, + "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "fcca0c61f988a9d092cbb33e906775014c61579d", + "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d", "type": "github" }, "original": { @@ -382,11 +447,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1754725699, - "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", + "lastModified": 1758198701, + "narHash": "sha256-7To75JlpekfUmdkUZewnT6MoBANS0XVypW6kjUOXQwc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", + "rev": "0147c2f1d54b30b5dd6d4a8c8542e8d7edf93b5d", "type": "github" }, "original": { @@ -398,11 +463,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1755027561, - "narHash": "sha256-IVft239Bc8p8Dtvf7UAACMG5P3ZV+3/aO28gXpGtMXI=", + "lastModified": 1759381078, + "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "005433b926e16227259a1843015b5b2b7f7d1fc3", + "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", "type": "github" }, "original": { @@ -422,11 +487,11 @@ ] }, "locked": { - "lastModified": 1754416808, - "narHash": "sha256-c6yg0EQ9xVESx6HGDOCMcyRSjaTpNJP10ef+6fRcofA=", + "lastModified": 1758108966, + "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "9c52372878df6911f9afc1e2a1391f55e4dfc864", + "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", "type": "github" }, "original": { @@ -438,15 +503,36 @@ "quickshell": { "inputs": { "nixpkgs": [ + "dankMaterialShell", "nixpkgs" ] }, "locked": { - "lastModified": 1753595452, - "narHash": "sha256-vqkSDvh7hWhPvNjMjEDV4KbSCv2jyl2Arh73ZXe274k=", + "lastModified": 1756981260, + "narHash": "sha256-GhuD9QVimjynHI0OOyZsqJsnlXr2orowh9H+HYz4YMs=", + "ref": "refs/heads/master", + "rev": "6eb12551baf924f8fdecdd04113863a754259c34", + "revCount": 672, + "type": "git", + "url": "https://git.outfoxxed.me/quickshell/quickshell" + }, + "original": { + "type": "git", + "url": "https://git.outfoxxed.me/quickshell/quickshell" + } + }, + "quickshell_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1759303785, + "narHash": "sha256-EUXrK7pUIzOQWR1dquZh26A6W8lsY2oiHEEZzQnsarM=", "owner": "quickshell-mirror", "repo": "quickshell", - "rev": "a5431dd02dc23d9ef1680e67777fed00fe5f7cda", + "rev": "9662234759eb57f2a1057f2a1c667da1bf128c1c", "type": "github" }, "original": { @@ -457,11 +543,12 @@ }, "root": { "inputs": { + "dankMaterialShell": "dankMaterialShell", "home-manager": "home-manager", "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", "nixpkgs": "nixpkgs_2", - "quickshell": "quickshell" + "quickshell": "quickshell_2" } }, "systems": { @@ -507,11 +594,11 @@ ] }, "locked": { - "lastModified": 1753633878, - "narHash": "sha256-js2sLRtsOUA/aT10OCDaTjO80yplqwOIaLUqEe0nMx0=", + "lastModified": 1755354946, + "narHash": "sha256-zdov5f/GcoLQc9qYIS1dUTqtJMeDqmBmo59PAxze6e4=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "371b96bd11ad2006ed4f21229dbd1be69bed3e8a", + "rev": "a10726d6a8d0ef1a0c645378f983b6278c42eaa0", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4fa4c4e..91f8862 100644 --- a/flake.nix +++ b/flake.nix @@ -9,6 +9,10 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; + dankMaterialShell = { + url = "github:AvengeMedia/DankMaterialShell"; + inputs.nixpkgs.follows = "nixpkgs"; + }; quickshell = { url = "github:quickshell-mirror/quickshell"; diff --git a/hosts/darp8/configuration.nix b/hosts/darp8/configuration.nix index 5f9b8b8..234f927 100644 --- a/hosts/darp8/configuration.nix +++ b/hosts/darp8/configuration.nix @@ -83,7 +83,7 @@ in restart = true; settings = { default_session = { - command = "${pkgs.greetd.tuigreet}/bin/tuigreet --cmd river"; + command = "${pkgs.tuigreet}/bin/tuigreet --cmd Hyprland"; }; }; }; @@ -108,12 +108,6 @@ in Hyprland river ''; - # "hyprland/plugins.conf" = { - # mode = "0444"; - # text = '' - # plugin = ${pkgs.hyprlandPlugins.hyprexpo} - # ''; - # }; }; }; @@ -192,7 +186,7 @@ in ]; }; - river = { + river-classic = { enable = true; xwayland.enable = true; }; diff --git a/hosts/darp8/file.nix b/hosts/darp8/file.nix index f40a5f0..476428a 100644 --- a/hosts/darp8/file.nix +++ b/hosts/darp8/file.nix @@ -26,6 +26,11 @@ in outOfStoreSymlink = true; recursive = true; }; + ".config/DankMaterialShell" = { + source = ../../configs/DankMaterialShell; + outOfStoreSymlink = true; + recursive = true; + }; ".config/river" = { source = ../../configs/river; outOfStoreSymlink = true; diff --git a/hosts/darp8/home.nix b/hosts/darp8/home.nix index 9f939c5..f552784 100644 --- a/hosts/darp8/home.nix +++ b/hosts/darp8/home.nix @@ -20,6 +20,8 @@ # general modules ../../modules/home-manager/tmux.nix + + inputs.dankMaterialShell.homeModules.dankMaterialShell.default ]; # You should not change this value, even if you update Home Manager. If you do @@ -32,7 +34,6 @@ GIT_EDITOR = "nvim"; NIX_SHELL_PRESERVE_PROMPT = 1; NIX_CONFIG_DIR = "${cfg.homeDirectory}/personal/nixos"; - # HYPR_EXPO_LIB = "${hyprplugins.hyprexpo_dir}/lib/libhyprexpo.so"; }; nix.settings.extra-trusted-substituters = [ diff --git a/hosts/darp8/pkgs.nix b/hosts/darp8/pkgs.nix index 431a3b1..98b148b 100644 --- a/hosts/darp8/pkgs.nix +++ b/hosts/darp8/pkgs.nix @@ -18,7 +18,7 @@ exfatprogs fastfetch filezilla - floorp + floorp-bin fuzzel fzf genymotion @@ -31,8 +31,9 @@ hyprpicker imagemagick kdePackages.kdenlive + kdePackages.polkit-kde-agent-1 keepassxc - libsForQt5.polkit-kde-agent + libreoffice localsend mpv mupdf @@ -79,6 +80,7 @@ else export PS1='\[\e[1;m\e[1;33m\e[1;m\] \W\[\e[m\e[m\] 🐧 \[\e[1;32m\]~> \[\e[m\e[m\]' fi; + export PATH="$HOME/.local/bin:$PATH" set -o vi fastfetch ''; @@ -104,6 +106,9 @@ ".." = "cd .."; }; }; + dankMaterialShell = { + enable = true; + }; emacs = { enable = true; package = pkgs.emacs-gtk;