diff --git a/flake.lock b/flake.lock index 5fe3161..20a4ed4 100644 --- a/flake.lock +++ b/flake.lock @@ -346,11 +346,11 @@ ] }, "locked": { - "lastModified": 1728598744, - "narHash": "sha256-sSfvyO5xH3HObHHmh6lp/hcvo7tMjFKd/HXpxyrRnoE=", + "lastModified": 1728685293, + "narHash": "sha256-1WowL96pksT/XCi+ZXHgqiQ9NiU5oxWuNIQYWqOoEYc=", "owner": "nix-community", "repo": "home-manager", - "rev": "342a1d682386d3a1d74f9555cb327f2f311dda6e", + "rev": "2b13611eaed8326789f76f70d21d06fbb14e3e47", "type": "github" }, "original": { @@ -442,11 +442,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1728640579, - "narHash": "sha256-jaUDVs2vKdLLC/NCgQahnFQHGHL6HmDrwLMfxKshj3M=", + "lastModified": 1728645556, + "narHash": "sha256-Nio2vUxaya04xlvY24sPTOWz+mmDwgRgrBSU4Vx485Y=", "ref": "refs/heads/main", - "rev": "d655a10381f01212635f2eadd69e1f22930f8f06", - "revCount": 5326, + "rev": "7564b26b7d386d248eaa47c1a481c09eefd8e3ca", + "revCount": 5328, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" diff --git a/glasshouse-desktop/home/scripts/scripts/garbage-collect.sh b/glasshouse-desktop/home/scripts/scripts/garbage-collect.sh index 913c3ca..10e0337 100755 --- a/glasshouse-desktop/home/scripts/scripts/garbage-collect.sh +++ b/glasshouse-desktop/home/scripts/scripts/garbage-collect.sh @@ -14,7 +14,7 @@ output=$(nix-collect-garbage | tee /dev/tty) nix_freed=$(echo "$output" | grep -oP '\d+(\.\d+)? MiB freed' | cut -d' ' -f1) if [ "$(ls -A ~/.local/share/Trash/files/ 2>/dev/null)" ]; then - rm_freed=$(du ~/.local/share/Trash/files 2> /dev/null) + rm_freed=$(du ~/.local/share/Trash/files 2> /dev/null | awk '{print $1}') rm_freed=$(echo "scale=2; $rm_freed / 1000" | bc) /run/current-system/sw/bin/rm -rfv ~/.local/share/Trash/files mkdir ~/.local/share/Trash/files diff --git a/glasshouse-desktop/home/starship.nix b/glasshouse-desktop/home/starship.nix index 2e76268..263e47b 100644 --- a/glasshouse-desktop/home/starship.nix +++ b/glasshouse-desktop/home/starship.nix @@ -5,11 +5,13 @@ enable = true; enableZshIntegration = false; settings = { -# right_format = "$cmd_duration"; + # right_format = ""; format = lib.concatStrings [ - "($username)(bold white)" - "($directory)" + "($username)(bold white)($cmd_duration)($character)$line_break" + "($git_branch)($git_status)$line_break" + "($directory)$line_break" + "[  ](bold #89b4fa)" ]; @@ -24,18 +26,24 @@ }; character = { - success_symbol = "[ ](bold #89b4fa)[ ➜](bold green)"; - error_symbol = "[ ](bold #89b4fa)[ ➜](bold red)"; + success_symbol = "[ -> ](bold green)"; + error_symbol = "[ -> ✗](bold red)"; # error_symbol = "[ ](bold #89dceb)[ ✗](bold red)"; }; cmd_duration = { - format = "[󰔛 $duration]($style)"; + format = "[ 󰔛 $duration]($style)"; disabled = false; style = "bg:none fg:#f9e2af"; show_notifications = false; min_time_to_notify = 60000; - }; + }; + git_branch = { + format = "on [$symbol$branch](bold purple)"; + symbol = " "; + truncation_length = 15; + style = "bold purple"; + }; palette = "catppuccin_mocha"; } // builtins.fromTOML (builtins.readFile "${inputs.catppuccin-starship}/themes/mocha.toml");