From 4711456fb1339febee0e266bdebb70b2c1ce0231 Mon Sep 17 00:00:00 2001 From: pagedmov Date: Mon, 21 Oct 2024 22:03:39 -0400 Subject: [PATCH] renamed 'media' folder to 'assets' because it sounds cooler --- assets/images/nixos-logo.png | Bin 0 -> 28684 bytes {media => assets}/screens/desktop.png | Bin {media => assets}/screens/keyring.gif | Bin {media => assets}/sound/backspace.wav | Bin {media => assets}/sound/bell.wav | Bin {media => assets}/sound/cd.wav | Bin {media => assets}/sound/collectgarbage.wav | Bin {media => assets}/sound/enter.wav | Bin {media => assets}/sound/error.wav | Bin {media => assets}/sound/gitcommit.wav | Bin {media => assets}/sound/gitpush.wav | Bin {media => assets}/sound/login.wav | Bin {media => assets}/sound/ls.wav | Bin {media => assets}/sound/move_h.wav | Bin {media => assets}/sound/move_v.wav | Bin {media => assets}/sound/nixswitch-start.wav | Bin {media => assets}/sound/rm.wav | Bin {media => assets}/sound/screenshot.wav | Bin {media => assets}/sound/sh-source.wav | Bin {media => assets}/sound/ssh.wav | Bin {media => assets}/sound/update.wav | Bin {media => assets}/sound/update_alt.wav | Bin {media => assets}/sound/warning.wav | Bin {media => assets}/wallpapers/cabin-2.jpg | Bin .../wallpapers/catppuccin/cat-leaves.png | Bin .../catppuccin/nixos-catppuccin.png | Bin .../wallpapers/catppuccin/nixos_blue.png | Bin {media => assets}/wallpapers/cloud.png | Bin {media => assets}/wallpapers/dark-waves.jpg | Bin {media => assets}/wallpapers/evening-sky.png | Bin .../wallpapers/nord-balloons.png | Bin .../wallpapers/purpled-night.jpg | Bin {media => assets}/wallpapers/sine.png | Bin {media => assets}/wallpapers/train.jpg | Bin flake.lock | 62 ++++----- flake.nix | 2 +- modules/home/environment/hyprland/config.nix | 2 +- modules/home/environment/zshell.nix | 6 +- modules/home/home-manager.nix | 2 +- modules/home/programs/git.nix | 6 +- modules/home/scripts/commands/movfetch.nix | 118 ++++++++++++++++++ modules/home/scripts/nix/chscheme.nix | 1 + modules/home/scripts/nix/garbage-collect.nix | 4 +- modules/home/scripts/nix/rebuild.nix | 6 +- modules/sys/environment/stylix.nix | 2 +- 45 files changed, 165 insertions(+), 46 deletions(-) create mode 100644 assets/images/nixos-logo.png rename {media => assets}/screens/desktop.png (100%) rename {media => assets}/screens/keyring.gif (100%) rename {media => assets}/sound/backspace.wav (100%) rename {media => assets}/sound/bell.wav (100%) rename {media => assets}/sound/cd.wav (100%) rename {media => assets}/sound/collectgarbage.wav (100%) rename {media => assets}/sound/enter.wav (100%) rename {media => assets}/sound/error.wav (100%) rename {media => assets}/sound/gitcommit.wav (100%) rename {media => assets}/sound/gitpush.wav (100%) rename {media => assets}/sound/login.wav (100%) rename {media => assets}/sound/ls.wav (100%) rename {media => assets}/sound/move_h.wav (100%) rename {media => assets}/sound/move_v.wav (100%) rename {media => assets}/sound/nixswitch-start.wav (100%) rename {media => assets}/sound/rm.wav (100%) rename {media => assets}/sound/screenshot.wav (100%) rename {media => assets}/sound/sh-source.wav (100%) rename {media => assets}/sound/ssh.wav (100%) rename {media => assets}/sound/update.wav (100%) rename {media => assets}/sound/update_alt.wav (100%) rename {media => assets}/sound/warning.wav (100%) rename {media => assets}/wallpapers/cabin-2.jpg (100%) rename {media => assets}/wallpapers/catppuccin/cat-leaves.png (100%) rename {media => assets}/wallpapers/catppuccin/nixos-catppuccin.png (100%) rename {media => assets}/wallpapers/catppuccin/nixos_blue.png (100%) rename {media => assets}/wallpapers/cloud.png (100%) rename {media => assets}/wallpapers/dark-waves.jpg (100%) rename {media => assets}/wallpapers/evening-sky.png (100%) rename {media => assets}/wallpapers/nord-balloons.png (100%) rename {media => assets}/wallpapers/purpled-night.jpg (100%) rename {media => assets}/wallpapers/sine.png (100%) rename {media => assets}/wallpapers/train.jpg (100%) create mode 100644 modules/home/scripts/commands/movfetch.nix diff --git a/assets/images/nixos-logo.png b/assets/images/nixos-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..acbaad447a878c1a51db324ed07d8e938cb38127 GIT binary patch literal 28684 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 t;*$ABo- literal 0 HcmV?d00001 diff --git a/media/screens/desktop.png b/assets/screens/desktop.png similarity index 100% rename from media/screens/desktop.png rename to assets/screens/desktop.png diff --git a/media/screens/keyring.gif b/assets/screens/keyring.gif similarity index 100% rename from media/screens/keyring.gif rename to assets/screens/keyring.gif diff --git a/media/sound/backspace.wav b/assets/sound/backspace.wav similarity index 100% rename from media/sound/backspace.wav rename to assets/sound/backspace.wav diff --git a/media/sound/bell.wav b/assets/sound/bell.wav similarity index 100% rename from media/sound/bell.wav rename to assets/sound/bell.wav diff --git a/media/sound/cd.wav b/assets/sound/cd.wav similarity index 100% rename from media/sound/cd.wav rename to assets/sound/cd.wav diff --git a/media/sound/collectgarbage.wav b/assets/sound/collectgarbage.wav similarity index 100% rename from media/sound/collectgarbage.wav rename to assets/sound/collectgarbage.wav diff --git a/media/sound/enter.wav b/assets/sound/enter.wav similarity index 100% rename from media/sound/enter.wav rename to assets/sound/enter.wav diff --git a/media/sound/error.wav b/assets/sound/error.wav similarity index 100% rename from media/sound/error.wav rename to assets/sound/error.wav diff --git a/media/sound/gitcommit.wav b/assets/sound/gitcommit.wav similarity index 100% rename from media/sound/gitcommit.wav rename to assets/sound/gitcommit.wav diff --git a/media/sound/gitpush.wav b/assets/sound/gitpush.wav similarity index 100% rename from media/sound/gitpush.wav rename to assets/sound/gitpush.wav diff --git a/media/sound/login.wav b/assets/sound/login.wav similarity index 100% rename from media/sound/login.wav rename to assets/sound/login.wav diff --git a/media/sound/ls.wav b/assets/sound/ls.wav similarity index 100% rename from media/sound/ls.wav rename to assets/sound/ls.wav diff --git a/media/sound/move_h.wav b/assets/sound/move_h.wav similarity index 100% rename from media/sound/move_h.wav rename to assets/sound/move_h.wav diff --git a/media/sound/move_v.wav b/assets/sound/move_v.wav similarity index 100% rename from media/sound/move_v.wav rename to assets/sound/move_v.wav diff --git a/media/sound/nixswitch-start.wav b/assets/sound/nixswitch-start.wav similarity index 100% rename from media/sound/nixswitch-start.wav rename to assets/sound/nixswitch-start.wav diff --git a/media/sound/rm.wav b/assets/sound/rm.wav similarity index 100% rename from media/sound/rm.wav rename to assets/sound/rm.wav diff --git a/media/sound/screenshot.wav b/assets/sound/screenshot.wav similarity index 100% rename from media/sound/screenshot.wav rename to assets/sound/screenshot.wav diff --git a/media/sound/sh-source.wav b/assets/sound/sh-source.wav similarity index 100% rename from media/sound/sh-source.wav rename to assets/sound/sh-source.wav diff --git a/media/sound/ssh.wav b/assets/sound/ssh.wav similarity index 100% rename from media/sound/ssh.wav rename to assets/sound/ssh.wav diff --git a/media/sound/update.wav b/assets/sound/update.wav similarity index 100% rename from media/sound/update.wav rename to assets/sound/update.wav diff --git a/media/sound/update_alt.wav b/assets/sound/update_alt.wav similarity index 100% rename from media/sound/update_alt.wav rename to assets/sound/update_alt.wav diff --git a/media/sound/warning.wav b/assets/sound/warning.wav similarity index 100% rename from media/sound/warning.wav rename to assets/sound/warning.wav diff --git a/media/wallpapers/cabin-2.jpg b/assets/wallpapers/cabin-2.jpg similarity index 100% rename from media/wallpapers/cabin-2.jpg rename to assets/wallpapers/cabin-2.jpg diff --git a/media/wallpapers/catppuccin/cat-leaves.png b/assets/wallpapers/catppuccin/cat-leaves.png similarity index 100% rename from media/wallpapers/catppuccin/cat-leaves.png rename to assets/wallpapers/catppuccin/cat-leaves.png diff --git a/media/wallpapers/catppuccin/nixos-catppuccin.png b/assets/wallpapers/catppuccin/nixos-catppuccin.png similarity index 100% rename from media/wallpapers/catppuccin/nixos-catppuccin.png rename to assets/wallpapers/catppuccin/nixos-catppuccin.png diff --git a/media/wallpapers/catppuccin/nixos_blue.png b/assets/wallpapers/catppuccin/nixos_blue.png similarity index 100% rename from media/wallpapers/catppuccin/nixos_blue.png rename to assets/wallpapers/catppuccin/nixos_blue.png diff --git a/media/wallpapers/cloud.png b/assets/wallpapers/cloud.png similarity index 100% rename from media/wallpapers/cloud.png rename to assets/wallpapers/cloud.png diff --git a/media/wallpapers/dark-waves.jpg b/assets/wallpapers/dark-waves.jpg similarity index 100% rename from media/wallpapers/dark-waves.jpg rename to assets/wallpapers/dark-waves.jpg diff --git a/media/wallpapers/evening-sky.png b/assets/wallpapers/evening-sky.png similarity index 100% rename from media/wallpapers/evening-sky.png rename to assets/wallpapers/evening-sky.png diff --git a/media/wallpapers/nord-balloons.png b/assets/wallpapers/nord-balloons.png similarity index 100% rename from media/wallpapers/nord-balloons.png rename to assets/wallpapers/nord-balloons.png diff --git a/media/wallpapers/purpled-night.jpg b/assets/wallpapers/purpled-night.jpg similarity index 100% rename from media/wallpapers/purpled-night.jpg rename to assets/wallpapers/purpled-night.jpg diff --git a/media/wallpapers/sine.png b/assets/wallpapers/sine.png similarity index 100% rename from media/wallpapers/sine.png rename to assets/wallpapers/sine.png diff --git a/media/wallpapers/train.jpg b/assets/wallpapers/train.jpg similarity index 100% rename from media/wallpapers/train.jpg rename to assets/wallpapers/train.jpg diff --git a/flake.lock b/flake.lock index 9a28c72..15ce888 100644 --- a/flake.lock +++ b/flake.lock @@ -275,11 +275,11 @@ ] }, "locked": { - "lastModified": 1728778939, - "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=", + "lastModified": 1729104314, + "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "ff68f91754be6f3427e4986d7949e6273659be1d", + "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", "type": "github" }, "original": { @@ -356,11 +356,11 @@ ] }, "locked": { - "lastModified": 1729260213, - "narHash": "sha256-jAvHoU/1y/yCuXzr2fNF+q6uKmr8Jj2xgAisK4QB9to=", + "lastModified": 1729459288, + "narHash": "sha256-gBOVJv+q6Mx8jGvwX7cE6J8+sZmi1uxpRVsO7WxvVuQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "09a0c0c02953318bf94425738c7061ffdc4cba75", + "rev": "1e27f213d77fc842603628bcf2df6681d7d08f7e", "type": "github" }, "original": { @@ -377,11 +377,11 @@ ] }, "locked": { - "lastModified": 1728903686, - "narHash": "sha256-ZHFrGNWDDriZ4m8CA/5kDa250SG1LiiLPApv1p/JF0o=", + "lastModified": 1729260213, + "narHash": "sha256-jAvHoU/1y/yCuXzr2fNF+q6uKmr8Jj2xgAisK4QB9to=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1aec543f5caf643ca0d94b6a633101942fd065f", + "rev": "09a0c0c02953318bf94425738c7061ffdc4cba75", "type": "github" }, "original": { @@ -472,11 +472,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1729195555, - "narHash": "sha256-nTMzcwH5eFX2JM5Lrtw1469BRe6hGgWWxLqJBynEdvo=", + "lastModified": 1729523354, + "narHash": "sha256-iRLBeVWU6rbMruacoMOJ6y+mgTVMWng4T8JYnIPgsSE=", "ref": "refs/heads/main", - "rev": "0e630e9e74ad34683194a07cfe6afe55a2c0685f", - "revCount": 5352, + "rev": "9df0f0b66c66706c9ce8cf9f80e834d5abfc1e96", + "revCount": 5364, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -749,11 +749,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1729070438, - "narHash": "sha256-KOTTUfPkugH52avUvXGxvWy8ibKKj4genodIYUED+Kc=", + "lastModified": 1729256560, + "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5785b6bb5eaae44e627d541023034e1601455827", + "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", "type": "github" }, "original": { @@ -794,11 +794,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1729196897, - "narHash": "sha256-xftdQl0kxWJZNWCDSl0pU2E7zCmGjhD/N9ZWgPXK0A0=", + "lastModified": 1729530157, + "narHash": "sha256-JDIlU1gr60xmgKlq2WRf9cgJytljUoErrGHvxDEnY6I=", "owner": "nix-community", "repo": "nixvim", - "rev": "3c7b6ae5d1524c691a1b65f7290facd0dc296e40", + "rev": "5992a2282193d0d9ef35a63610cd2ee4353dcc2d", "type": "github" }, "original": { @@ -809,11 +809,11 @@ }, "nur": { "locked": { - "lastModified": 1729281115, - "narHash": "sha256-YaBFkGK8lBBEYM0TcX8W3Uea9Jdue+YNuCxzOG97sn0=", + "lastModified": 1729525671, + "narHash": "sha256-/pZSi3LBtztMfOJti72FOj3OBJvsCb1N/d9Jl5L04fI=", "owner": "nix-community", "repo": "NUR", - "rev": "1d80aab638867aeada9aaabaa1f17c520918fc29", + "rev": "305d127d2f03fb412de348455a3175df9e66cd04", "type": "github" }, "original": { @@ -889,11 +889,11 @@ ] }, "locked": { - "lastModified": 1729225092, - "narHash": "sha256-qIWFU7iVs5oTA12jOgHIMlXLY+V1dbdgjt37bbXfwOI=", + "lastModified": 1729484282, + "narHash": "sha256-VnLaP3OH9rP/+5ZuEsETSyyKtBif5l3mNL3YOxPhBVo=", "owner": "gerg-l", "repo": "spicetify-nix", - "rev": "095be8b3a9bb9ec14cbe67cc4710f5e224639da5", + "rev": "7dcfbba64faedd15574e6df5d89b2bcf5bb20128", "type": "github" }, "original": { @@ -919,11 +919,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1728900372, - "narHash": "sha256-hmG/u7qZEm7CTh1XPDi+pg4Oi0nNrv7sL8PgZDRe6wg=", + "lastModified": 1729380793, + "narHash": "sha256-TV6NYBUqTHI9t5fqNu4Qyr4BZUD2yGxAn3E+d5/mqaI=", "owner": "danth", "repo": "stylix", - "rev": "33a2eff15181e557bb6dd9d2073b90f7d218975d", + "rev": "fb9399b7e2c855f42dae76a363bab28d4f24aa8d", "type": "github" }, "original": { @@ -1049,11 +1049,11 @@ ] }, "locked": { - "lastModified": 1727984844, - "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=", + "lastModified": 1729242555, + "narHash": "sha256-6jWSWxv2crIXmYSEb3LEVsFkCkyVHNllk61X4uhqfCs=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64", + "rev": "d986489c1c757f6921a48c1439f19bfb9b8ecab5", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 55e7ffa..1a0e7b3 100644 --- a/flake.nix +++ b/flake.nix @@ -41,7 +41,7 @@ } @ inputs: let system = "x86_64-linux"; username = "pagedmov"; - wallpaper = "${self}/media/wallpapers/nord-balloons.png"; + wallpaper = "${self}/assets/wallpapers/dark-waves.jpg"; base16scheme = "nord"; # can be easily changed with the chscheme script # Map colors from yaml to attribute set diff --git a/modules/home/environment/hyprland/config.nix b/modules/home/environment/hyprland/config.nix index 5e59596..55126c7 100644 --- a/modules/home/environment/hyprland/config.nix +++ b/modules/home/environment/hyprland/config.nix @@ -156,7 +156,7 @@ "super, e, exec, [float;size 45% 70%;move 10 50] kitty btop" "super, n, exec, [float;size 50% 35%;move 10 50] pavucontrol" "super, p, exec, [float;size 25% 30%;move onscreen cursor 20 20] [ ! -f /tmp/passhelperfile ] && kitty passhelper" - "super, 0, exec, aplay ~/media/sound/soundtest.wav" + "super, 0, exec, aplay ~/assets/sound/soundtest.wav" "super shift, q, exit," "super, m, exec, fuzzel" "super, r, exec, neovide" diff --git a/modules/home/environment/zshell.nix b/modules/home/environment/zshell.nix index 1836286..0993cf5 100644 --- a/modules/home/environment/zshell.nix +++ b/modules/home/environment/zshell.nix @@ -63,7 +63,7 @@ unalias ls ls() { eza -1 --group-directories-first --icons "$@" - scheck && runbg aplay ${self}/media/sound/ls.wav + scheck && runbg aplay ${self}/assets/sound/ls.wav } y() { @@ -80,7 +80,7 @@ eza -1 --group-directories-first --icons "$@" builtin cd "$@" || exit export SOUNDS_ENABLED=1 - scheck && runbg aplay ${self}/media/sound/cd.wav + scheck && runbg aplay ${self}/assets/sound/cd.wav } if [ ! -e $HOME/.zsh_history ]; then touch $HOME/.zsh_history @@ -126,7 +126,7 @@ unalias ls clear splash - scheck && runbg aplay ${self}/media/sound/sh-source.wav + scheck && runbg aplay ${self}/assets/sound/sh-source.wav ''; }; } diff --git a/modules/home/home-manager.nix b/modules/home/home-manager.nix index 34e7b16..8ffc4d0 100644 --- a/modules/home/home-manager.nix +++ b/modules/home/home-manager.nix @@ -51,7 +51,7 @@ in { }; }; security.sudo.extraConfig = '' - ${username} ALL=(ALL) NOPASSWD: /etc/profiles/per-user/pagedmov/bin/rebuild + ${username} ALL=(ALL) NOPASSWD: /etc/profiles/per-user/${username}/bin/rebuild ''; nix.settings.allowed-users = ["${username}"]; } diff --git a/modules/home/programs/git.nix b/modules/home/programs/git.nix index 060ba6c..c740392 100644 --- a/modules/home/programs/git.nix +++ b/modules/home/programs/git.nix @@ -1,7 +1,7 @@ -{...}: { +{username, ...}: { programs.git = { enable = true; - userEmail = "pagedmov@gmail.com"; - userName = "pagedmov"; + userEmail = "${username}@gmail.com"; + userName = "${username}"; }; } diff --git a/modules/home/scripts/commands/movfetch.nix b/modules/home/scripts/commands/movfetch.nix new file mode 100644 index 0000000..64f181f --- /dev/null +++ b/modules/home/scripts/commands/movfetch.nix @@ -0,0 +1,118 @@ +{ + self, + pkgs, + ... +}: +{ + home.file.".config/neofetch/config".text = '' +username=$(whoami) +name_length=''${#username} +total_width=40 +side_length=$(( (total_width - name_length - 2) / 2 )) + +top_line=$(printf "─%.0s" $(seq 1 $side_length)) +top_line="$top_line $username " +top_line+=$(printf "─%.0s" $(seq 1 $side_length)) + +if (( (total_width - name_length) % 2 != 0 )); then + top_line+="─" +fi + +print_info() { + prin "┌$top_line┐" + info " ​ ​  " distro + info " ​ ​  " kernel + info " ​ ​  " wm + info " ​ ​  " shell + info " ​ ​  " term + info " ​ ​  " term_font + info " ​ ​ 󰏗 " packages + prin "└────────────────────────────────────────┘" + info cols +prin "\n \n \n \n \n ''${cl3} \n \n ''${cl5} \n \n ''${cl2} \n \n ''${cl6} \n \n ''${cl4} \n \n ''${cl1} \n \n ''${cl7} \n \n ''${cl0}" +} + +kernel_shorthand="on" +distro_shorthand="on" +os_arch="off" +uptime_shorthand="on" +memory_percent="on" +package_managers="off" +shell_path="off" +shell_version="on" +speed_type="bios_limit" +speed_shorthand="on" +gtk_shorthand="on" +gtk2="on" +gtk3="on" +colors=(distro) +bold="on" +underline_enabled="on" +underline_char="-" +separator="  " +color_blocks="off" +block_range=(0 15) # Colorblocks + +# Colors for custom colorblocks +magenta="\033[1;35m" +green="\033[1;32m" +white="\033[1;37m" +blue="\033[1;34m" +red="\033[1;31m" +black="\033[1;40;30m" +yellow="\033[1;33m" +cyan="\033[1;36m" +reset="\033[0m" +bgyellow="\033[1;43;33m" +bgwhite="\033[1;47;37m" +cl0="''${reset}" +cl1="''${magenta}" +cl2="''${green}" +cl3="''${white}" +cl4="''${blue}" +cl5="''${red}" +cl6="''${yellow}" +cl7="''${cyan}" +cl8="''${black}" +cl9="''${bgyellow}" +cl10="''${bgwhite}" + +block_width=4 +block_height=1 + +bar_char_elapsed="-" +bar_char_total="=" +bar_border="on" +bar_length=15 +bar_color_elapsed="distro" +bar_color_total="distro" + +cpu_display="on" +memory_display="on" +battery_display="on" +disk_display="on" + +image_backend="kitty" +image_source="${self}/assets/images/nixos-logo.png" +image_size="250px" +image_loop="off" + +aascii_distro="auto" +ascii_colors=(distro) +ascii_bold="on" + +crop_mode="normal" +crop_offset="center" + +gap=2 + +yoffset=0 +xoffset=0 + +stdout="off" + ''; + + movfetch = pkgs.writeShellScriptBin "movfetch" '' + neofetch --config $HOME/.config/neofetch/config + ''; +} diff --git a/modules/home/scripts/nix/chscheme.nix b/modules/home/scripts/nix/chscheme.nix index 6036e31..9a99452 100644 --- a/modules/home/scripts/nix/chscheme.nix +++ b/modules/home/scripts/nix/chscheme.nix @@ -14,6 +14,7 @@ pkgs.writeShellScriptBin "chscheme" '' printf "\033[48;2;%d;%d;%dm %-20s %s \033[0m\n" $r $g $b $key $clean_value; \ fi; \ done' | xargs -I {} sed -i '/base16scheme \=/s/\".*\"/\"{}\"/' "$HOME"/.sysflake/flake.nix && \ + [[ $? -ne 0 ]] && echo "Aborting color scheme change." && exit 0 echo "Successfully changed system color scheme. Rebuild now?" && \ select choice in "Yes" "No"; do case $choice in diff --git a/modules/home/scripts/nix/garbage-collect.nix b/modules/home/scripts/nix/garbage-collect.nix index 335a3e8..5c4924b 100644 --- a/modules/home/scripts/nix/garbage-collect.nix +++ b/modules/home/scripts/nix/garbage-collect.nix @@ -10,7 +10,7 @@ pkgs.writeShellScriptBin "garbage-collect" '' echo -e "\033[1;4;38;2;243;139;168mThis process is irreversible.\033[0m Are you sure?" select yn in "Yes" "No"; do case $yn in - Yes ) echo "Sweeping system...";scheck && runbg aplay "$HOME/media/sound/sys/collectgarbage.wav";break;; + Yes ) echo "Sweeping system...";scheck && runbg aplay "$HOME/assets/sound/sys/collectgarbage.wav";break;; No ) echo "Canceling garbage collection."; return;; esac done @@ -28,5 +28,5 @@ pkgs.writeShellScriptBin "garbage-collect" '' fi total_freed=$(echo "$nix_freed + $rm_freed" | bc) echo -e "System cleaning complete, freed \033[1;4;38;2;166;227;161m$total_freed MiB\033[0m in total" - scheck && runbg aplay "$HOME/media/sound/sys/rm.wav" + scheck && runbg aplay "$HOME/assets/sound/sys/rm.wav" '' diff --git a/modules/home/scripts/nix/rebuild.nix b/modules/home/scripts/nix/rebuild.nix index d2ad126..df8580a 100644 --- a/modules/home/scripts/nix/rebuild.nix +++ b/modules/home/scripts/nix/rebuild.nix @@ -6,13 +6,13 @@ pkgs.writeShellScriptBin "rebuild" '' #!/run/current-system/sw/bin/bash - scheck && runbg aplay ${self}/media/sound/nixswitch-start.wav + scheck && runbg aplay ${self}/assets/sound/nixswitch-start.wav set -e nh os switch -H ${host} $HOME/.sysflake sudo nixos-rebuild switch --flake "$HOME/.sysflake#${host}" if [ $? -eq 0 ]; then - scheck && runbg aplay ${self}/media/sound/update.wav + scheck && runbg aplay ${self}/assets/sound/update.wav else - scheck && runbg aplay ${self}/media/sound/error.wav + scheck && runbg aplay ${self}/assets/sound/error.wav fi '' diff --git a/modules/sys/environment/stylix.nix b/modules/sys/environment/stylix.nix index fce2339..31f45c5 100644 --- a/modules/sys/environment/stylix.nix +++ b/modules/sys/environment/stylix.nix @@ -12,7 +12,7 @@ image = wallpaper; polarity = "dark"; autoEnable = true; - opacity.terminal = 0.95; + opacity.terminal = 0.30; targets = { console.enable = true; feh.enable = true;