update niri, maomaowm

This commit is contained in:
EdenQwQ 2025-04-13 23:53:02 +08:00
parent d185dc8c29
commit 6be5498632
6 changed files with 25 additions and 20 deletions

15
flake.lock generated
View file

@ -582,16 +582,15 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1743821376,
"narHash": "sha256-IEiro5RTX3vcbJLi0W69RldDkeEkpzPkaQkPgxxHZBo=",
"lastModified": 1744511702,
"narHash": "sha256-LEKRZCqj7ERuKk+HI9F2UX7u8KQbBJwrfDFFMHEqiqA=",
"owner": "DreamMaoMao",
"repo": "maomaowm",
"rev": "60a561f3dfe4acd210f6330d9f7171add6317840",
"rev": "d636ef97ac0d6dc68267ef9a5d813af112f0fc6d",
"type": "github"
},
"original": {
"owner": "DreamMaoMao",
"ref": "wlroots-0.19",
"repo": "maomaowm",
"type": "github"
}
@ -703,17 +702,17 @@
"niri-unstable": {
"flake": false,
"locked": {
"lastModified": 1743928003,
"narHash": "sha256-zplmZv+QgVXzk7O3j5CWmvAPydxhbsVfkZ0DjUGMPlc=",
"lastModified": 1744451806,
"narHash": "sha256-cZTekG7OJUvNmdG/nT7z4ock/hbqcjf+E21DlEpzaqY=",
"owner": "YalTeR",
"repo": "niri",
"rev": "4ca7812e4fd51632995f9fccaad8f4607977abff",
"rev": "35623ea34582d6dfb0946a56981053f6fe8ed8b1",
"type": "github"
},
"original": {
"owner": "YalTeR",
"repo": "niri",
"rev": "4ca7812e4fd51632995f9fccaad8f4607977abff",
"rev": "35623ea34582d6dfb0946a56981053f6fe8ed8b1",
"type": "github"
}
},

View file

@ -54,7 +54,7 @@
};
flake-parts.url = "github:hercules-ci/flake-parts";
niri-unstable = {
url = "github:YalTeR/niri/4ca7812e4fd51632995f9fccaad8f4607977abff";
url = "github:YalTeR/niri/35623ea34582d6dfb0946a56981053f6fe8ed8b1";
flake = false;
};
niri = {
@ -81,7 +81,6 @@
nh.url = "github:viperML/nh";
treefmt-nix.url = "github:numtide/treefmt-nix";
agenix.url = "github:ryantm/agenix";
maomaowm.url = "github:DreamMaoMao/maomaowm/wlroots-0.19";
# maomaowm.url = "git+file:///home/eden/Repos/maomaowm-orig";
maomaowm.url = "github:DreamMaoMao/maomaowm";
};
}

View file

@ -29,7 +29,6 @@ let
swww-daemon &
clash-meta -d ~/.config/clash &
wlsunset -s 00:00 -S 00:00 -t 5000 -T 5001 &
waycorner &
'';
};
niri-blur-wallpaper = pkgs.writers.writePython3Bin "niri-blur-wallpaper" { doCheck = false; } ''

View file

@ -4,9 +4,16 @@ let
# kdl
'''';
finalNiriConfig =
with config.lib.stylix.colors.withHashtag;
builtins.replaceStrings
[ "output \"${config.lib.monitors.mainMonitorName}\" {" ]
[ "output \"${config.lib.monitors.mainMonitorName}\" {\nfocus-at-startup" ]
[
"output \"${config.lib.monitors.mainMonitorName}\" {"
# "background-color \"${base01}\""
]
[
"output \"${config.lib.monitors.mainMonitorName}\" {\nfocus-at-startup"
# "background-color \"${base01}\"\n backdrop-color \"${base02}\""
]
config.programs.niri.finalConfig
+ "\n"
+ extraConfig;

View file

@ -17,10 +17,9 @@
effects = {
hydrogen = {
enable = true;
options = {
extraArguments = "--shadow-arguments '80x50+0+0' --background \"${config.lib.stylix.colors.withHashtag.base02}\"";
};
options.extraArguments = "--shadow-arguments '80x50+0+0'";
};
vignette.enable = true;
};
}
{
@ -48,10 +47,11 @@
baseImageName = "bangqiaoyan-girl-sky";
path = "${pkgs.wallpapers}/bangqiaoyan-girl-sky.jpg";
convertMethod = "gonord";
effects = {
hydrogen.enable = true;
vignette.enable = true;
effects.hydrogen = {
enable = true;
options.extraArguments = "--background \"${config.lib.stylix.colors.withHashtag.base02}\"";
};
}
{
name = "morncolour-pink-landscape.png";

View file

@ -7,5 +7,6 @@
./swhkd.nix
./maomaowm.nix
./hellwm.nix
./miracle-wm.nix
];
}