diff --git a/flake.lock b/flake.lock index a742089..8271d66 100644 --- a/flake.lock +++ b/flake.lock @@ -133,27 +133,6 @@ "type": "github" } }, - "dgop": { - "inputs": { - "nixpkgs": [ - "dms", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1760238269, - "narHash": "sha256-7CeGZM/Z/5Qt3AYByCRohGYGR1MRuXYzTTbkV/JxyAs=", - "owner": "AvengeMedia", - "repo": "dgop", - "rev": "95acdfce2d323e28fa8f5a4f345160962034f2b5", - "type": "github" - }, - "original": { - "owner": "AvengeMedia", - "repo": "dgop", - "type": "github" - } - }, "disko": { "inputs": { "nixpkgs": [ @@ -175,50 +154,6 @@ "type": "github" } }, - "dms": { - "inputs": { - "dgop": "dgop", - "dms-cli": "dms-cli", - "nixpkgs": [ - "nixpkgs" - ], - "quickshell": "quickshell" - }, - "locked": { - "lastModified": 1760965677, - "narHash": "sha256-mBK9Gwbslo7HASfFkfi+5RUEAYJ3SLeEdSZvpRBbsWM=", - "owner": "AvengeMedia", - "repo": "DankMaterialShell", - "rev": "d38b98459a157a854cdcb14b8493a517c6416bac", - "type": "github" - }, - "original": { - "owner": "AvengeMedia", - "repo": "DankMaterialShell", - "type": "github" - } - }, - "dms-cli": { - "inputs": { - "nixpkgs": [ - "dms", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1760241259, - "narHash": "sha256-DlLGn+4M6tIafoDsHr2WhHG2hrHrC24S2IL3+KAvjEU=", - "owner": "AvengeMedia", - "repo": "danklinux", - "rev": "dae4c3ff4ce0feb930361c399747edb29d081775", - "type": "github" - }, - "original": { - "owner": "AvengeMedia", - "repo": "danklinux", - "type": "github" - } - }, "firefox-gnome-theme": { "flake": false, "locked": { @@ -784,6 +719,28 @@ "type": "github" } }, + "noctalia": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "quickshell": "quickshell", + "systems": "systems_4" + }, + "locked": { + "lastModified": 1760981626, + "narHash": "sha256-SqBuR0BsZnXopIA8T1Fh8V4hf54pOPoMRwnkML3HGi0=", + "owner": "noctalia-dev", + "repo": "noctalia-shell", + "rev": "73267d1d37b60c963fc4f938acab1eef8a655fe7", + "type": "github" + }, + "original": { + "owner": "noctalia-dev", + "repo": "noctalia-shell", + "type": "github" + } + }, "nur": { "inputs": { "flake-parts": [ @@ -812,22 +769,22 @@ "quickshell": { "inputs": { "nixpkgs": [ - "dms", + "noctalia", "nixpkgs" ] }, "locked": { - "lastModified": 1760228179, - "narHash": "sha256-4Z6k7lv3Zcgk3K+4h60LpqB9wCkR+utkYERU735U068=", + "lastModified": 1753595452, + "narHash": "sha256-vqkSDvh7hWhPvNjMjEDV4KbSCv2jyl2Arh73ZXe274k=", "ref": "refs/heads/master", - "rev": "c9d3ffb6043c5bf3f3009202bad7e0e5132c4a25", - "revCount": 693, + "rev": "a5431dd02dc23d9ef1680e67777fed00fe5f7cda", + "revCount": 665, "type": "git", - "url": "https://git.outfoxxed.me/quickshell/quickshell" + "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, "original": { "type": "git", - "url": "https://git.outfoxxed.me/quickshell/quickshell" + "url": "https://git.outfoxxed.me/outfoxxed/quickshell" } }, "root": { @@ -835,7 +792,6 @@ "agenix": "agenix", "deploy-rs": "deploy-rs", "disko": "disko", - "dms": "dms", "flake-parts": "flake-parts", "home-manager": "home-manager_2", "home-manager-stable": "home-manager-stable", @@ -847,6 +803,7 @@ "nixos-cli": "nixos-cli", "nixpkgs": "nixpkgs_6", "nixpkgs-stable": "nixpkgs-stable_2", + "noctalia": "noctalia", "stylix": "stylix", "zen-browser": "zen-browser" } @@ -905,7 +862,7 @@ "gnome-shell": "gnome-shell", "nixpkgs": "nixpkgs_7", "nur": "nur", - "systems": "systems_4", + "systems": "systems_5", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -986,6 +943,21 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tinted-foot": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 07e2353..78ff944 100644 --- a/flake.nix +++ b/flake.nix @@ -26,8 +26,8 @@ inputs.nixpkgs.follows = "nixpkgs-stable"; }; - dms = { - url = "github:AvengeMedia/DankMaterialShell"; + noctalia = { + url = "github:noctalia-dev/noctalia-shell"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/users/modules/desktop/niri.nix b/users/modules/desktop/niri.nix index 4bab001..517805f 100644 --- a/users/modules/desktop/niri.nix +++ b/users/modules/desktop/niri.nix @@ -1,5 +1,6 @@ { inputs, + lib, pkgs, hostname ? null, ... @@ -7,20 +8,12 @@ let isRotterdam = hostname == "rotterdam"; + noctalia = "${lib.getExe inputs.noctalia.packages.${pkgs.system}.default}"; in { - imports = [ - inputs.dms.homeModules.dankMaterialShell.default - ]; - home.packages = with pkgs; [ xwayland-satellite ]; - programs.dankMaterialShell = { - enable = true; - enableVPN = false; - }; - xdg.configFile."niri/config.kdl".text = '' output "eDP-1" { scale 1.0 @@ -102,11 +95,15 @@ in } spawn-at-startup "bash" "-c" "wl-paste --watch cliphist store &" - spawn-at-startup "dms" "run" + spawn-at-startup "${noctalia}" layer-rule { match namespace="^wallpaper$" place-within-backdrop true } + layer-rule { + match namespace="^quickshell-overview$" + place-within-backdrop true + } spawn-at-startup "xwayland-satellite" environment { @@ -139,22 +136,20 @@ in } binds { + Alt+Space { spawn "${noctalia}" "ipc" "call" "launcher" "toggle"; } + XF86AudioRaiseVolume { spawn "${noctalia}" "ipc" "call" "volume" "increase"; } + XF86AudioLowerVolume { spawn "${noctalia}" "ipc" "call" "volume" "decrease"; } + XF86AudioMute { spawn "${noctalia}" "ipc" "call" "volume" "muteOutput"; } + XF86MonBrightnessUp { spawn "${noctalia}" "ipc" "call" "brightness" "increase"; } + XF86MonBrightnessDown { spawn "${noctalia}" "ipc" "call" "brightness" "decrease"; } + Mod+V { spawn "${noctalia}" "ipc" "call" "launcher" "clipboard"; } + Mod+Shift+L { spawn "${noctalia}" "ipc" "call" "lockScreen" "toggle"; } Mod+Return { spawn "ghostty"; } - Alt+Space { spawn "dms" "ipc" "call" "spotlight" "toggle"; } - XF86AudioRaiseVolume allow-when-locked=true { spawn "dms" "ipc" "call" "audio" "increment" "5"; } - XF86AudioLowerVolume allow-when-locked=true { spawn "dms" "ipc" "call" "audio" "decrement" "5"; } - XF86AudioMute allow-when-locked=true { spawn "dms" "ipc" "call" "audio" "mute"; } - XF86AudioMicMute allow-when-locked=true { spawn "dms" "ipc" "call" "audio" "micmute"; } - XF86MonBrightnessUp allow-when-locked=true { spawn "dms" "ipc" "call" "brightness" "increment" "5" ""; } - XF86MonBrightnessDown allow-when-locked=true { spawn "dms" "ipc" "call" "brightness" "decrement" "5" ""; } Ctrl+Alt+Shift+A allow-when-locked=true { spawn "toggleaudiosink"; } Mod+W repeat=false { toggle-overview; } Mod+Q { close-window; } Alt+Shift+Q { close-window;} - Super+Shift+L hotkey-overlay-title="Lock Screen" { spawn "dms" "ipc" "call" "lock" "lock"; } Mod+Shift+Q { close-window; } - Mod+V hotkey-overlay-title="Clipboard Manager" { spawn "dms" "ipc" "call" "clipboard" "toggle"; } - Mod+M hotkey-overlay-title="Task Manager" { spawn "dms" "ipc" "call" "processlist" "toggle"; } Alt+F4 { close-window; } Mod+Left { focus-column-left; } Mod+Down { focus-window-down; } @@ -222,8 +217,8 @@ in Mod+Print { screenshot; } Ctrl+Print { screenshot-window; } Mod+Backspace allow-inhibiting=false { toggle-keyboard-shortcuts-inhibit; } - Mod+Shift+E { spawn "dms" "ipc" "call" "powermenu" "toggle"; } - Ctrl+Alt+Delete { spawn "dms" "ipc" "call" "powermenu" "toggle"; } + Mod+Alt+E { spawn "${noctalia}" "ipc" "call" "sessionMenu" "toggle"; } + Ctrl+Alt+Delete { spawn "${noctalia}" "ipc" "call" "sessionMenu" "toggle"; } Mod+Ctrl+P { power-off-monitors; } } '';