Compare commits

...

5 commits

Author SHA1 Message Date
adc11bc50a xrootdatetime: force update on SIGUSR1 2024-10-30 22:07:15 -07:00
b0c18c7c15 xrootdatetime: fixing crash on initial boot
xrootdatetime: trying to fix crashes
xrootdatetime: allow errors
2024-10-30 20:51:38 -07:00
28573bd36d snowhawk: umu wine 2024-10-26 15:33:20 -07:00
3a79f2d53a snowhawk: gmail brave-app 2024-10-23 16:06:41 -07:00
0830c161d1 snowhawk: wine and lutris stuff 2024-10-23 16:05:55 -07:00
4 changed files with 81 additions and 15 deletions

View file

@ -631,7 +631,8 @@
"niri": "niri", "niri": "niri",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"repo-clone": "repo-clone", "repo-clone": "repo-clone",
"sops-nix": "sops-nix" "sops-nix": "sops-nix",
"umu": "umu"
} }
}, },
"rust-analyzer-src": { "rust-analyzer-src": {
@ -687,6 +688,30 @@
"type": "github" "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": { "xwayland-satellite-stable": {
"flake": false, "flake": false,
"locked": { "locked": {

View file

@ -14,6 +14,7 @@
repo-clone.url = "git+https://git.zynh.me/Zynh0722/repo-clone"; repo-clone.url = "git+https://git.zynh.me/Zynh0722/repo-clone";
fish_theme = { url = "git+https://git.zynh.me/Zynh0722/omf-theme"; flake = false; }; 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"; }; 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 = outputs =

View file

@ -1,4 +1,4 @@
{ pkgs, config, ... }: { pkgs, config, inputs, ... }:
{ {
imports = [ imports = [
@ -39,6 +39,7 @@
apps = { apps = {
github.url = "https://github.com"; github.url = "https://github.com";
zgit.url = "https://git.zynh.me"; 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"; calendar.url = "https://calendar.google.com/calendar/u/0/r";
slack_nh.urlFile = config.sops.secrets."app_urls/nh_slack".path; slack_nh.urlFile = config.sops.secrets."app_urls/nh_slack".path;
}; };
@ -53,7 +54,29 @@
"~/obsidian" "~/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 ripgrep
unzip unzip
fzf fzf

View file

@ -44,18 +44,35 @@ in
}; };
systemd.user.services.xrootdatetime = { systemd.user.services.xrootdatetime = {
script = '' script =
while true; do let
if [[ "$(${getExe pkgs.pamixer} --default-source --get-mute)" == "true" ]]; then pamixer = getExe pkgs.pamixer;
mutedString="Mic Muted " xsetroot = getExe pkgs.xorg.xsetroot;
else in
mutedString="" /* bash */ ''
fi function update_x_root() {
dateTime=$(date +"<-- %A, %B %d -- %H:%M -->") set +e # allow errors
${getExe pkgs.xorg.xsetroot} -name "$mutedString$dateTime" mute="$(${pamixer} --default-source --get-mute)"
sleep 1 set -e # disallow errors
done
''; 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" ]; wantedBy = [ "graphical-session.target" ];
after = [ "pipewire.service" ]; after = [ "pipewire.service" ];
serviceConfig.Restart = "on-failure"; serviceConfig.Restart = "on-failure";