From 050aded0354eda2a6fcd78106a673d1798e4020f Mon Sep 17 00:00:00 2001 From: EdenQwQ Date: Sat, 21 Feb 2026 21:02:10 +0800 Subject: [PATCH] update dms, niri blur --- flake.lock | 71 ++++++++++--------- flake.nix | 2 +- home/programs/desktop/dms.nix | 17 +---- .../programs/desktop/niri/override-config.nix | 7 ++ hosts/default.nix | 2 +- modules/home-manager/desktop-shell.nix | 2 +- 6 files changed, 47 insertions(+), 54 deletions(-) diff --git a/flake.lock b/flake.lock index 73ed12f..6c110dd 100644 --- a/flake.lock +++ b/flake.lock @@ -199,17 +199,17 @@ "type": "github" } }, - "dankMaterialShell": { + "dank-material-shell": { "inputs": { - "dgop": "dgop", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_5", + "quickshell": "quickshell_2" }, "locked": { - "lastModified": 1764226053, - "narHash": "sha256-tSyGld/EDYnEM9crM0PD9wi0Ee5oahubzGJI3jqeNvU=", + "lastModified": 1771653128, + "narHash": "sha256-tZGAFgdue41AfGAHd3+w2wGK5IbasV34qHFD34F7nRk=", "owner": "AvengeMedia", "repo": "DankMaterialShell", - "rev": "ce40c691e93739ff2b459012831f25b93872aa07", + "rev": "46d4288969e13dc3c869324120742f451ad46544", "type": "github" }, "original": { @@ -240,27 +240,6 @@ "type": "github" } }, - "dgop": { - "inputs": { - "nixpkgs": [ - "dankMaterialShell", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1762435535, - "narHash": "sha256-QhzRn7pYN35IFpKjjxJAj3GPJECuC+VLhoGem3ezycc=", - "owner": "AvengeMedia", - "repo": "dgop", - "rev": "6cf638dde818f9f8a2e26d0243179c43cb3458d7", - "type": "github" - }, - "original": { - "owner": "AvengeMedia", - "repo": "dgop", - "type": "github" - } - }, "firefox-gnome-theme": { "flake": false, "locked": { @@ -833,11 +812,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1771619725, - "narHash": "sha256-AV6CEmWqM23wpOexysITVoWc92M5Dvegeh6xmBkwf80=", + "lastModified": 1771672342, + "narHash": "sha256-52CxMRH2kVGpsPBiZM+996b6i/3XkmOrySm5zqwWc+o=", "owner": "niri-wm", "repo": "niri", - "rev": "48fb2b3970acfb05806047f6ae5d68b4b1041aac", + "rev": "86f42d1ed9ab787c52ace073e0b3218e26530d25", "type": "github" }, "original": { @@ -1228,11 +1207,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1762363567, - "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=", + "lastModified": 1769018530, + "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4", + "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", "type": "github" }, "original": { @@ -1482,6 +1461,28 @@ } }, "quickshell_2": { + "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" + } + }, + "quickshell_3": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -1507,7 +1508,7 @@ "awww": "awww", "caelestia-cli": "caelestia-cli", "caelestia-shell": "caelestia-shell_2", - "dankMaterialShell": "dankMaterialShell", + "dank-material-shell": "dank-material-shell", "flake-parts": "flake-parts", "ghostty": "ghostty", "hexecute": "hexecute", @@ -1527,7 +1528,7 @@ "nixvim": "nixvim", "noctalia-shell": "noctalia-shell", "nur": "nur", - "quickshell": "quickshell_2", + "quickshell": "quickshell_3", "stylix": "stylix", "treefmt-nix": "treefmt-nix_2" } diff --git a/flake.nix b/flake.nix index 1301bfd..96f08bf 100644 --- a/flake.nix +++ b/flake.nix @@ -90,7 +90,7 @@ url = "git+https://git.outfoxxed.me/quickshell/quickshell"; inputs.nixpkgs.follows = "nixpkgs"; }; - dankMaterialShell.url = "github:AvengeMedia/DankMaterialShell"; + dank-material-shell.url = "github:AvengeMedia/DankMaterialShell"; caelestia-shell = { url = "github:caelestia-dots/shell"; inputs.quickshell.follows = "quickshell"; diff --git a/home/programs/desktop/dms.nix b/home/programs/desktop/dms.nix index f634284..31874e0 100644 --- a/home/programs/desktop/dms.nix +++ b/home/programs/desktop/dms.nix @@ -54,22 +54,7 @@ let }; in { - # programs.quickshell.configs.dms = - # let - # dankMaterialShell = - # inputs.dankMaterialShell.packages.${pkgs.stdenv.hostPlatform.system}.dankMaterialShell.overrideAttrs - # { - # installPhase = '' - # mkdir -p $out/etc/xdg/quickshell/DankMaterialShell - # cp -r . $out/etc/xdg/quickshell/DankMaterialShell - # ln -s $out/etc/xdg/quickshell/DankMaterialShell $out/etc/xdg/quickshell/dms - # substituteInPlace $out/etc/xdg/quickshell/DankMaterialShell/Widgets/DankIcon.qml \ - # --replace "Material Symbols Rounded" "Monofur Nerd Font" - # ''; - # }; - # in - # "${dankMaterialShell}/etc/xdg/quickshell/DankMaterialShell" |> lib.mkForce; - programs.dankMaterialShell.quickshell.package = + programs.dank-material-shell.quickshell.package = inputs.quickshell.packages.${pkgs.stdenv.hostPlatform.system}.quickshell; xdg.configFile."DankMaterialShell/stylix-colors.json".text = builtins.toJSON colorTheme; xdg.configFile."DankMaterialShell/settings.json".text = # json diff --git a/home/programs/desktop/niri/override-config.nix b/home/programs/desktop/niri/override-config.nix index 587bad7..5e7a5b6 100644 --- a/home/programs/desktop/niri/override-config.nix +++ b/home/programs/desktop/niri/override-config.nix @@ -16,6 +16,13 @@ let blur true } } + window-rule { + match is-floating=true + background-effect { + xray false + blur true + } + } layer-rule { match namespace="launcher" background-effect { diff --git a/hosts/default.nix b/hosts/default.nix index 3b58ad0..441d206 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -22,7 +22,7 @@ let inputs.agenix.homeManagerModules.default ../secrets/age.nix # inputs.mangowc.hmModules.mango - inputs.dankMaterialShell.homeModules.dankMaterialShell.default + inputs.dank-material-shell.homeModules.dank-material-shell inputs.caelestia-shell.homeManagerModules.default inputs.noctalia-shell.homeModules.default ] diff --git a/modules/home-manager/desktop-shell.nix b/modules/home-manager/desktop-shell.nix index 96ab836..e9d34e0 100644 --- a/modules/home-manager/desktop-shell.nix +++ b/modules/home-manager/desktop-shell.nix @@ -18,7 +18,7 @@ enable = config.desktopShell == "waybar"; systemd.enable = config.desktopShell == "waybar"; }; - programs.dankMaterialShell = { + programs.dank-material-shell = { enable = config.desktopShell == "dms"; systemd.enable = config.desktopShell == "dms"; };