From 4014ed031889ca490b3446c91ff307d0089346eb Mon Sep 17 00:00:00 2001 From: Christoph Urlacher Date: Fri, 20 Mar 2026 17:46:22 +0100 Subject: [PATCH] Modules/Niri: Disable DMS (slow af) --- flake.lock | 206 +++++++++++------- flake.nix | 13 +- .../1_deprecated/niri}/catppuccin-mauve.json | 0 .../niri/dankMaterialShell.nix | 0 home/homemodules/default.nix | 7 +- home/homemodules/niri/default.nix | 65 +++--- 6 files changed, 163 insertions(+), 128 deletions(-) rename {config/dankmaterialshell => home/homemodules/1_deprecated/niri}/catppuccin-mauve.json (100%) rename home/homemodules/{ => 1_deprecated}/niri/dankMaterialShell.nix (100%) diff --git a/flake.lock b/flake.lock index 5cb1ab2d..9abf76ba 100644 --- a/flake.lock +++ b/flake.lock @@ -15,47 +15,6 @@ "type": "github" } }, - "dank-material-shell": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "quickshell": "quickshell" - }, - "locked": { - "lastModified": 1773342367, - "narHash": "sha256-6KxAxgU2lVgCDxY25aDq6H/aVJXwXIXdooEEKU8btyE=", - "owner": "AvengeMedia", - "repo": "DankMaterialShell", - "rev": "727d9c6c22d4ce024aa149ff17b666612988a3bf", - "type": "github" - }, - "original": { - "owner": "AvengeMedia", - "repo": "DankMaterialShell", - "type": "github" - } - }, - "danksearch": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1771867960, - "narHash": "sha256-7VK/R3ZkrSlk8WQlQxjP2BJl5PGNkgbPnd9jh/7xbTw=", - "owner": "AvengeMedia", - "repo": "danksearch", - "rev": "55c58870c666a45eeb2fe34180eb886c34e68d0c", - "type": "github" - }, - "original": { - "owner": "AvengeMedia", - "repo": "danksearch", - "type": "github" - } - }, "devshell": { "inputs": { "nixpkgs": "nixpkgs" @@ -95,6 +54,25 @@ "type": "github" } }, + "elephant": { + "inputs": { + "nixpkgs": "nixpkgs_2", + "systems": "systems" + }, + "locked": { + "lastModified": 1773079031, + "narHash": "sha256-RvCzINnVISBT3d0F1DoIcQFbQsbRJISW9qZeKTzmNaA=", + "owner": "abenz1267", + "repo": "elephant", + "rev": "53afe39cef252010f7c55bd33c5bae6dd50dcf0c", + "type": "github" + }, + "original": { + "owner": "abenz1267", + "repo": "elephant", + "type": "github" + } + }, "fenix": { "inputs": { "nixpkgs": [ @@ -251,7 +229,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, @@ -269,7 +247,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1731533236, @@ -365,7 +343,7 @@ }, "hytale-launcher": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1773947929, @@ -384,7 +362,7 @@ "impermanence": { "inputs": { "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1769548169, @@ -450,7 +428,7 @@ "naersk": { "inputs": { "fenix": "fenix", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1763384566, @@ -528,7 +506,7 @@ "inputs": { "flake-compat": "flake-compat_2", "nix-index-database": "nix-index-database", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1771150922, @@ -630,6 +608,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1764242076, + "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1773821835, "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", @@ -645,7 +639,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1768564909, "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", @@ -661,7 +655,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1771008912, "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", @@ -677,7 +671,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1773122722, "narHash": "sha256-FIqHByVqxCprNjor1NqF80F2QQoiiyqanNNefdlvOg4=", @@ -693,7 +687,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1752077645, "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=", @@ -709,13 +703,29 @@ "type": "github" } }, + "nixpkgs_8": { + "locked": { + "lastModified": 1768564909, + "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "flake-parts": "flake-parts_2", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1772402258, @@ -801,34 +811,11 @@ "type": "github" } }, - "quickshell": { - "inputs": { - "nixpkgs": [ - "dank-material-shell", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1766725085, - "narHash": "sha256-O2aMFdDUYJazFrlwL7aSIHbUSEm3ADVZjmf41uBJfHs=", - "ref": "refs/heads/master", - "rev": "41828c4180fb921df7992a5405f5ff05d2ac2fff", - "revCount": 715, - "type": "git", - "url": "https://git.outfoxxed.me/quickshell/quickshell" - }, - "original": { - "rev": "41828c4180fb921df7992a5405f5ff05d2ac2fff", - "type": "git", - "url": "https://git.outfoxxed.me/quickshell/quickshell" - } - }, "root": { "inputs": { - "dank-material-shell": "dank-material-shell", - "danksearch": "danksearch", "devshell": "devshell", "disko": "disko", + "elephant": "elephant", "hardware": "hardware", "home-manager": "home-manager", "hytale-launcher": "hytale-launcher", @@ -838,13 +825,14 @@ "niri": "niri", "nix-alien": "nix-alien", "nix-flatpak": "nix-flatpak", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "nixpkgs-stable": "nixpkgs-stable_2", "nixvim": "nixvim", "nps": "nps", "nur": "nur", "sops-nix": "sops-nix", - "textfox": "textfox" + "textfox": "textfox", + "walker": "walker" } }, "rust-analyzer-src": { @@ -907,16 +895,16 @@ }, "systems": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -950,6 +938,36 @@ "type": "github" } }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_5": { + "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" + } + }, "textfox": { "inputs": { "firefox-addons": "firefox-addons", @@ -971,6 +989,28 @@ "type": "github" } }, + "walker": { + "inputs": { + "elephant": [ + "elephant" + ], + "nixpkgs": "nixpkgs_8", + "systems": "systems_5" + }, + "locked": { + "lastModified": 1773675699, + "narHash": "sha256-GrormZ2KxchtCLuO90+5fioEQmlUCKBIil0Mzr9w0Iw=", + "owner": "abenz1267", + "repo": "walker", + "rev": "d2702235710da3d7daf55c912ca7534261cf20f5", + "type": "github" + }, + "original": { + "owner": "abenz1267", + "repo": "walker", + "type": "github" + } + }, "xwayland-satellite-stable": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index fddc8f8b..6b6705c2 100644 --- a/flake.nix +++ b/flake.nix @@ -53,6 +53,11 @@ niri.url = "github:sodiboo/niri-flake"; niri.inputs.nixpkgs.follows = "nixpkgs"; + # Walker + elephant.url = "github:abenz1267/elephant"; + walker.url = "github:abenz1267/walker"; + walker.inputs.elephant.follows = "elephant"; + # Quickshell # quickshell.url = "github:quickshell-mirror/quickshell"; # quickshell.inputs.nixpkgs.follows = "nixpkgs"; @@ -77,11 +82,11 @@ # dgop.inputs.nixpkgs.follows = "nixpkgs"; # dms-cli.url = "github:AvengeMedia/danklinux"; # dms-cli.inputs.nixpkgs.follows = "nixpkgs"; - dank-material-shell.url = "github:AvengeMedia/DankMaterialShell"; - dank-material-shell.inputs.nixpkgs.follows = "nixpkgs"; + # dank-material-shell.url = "github:AvengeMedia/DankMaterialShell"; + # dank-material-shell.inputs.nixpkgs.follows = "nixpkgs"; # dank-material-shell.inputs.dgop.follows = "dgop"; - danksearch.url = "github:AvengeMedia/danksearch"; - danksearch.inputs.nixpkgs.follows = "nixpkgs"; + # danksearch.url = "github:AvengeMedia/danksearch"; + # danksearch.inputs.nixpkgs.follows = "nixpkgs"; # Hyprland (use flake so plugins are not built from source) # hyprland.url = "github:hyprwm/Hyprland"; diff --git a/config/dankmaterialshell/catppuccin-mauve.json b/home/homemodules/1_deprecated/niri/catppuccin-mauve.json similarity index 100% rename from config/dankmaterialshell/catppuccin-mauve.json rename to home/homemodules/1_deprecated/niri/catppuccin-mauve.json diff --git a/home/homemodules/niri/dankMaterialShell.nix b/home/homemodules/1_deprecated/niri/dankMaterialShell.nix similarity index 100% rename from home/homemodules/niri/dankMaterialShell.nix rename to home/homemodules/1_deprecated/niri/dankMaterialShell.nix diff --git a/home/homemodules/default.nix b/home/homemodules/default.nix index 51e934fb..0446fbec 100644 --- a/home/homemodules/default.nix +++ b/home/homemodules/default.nix @@ -30,12 +30,13 @@ inputs.nix-flatpak.homeManagerModules.nix-flatpak inputs.nixvim.homeModules.nixvim inputs.textfox.homeManagerModules.default + inputs.walker.homeManagerModules.default # inputs.niri.homeModules.niri # Imported by system module # inputs.noctalia.homeModules.default # inputs.caelestia.homeManagerModules.default - inputs.dank-material-shell.homeModules.dank-material-shell - inputs.dank-material-shell.homeModules.niri - inputs.danksearch.homeModules.default + # inputs.dank-material-shell.homeModules.dank-material-shell + # inputs.dank-material-shell.homeModules.niri + # inputs.danksearch.homeModules.default # NOTE: Do NOT use this, use the system module (the HM module has to rely on fuse) # inputs.impermanence.homeManagerModules.impermanence diff --git a/home/homemodules/niri/default.nix b/home/homemodules/niri/default.nix index ce7e5a0b..2ea91b51 100644 --- a/home/homemodules/niri/default.nix +++ b/home/homemodules/niri/default.nix @@ -57,13 +57,12 @@ in { systemd.user.services.niri-flake-polkit = lib.mkForce {}; home = { - # Mute the stupid DMS popups - # TODO: Is there a DMS option to disable those? - file.".config/DankMaterialShell/.firstlaunch".text = ""; - file.".config/DankMaterialShell/.changelog-1.4".text = ""; + file = { + # Link theme for flatpak + ".themes/${config.gtk.theme.name}".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}"; - # Link theme for flatpak - file.".themes/${config.gtk.theme.name}".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}"; + ".config/ashell/config.toml".source = config.lib.file.mkOutOfStoreSymlink "${config.paths.dotfiles}/ashell/config.toml"; + }; sessionVariables = { QT_QPA_PLATFORMTHEME = "gtk3"; # For Noctalia @@ -80,8 +79,12 @@ in { packages = with pkgs; [ xwayland-satellite - ncpamixer # Audio control + # ncpamixer # Audio control + wiremix # Audio control + ashell # Wayland bar + + # GTK apps (look good and work well with xdg portals) nautilus # Fallback file chooser used by xdg-desktop-portal-gnome # Catppuccin-GTK theme @@ -96,9 +99,10 @@ in { }; programs = { - # TODO: Those should be modules with their own options - dank-material-shell = import ./dankMaterialShell.nix {inherit config color;}; - dsearch.enable = false; + walker = { + enable = true; + runAsService = true; + }; # TODO: Extract options niri = { @@ -380,43 +384,28 @@ in { hotkey-overlay = {title = "Edit the NixFlake.";}; }; - # TODO: Enable with Noctalia option - # Noctalia + "Mod+A" = { + action = spawn "walker"; + hotkey-overlay = {title = "Toggle the application launcher.";}; + }; + + # DankMaterialShell # "Mod+A" = { - # action = spawn "noctalia-shell" "ipc" "call" "launcher" "toggle"; + # action = spawn "dms" "ipc" "call" "spotlight" "toggle"; # hotkey-overlay = {title = "Toggle the application launcher.";}; # }; # "Mod+Ctrl+L" = { - # action = spawn "noctalia-shell" "ipc" "call" "lockScreen" "lock"; + # action = spawn "dms" "ipc" "call" "lock" "lock"; # hotkey-overlay = {title = "Lock the screen.";}; # }; - # "Mod+W" = { - # action = spawn "noctalia-shell" "ipc" "call" "wallpaper" "toggle"; - # hotkey-overlay = {title = "Toggle the wallpaper chooser.";}; - # }; # "Mod+Escape" = { - # action = spawn "noctalia-shell" "ipc" "call" "sessionMenu" "toggle"; + # action = spawn "dms" "ipc" "call" "powermenu" "toggle"; # hotkey-overlay = {title = "Toggle the session menu.";}; # }; - - # TODO: Enable with DMS option - # DankMaterialShell - "Mod+A" = { - action = spawn "dms" "ipc" "call" "spotlight" "toggle"; - hotkey-overlay = {title = "Toggle the application launcher.";}; - }; - "Mod+Ctrl+L" = { - action = spawn "dms" "ipc" "call" "lock" "lock"; - hotkey-overlay = {title = "Lock the screen.";}; - }; - "Mod+Escape" = { - action = spawn "dms" "ipc" "call" "powermenu" "toggle"; - hotkey-overlay = {title = "Toggle the session menu.";}; - }; - "Mod+C" = { - action = spawn "dms" "ipc" "call" "clipboard" "toggle"; - hotkey-overlay = {title = "Show clipboard history.";}; - }; + # "Mod+C" = { + # action = spawn "dms" "ipc" "call" "clipboard" "toggle"; + # hotkey-overlay = {title = "Show clipboard history.";}; + # }; # Screenshots "Mod+S" = {