renamed 'media' folder to 'assets' because it sounds cooler

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": {

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

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"

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
     '';
   };
 }

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}"];
 }

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}";
   };
 }

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
+  '';
+}

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

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"
 ''

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
 ''

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;