diff --git a/home-manager/users/nathan/dotfiles/hyprpanel/config.json b/home-manager/users/nathan/dotfiles/hyprpanel/config.json index 2e25967..1e2004f 100644 --- a/home-manager/users/nathan/dotfiles/hyprpanel/config.json +++ b/home-manager/users/nathan/dotfiles/hyprpanel/config.json @@ -3,7 +3,7 @@ "theme.font.label": "FiraCode Nerd Font Mono Medium", "theme.bar.floating": true, "bar.layouts": { - "0": { + "*": { "left": [ "dashboard", "workspaces", @@ -28,40 +28,10 @@ "notifications", "power" ] - }, - "1": { - "left": [ - "dashboard", - "workspaces", - "windowtitle" - ], - "middle": [ - "media" - ], - "right": [ - "volume", - "clock", - "notifications" - ] - }, - "2": { - "left": [ - "dashboard", - "workspaces", - "windowtitle" - ], - "middle": [ - "media" - ], - "right": [ - "volume", - "clock", - "notifications" - ] } }, "theme.bar.opacity": 50, - "wallpaper.image": "/nix/store/ph7zbz3pfc1z3yr8blyp2gvmpd111hnm-hm_Wallpaper/bluescape.jpg", + "wallpaper.image": "/tmp/nathan/bg", "wallpaper.enable": true, "theme.matugen_settings.scheme_type": "content", "theme.matugen_settings.variation": "standard_2", @@ -69,6 +39,7 @@ "bar.launcher.autoDetectIcon": true, "bar.network.truncation_size": 10, "bar.bluetooth.label": false, + "bar.clock.showIcon": false, "bar.clock.format": "%A %H:%M:%S %m/%d/%C%y", "bar.notifications.show_total": true, "bar.notifications.hideCountWhenZero": true, @@ -91,4 +62,4 @@ "bar.workspaces.ignored": "-\\d+", "menus.clock.time.military": true, "menus.clock.weather.enabled": false -} \ No newline at end of file +} diff --git a/home-manager/users/nathan/packages/scripts/default.nix b/home-manager/users/nathan/packages/scripts/default.nix index d398f6e..2f3d8be 100644 --- a/home-manager/users/nathan/packages/scripts/default.nix +++ b/home-manager/users/nathan/packages/scripts/default.nix @@ -24,21 +24,38 @@ '') (pkgs.writeShellScriptBin "setWallpaper" '' - img=''$(realpath ''${1:-~/.config/background}) - chmod 600 ~/.config/background + if [[ ! -d /tmp/nathan ]]; then + mkdir /tmp/nathan + fi + + if [[ ! -f /tmp/nathan/bg ]]; then + cp ${config.home.homeDirectory}/Pictures/Wallpaper/bluescape.jpg /tmp/nathan/bg + chmod 600 /tmp/nathan/bg + fi + img=''$(realpath ''${1:-/tmp/nathan/bg}) ${pkgs.hyprpanel}/bin/hyprpanel sw ''$img changeColors ''$img ''$2 '') +# ${pkgs.swww}/bin/swww img ''$img (pkgs.writeShellScriptBin "changeColors" '' - if [[ ! -f ~/.config/bga ]]; then - echo 100 > ~/.config/bga - fi + if [[ ! -d /tmp/nathan ]]; then + mkdir /tmp/nathan + fi - alpha=''${2:-`cat ~/.config/bga`} + if [[ ! -f /tmp/nathan/bg ]]; then + cp ${config.home.homeDirectory}/Pictures/Wallpaper/bluescape.jpg /tmp/nathan/bg + chmod 600 /tmp/nathan/bg + fi - img=''$(realpath ''${1:-~/.config/background}) + if [[ ! -f /tmp/nathan/bga ]]; then + echo 70 > /tmp/nathan/bga + fi + + alpha=''${2:-`cat /tmp/nathan/bga`} + + img=''$(realpath ''${1:-/tmp/nathan/bg}) if [[ $alpha -lt 0 ]]; then $alpha=0 @@ -50,7 +67,8 @@ ${pkgs.pywal16}/bin/wal -i $img -a $alpha --cols16 -n - echo $alpha > ~/.config/bga + echo $alpha > /tmp/nathan/bga + cp $img /tmp/nathan/bg sleep 0.4 @@ -65,14 +83,25 @@ (pkgs.writeShellScriptBin "onSystemStart" '' - if [[ ! -f ${config.home.homeDirectory}/.config/background ]]; then - cp ${config.home.homeDirectory}/Pictures/Wallpaper/bluescape.jpg ${config.home.homeDirectory}/.config/background - chmod 600 ${config.home.homeDirectory}/.config/background + + if [[ ! -d /tmp/nathan ]]; then + mkdir /tmp/nathan fi + + if [[ ! -f /tmp/nathan/bg ]]; then + cp ${config.home.homeDirectory}/Pictures/Wallpaper/bluescape.jpg /tmp/nathan/bg + chmod 600 /tmp/nathan/bg + fi + + if [[ ! -f /tmp/nathan/bga ]]; then + echo 70 > /tmp/nathan/bga + fi + if [[ -f ${config.home.homeDirectory}/.local/share/calcurse/.calcurse.pid ]]; then rm ${config.home.homeDirectory}/.local/share/calcurse/.calcurse.pid fi - hyprctl dispatch exec "setWallpaper ${config.home.homeDirectory}/.config/background" + + hyprctl dispatch exec "setWallpaper /tmp/nathan/bg" hyprctl dispatch exec ${pkgs.pyprland}/bin/pypr hyprctl dispatch exec ${pkgs.netbird-ui}/bin/netbird-ui