emenel/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fighting with wpaperd and swaylock-plugin

Browse source
This commit is contained in:
Matt Nish-Lapidus 2025-07-04 01:12:55 -04:00
parent 0a990d8308
commit cfb2e9209e
9 changed files with 68 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

18
flake.lock generated
View file

@ -137,11 +137,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1751533870,
"narHash": "sha256-QrYtdbXjFjawI89+jQt9ASoUwGy8UAae/yLLFO9JxI4=",
"lastModified": 1751595285,
"narHash": "sha256-xYgWEszsCxwYT0I2irXq+OIxuWakBjM4SE5EevbU0C8=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "2dd8d2a429c834a0f85066f5313d38c5661bf5e0",
"rev": "acdb3607deb5a42163249378da3513ba1a8ada05",
"type": "github"
},
"original": {
@ -541,11 +541,11 @@
]
},
"locked": {
"lastModified": 1751549056,
"narHash": "sha256-miKaJ4SFNxhZ/WVDADae2jNd9zka5bV9hKmXspAzvxo=",
"lastModified": 1751589297,
"narHash": "sha256-3q35cq6BPuwIRL3IoVKYPc72r3OleeuRyf4YAPjEqzA=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "1fa73bb2cc39e250eb01e511ae6ac83bfbf9f38c",
"rev": "83f978812c37511ef2ffaf75ffa72160483f738a",
"type": "github"
},
"original": {
@ -1632,11 +1632,11 @@
]
},
"locked": {
"lastModified": 1751512826,
"narHash": "sha256-7ZacraAVWZBXGlg+UoPsZs+DACSsKJKTnCA83nXT6rM=",
"lastModified": 1751599118,
"narHash": "sha256-3a47LxEZ7751Wd5upwZa8psX5mRsYACQgS2WxY5zitc=",
"owner": "0xc000022070",
"repo": "zen-browser-flake",
"rev": "fedb07931fc9b162a972b8966fdd9ba76273a590",
"rev": "a3566f5b9c6ec2fa490976051889ebada20910b4",
"type": "github"
},
"original": {

23
hosts/eddie/configuration.nix
View file

@ -48,28 +48,6 @@
bash-env-nushell = inputs.bash-env-nushell.packages.x86_64-linux.default;
})
(final: prev: {
manifold = prev.manifold.overrideAttrs (old: {
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
"-DMANIFOLD_TEST=OFF"
"-DMANIFOLD_CROSS_SECTION=ON"
"-DMANIFOLD_PAR=TBB"
];
doCheck = false;
});
})
(final: prev: {
wineWowPackages.yabridge = prev.wineWowPackages.yabridge.overrideAttrs (old: {
patches = [ ../../patches/wine-6006.patch ] ++ old.patches;
waylandSupport = true;
fontconfigSupport = true;
vulkanSupport = true;
});
})
(final: prev: {
rbw = pkgs-local.rbw-latest;
})
@ -212,6 +190,7 @@
greetd-password.enableGnomeKeyring = true;
niri.enableGnomeKeyring = true;
swaylock.enableGnomeKeyring = true;
swaylock-plugin.enableGnomeKeyring = true;
swayidle.enableGnomeKeyring = true;
};
};

1
hosts/eddie/packages.nix
View file

@ -35,6 +35,7 @@
gnomeExtensions.appindicator
gnome-settings-daemon
swayidle
swaylock-plugin
nushell
];
}

8
modules/home/niri.nix
View file

@ -1,8 +1,4 @@
{
config,
pkgs,
...
}:
{ config, pkgs, ... }:
with pkgs.lib.nix-rice;
let
strPalette = palette.toRGBHex pkgs.rice.colorPalette;
@ -34,7 +30,7 @@ in
"xwayland-satellite.service"
];
}
{ command = [ "wpaperd" "--daemon" ]; }
{ command = [ "${pkgs.wpaperd}/bin/wpaperd" "--daemon" ]; }
{ command = [ "${pkgs.filen-desktop}/bin/filen-desktop" ]; }
# { command = [ "/home/emenel/.local/bin/niri-delayed-launch-at-startup" ]; }
];

19
modules/home/sway-idle-lock.nix
View file

@ -1,4 +1,8 @@
{ pkgs, ... }:
with pkgs.lib.nix-rice;
let
strPalette = palette.toRgbShortHex pkgs.rice.colorPalette;
in
{
services.swayidle = {
enable = true;
@ -7,12 +11,8 @@
events = [
{
event = "lock";
command = "/run/current-system/sw/bin/pidof swaylock || ${pkgs.swaylock}/bin/swaylock";
command = "${pkgs.swaylock-plugin}/bin/swaylock";
}
# {
# event = "before-sleep";
# command = "/home/emenel/.local/bin/session-lock";
# }
{
event = "after-resume";
command = "/home/emenel/.local/bin/on-unlock";
@ -59,16 +59,19 @@
};
programs.swaylock = {
enable = true;
package = pkgs.swaylock-plugin;
settings = {
color = "000000";
font-size = 32;
indicator-idle-visible = true;
indicator-radius = 150;
line-color = "cccccc";
indicator-radius = 350;
line-color = strPalette.normal.magenta;
show-failed-attempts = true;
grace = "10sec";
ignore-empty-password = true;
command = "${pkgs.wpaperd}/bin/wpaperd";
};
};
}

12
overlays/manifold.nix Normal file
View file

@ -0,0 +1,12 @@
final: prev: {
manifold = prev.manifold.overrideAttrs (old: {
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
"-DMANIFOLD_TEST=OFF"
"-DMANIFOLD_CROSS_SECTION=ON"
"-DMANIFOLD_PAR=TBB"
];
doCheck = false;
});
}

8
overlays/wine-yabridge.nix Normal file
View file

@ -0,0 +1,8 @@
final: prev: {
wineWowPackages.yabridge = prev.wineWowPackages.yabridge.overrideAttrs (old: {
patches = [ ../patches/wine-6006.patch ] ++ old.patches;
waylandSupport = true;
fontconfigSupport = true;
vulkanSupport = true;
});
}

23
overlays/wpaperd.nix Normal file
View file

@ -0,0 +1,23 @@
final: prev: {
wpaperd = prev.wpaperd.override (
let
rp = prev.rustPlatform;
in
{
rustPlatform = rp // {
buildRustPackage = args: rp.buildRustPackage (
args // rec {
cargoHash = "sha256-d8jzoNCn9J36SE4tQZ1orgOfFGbhVtHaaO940b3JxmQ=";
version = "1.2.2";
src = prev.fetchFromGitHub {
owner = "danyspin97";
repo = "wpaperd";
rev = "1.2.2";
hash = "sha256-6XVpjTdo/wI65Lzd02fjqir7a28EEBBp3794zLgxayY=";
};
}
);
};
}
);
}

2
overlays/yabridge.nix
View file

@ -6,7 +6,7 @@ final: prev: {
owner = "robbert-vdh";
repo = "yabridge";
rev = "HEAD";
hash = "sha256-pxQ+B4WF9iWNeLholSSqSMLJ3lz/Ub/PfgkAuacUAqc=";
hash = "sha256-hL6nPl5zG3e6/I1Evd0Xl3Ie/DzpdqO+2S2R4FhZqdE=";
};
patches = [