Compare commits
5 commits
7cdec173d0
...
adc11bc50a
Author | SHA1 | Date | |
---|---|---|---|
adc11bc50a | |||
b0c18c7c15 | |||
28573bd36d | |||
3a79f2d53a | |||
0830c161d1 |
4 changed files with 81 additions and 15 deletions
27
flake.lock
27
flake.lock
|
@ -631,7 +631,8 @@
|
|||
"niri": "niri",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"repo-clone": "repo-clone",
|
||||
"sops-nix": "sops-nix"
|
||||
"sops-nix": "sops-nix",
|
||||
"umu": "umu"
|
||||
}
|
||||
},
|
||||
"rust-analyzer-src": {
|
||||
|
@ -687,6 +688,30 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"umu": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"dir": "packaging/nix",
|
||||
"lastModified": 1729665556,
|
||||
"narHash": "sha256-eTIvUa/cnwFaR8Em8AfkmgF7wK/d5gyPcWnYH0e+Pdw=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "6e8e53c452f06c9932fb9dd9130149414416ade3",
|
||||
"revCount": 823,
|
||||
"submodules": true,
|
||||
"type": "git",
|
||||
"url": "https://github.com/Open-Wine-Components/umu-launcher/"
|
||||
},
|
||||
"original": {
|
||||
"dir": "packaging/nix",
|
||||
"submodules": true,
|
||||
"type": "git",
|
||||
"url": "https://github.com/Open-Wine-Components/umu-launcher/"
|
||||
}
|
||||
},
|
||||
"xwayland-satellite-stable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
|
@ -14,6 +14,7 @@
|
|||
repo-clone.url = "git+https://git.zynh.me/Zynh0722/repo-clone";
|
||||
fish_theme = { url = "git+https://git.zynh.me/Zynh0722/omf-theme"; flake = false; };
|
||||
backgrounds = { url = "git+https://git.zynh.me/Zynh0722/backgrounds"; inputs.nixpkgs.follows = "nixpkgs"; };
|
||||
umu = { url = "git+https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging\/nix&submodules=1"; inputs.nixpkgs.follows = "nixpkgs"; };
|
||||
};
|
||||
|
||||
outputs =
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, config, ... }:
|
||||
{ pkgs, config, inputs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
|
@ -39,6 +39,7 @@
|
|||
apps = {
|
||||
github.url = "https://github.com";
|
||||
zgit.url = "https://git.zynh.me";
|
||||
gmail.url = "https://mail.google.com/mail/u/0";
|
||||
calendar.url = "https://calendar.google.com/calendar/u/0/r";
|
||||
slack_nh.urlFile = config.sops.secrets."app_urls/nh_slack".path;
|
||||
};
|
||||
|
@ -53,7 +54,29 @@
|
|||
"~/obsidian"
|
||||
];
|
||||
|
||||
home.packages = with pkgs; [
|
||||
home.packages = with pkgs; let
|
||||
umu = inputs.umu.packages.${pkgs.system}.umu.override { version = "${inputs.umu.shortRev}"; };
|
||||
in
|
||||
[
|
||||
umu
|
||||
lutris
|
||||
(writeShellScriptBin "battlenet" ''
|
||||
export WINEARCH=win64
|
||||
export WINEPREFIX=$HOME/.wine-battlenet
|
||||
wine64 ~/.wine-battlenet/drive_c/Program\ Files\ \(x86\)/Battle.net/Battle.net\ Launcher.exe
|
||||
'')
|
||||
(wineWowPackages.full.override {
|
||||
wineRelease = "staging";
|
||||
mingwSupport = true;
|
||||
})
|
||||
winetricks
|
||||
|
||||
|
||||
(writeShellScriptBin "fix-desktop" ''
|
||||
systemctl --user restart xrootdatetime.service
|
||||
systemctl --user restart fehbg.service
|
||||
'')
|
||||
|
||||
ripgrep
|
||||
unzip
|
||||
fzf
|
||||
|
|
|
@ -44,18 +44,35 @@ in
|
|||
};
|
||||
|
||||
systemd.user.services.xrootdatetime = {
|
||||
script = ''
|
||||
while true; do
|
||||
if [[ "$(${getExe pkgs.pamixer} --default-source --get-mute)" == "true" ]]; then
|
||||
mutedString="Mic Muted "
|
||||
else
|
||||
mutedString=""
|
||||
fi
|
||||
dateTime=$(date +"<-- %A, %B %d -- %H:%M -->")
|
||||
${getExe pkgs.xorg.xsetroot} -name "$mutedString$dateTime"
|
||||
sleep 1
|
||||
done
|
||||
'';
|
||||
script =
|
||||
let
|
||||
pamixer = getExe pkgs.pamixer;
|
||||
xsetroot = getExe pkgs.xorg.xsetroot;
|
||||
in
|
||||
/* bash */ ''
|
||||
function update_x_root() {
|
||||
set +e # allow errors
|
||||
mute="$(${pamixer} --default-source --get-mute)"
|
||||
set -e # disallow errors
|
||||
|
||||
if [[ "$mute" == "true" ]]; then
|
||||
mutedString="Mic Muted "
|
||||
else
|
||||
mutedString=""
|
||||
fi
|
||||
|
||||
dateTime=$(date +"<-- %A, %B %d -- %H:%M -->")
|
||||
${xsetroot} -name "$mutedString$dateTime"
|
||||
}
|
||||
|
||||
trap update_x_root SIGUSR1
|
||||
|
||||
while true; do
|
||||
sleep 1 &
|
||||
wait
|
||||
update_x_root
|
||||
done
|
||||
'';
|
||||
wantedBy = [ "graphical-session.target" ];
|
||||
after = [ "pipewire.service" ];
|
||||
serviceConfig.Restart = "on-failure";
|
||||
|
|
Loading…
Reference in a new issue