extern/nix-config
1
0
Fork 1
mirror of https://github.com/donovanglover/nix-config.git synced 2025-03-10 12:28:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: Improve formatting

Browse Source
This commit is contained in:
Donovan Glover 2024-04-07 10:41:16 -04:00
parent b2828a8cb3
commit c6c49b62b5
No known key found for this signature in database
GPG Key ID: EA7408A77AE1BE65
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
containers/wine.nix
View File

@ -1,9 +1,9 @@
{ nix-config, config, lib, pkgs, ... }: { nix-config, config, lib, pkgs, ... }:
let let
inherit (nix-config.inputs) sakaya; inherit (nix-config.inputs.sakaya.packages.${pkgs.system}) sakaya;
inherit (config.modules.system) username; inherit (config.modules.system) username;
inherit (lib) singleton; inherit (lib) singleton getExe;
sakayaPort = 39493; sakayaPort = 39493;
in in
@ -30,7 +30,7 @@ in
]; ];
serviceConfig = { serviceConfig = {
ExecStart = "/usr/bin/env su ${username} --command=${sakaya.packages.${pkgs.system}.sakaya}/bin/sakaya"; ExecStart = "/usr/bin/env su ${username} --command=${getExe sakaya}";
}; };
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];

19
home/hyprland.nix
View File

@ -1,16 +1,19 @@
{ pkgs, ... }: { pkgs, ... }:
let let
inherit (pkgs) polkit_gnome; inherit (pkgs) polkit_gnome callPackage;
opacity = "0.95"; opacity = "0.95";
super = "SUPER"; super = "SUPER";
hycov = callPackage ../packages/hycov.nix { };
raiseVolumeScript = "hypr/raise-volume.fish"; raiseVolumeScript = "hypr/raise-volume.fish";
lowerVolumeScript = "hypr/lower-volume.fish"; lowerVolumeScript = "hypr/lower-volume.fish";
gapsScript = "hypr/gaps.sh"; gapsScript = "hypr/gaps.sh";
randomBackgroundScript = "hypr/random-bg.fish"; randomBackgroundScript = "hypr/random-bg.fish";
swapBackgroundScript = "hypr/swap-bg.fish"; swapBackgroundScript = "hypr/swap-bg.fish";
setBackgroundScript = "hypr/set-bg.fish";
in in
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
@ -41,7 +44,7 @@ in
enable = true; enable = true;
plugins = [ plugins = [
(pkgs.callPackage ../packages/hycov.nix { }) hycov
]; ];
settings = { settings = {
@ -320,7 +323,7 @@ in
''; '';
}; };
xdg.configFile."hypr/set-bg.fish" = { xdg.configFile.${setBackgroundScript} = {
executable = true; executable = true;
text = /* fish */ '' text = /* fish */ ''
#!/usr/bin/env fish #!/usr/bin/env fish
@ -351,10 +354,8 @@ in
text = /* fish */ '' text = /* fish */ ''
#!/usr/bin/env fish #!/usr/bin/env fish
cd ~/.config/hypr
for monitor in (hyprctl monitors -j | jq -r '.[].name') for monitor in (hyprctl monitors -j | jq -r '.[].name')
./set-bg.fish "$monitor" "$(random choice $(fd . /run/current-system/sw/share/backgrounds/Spring2024FanartSubmissions --follow -e jpg -e png))" ~/.config/${setBackgroundScript} "$monitor" "$(random choice $(fd . /run/current-system/sw/share/backgrounds/Spring2024FanartSubmissions --follow -e jpg -e png))"
end end
''; '';
}; };
@ -368,10 +369,8 @@ in
set M1 "$(echo "$M" | head -n 1)" set M1 "$(echo "$M" | head -n 1)"
set M2 "$(echo "$M" | tail -n 1)" set M2 "$(echo "$M" | tail -n 1)"
cd ~/.config/hypr ~/.config/${setBackgroundScript} "$(swww query | choose 0 | choose -c 0..-1 | tail -n 1)" $M1
~/.config/${setBackgroundScript} "$(swww query | choose 0 | choose -c 0..-1 | head -n 1)" $M2
./set-bg.fish "$(swww query | choose 0 | choose -c 0..-1 | tail -n 1)" $M1
./set-bg.fish "$(swww query | choose 0 | choose -c 0..-1 | head -n 1)" $M2
''; '';
}; };

2
modules/containers.nix
View File

@ -55,7 +55,7 @@ in
hostAddress = "192.168.100.34"; hostAddress = "192.168.100.34";
localAddress = "192.168.100.49"; localAddress = "192.168.100.49";
config = { lib, pkgs, ... }: { config = { ... }: {
imports = [ imports = [
../containers ../containers
../containers/wine.nix ../containers/wine.nix