refactored

for 26.05

home-manager/init.nix

@@ -8,33 +8,11 @@
   ...
 }: {
   home.activation.HyprlandDots = lib.hm.dag.entryAfter ["linkGeneration"] ''
-    set -euo pipefail
-    umask 022
-    repo=${lib.escapeShellArg hyprlanddots}
-    nvimrepo=${lib.escapeShellArg nvimDots}
-    dmsConfig="${dankMaterialShell}/etc/xdg/quickshell/dms"
-    mkdir -p "${config.xdg.configHome}"
-    copy_dir() {
-      src="$1"; dest="$2"; skip="''${3:-true}"
-      [ -d "$src" ] || return 0
-      [ "$skip" = "true" ] && [ -e "$dest" ] && return 0
-      mkdir -p "$dest"
-      if [ -x ${pkgs.rsync}/bin/rsync ]; then
-        ${pkgs.rsync}/bin/rsync -rlD \
-          --chmod=Du=rwx,Dgo=rx,Fu=rw,Fgo=r \
-          -- "$src"/ "$dest"/
-      else
-        cp -R -P --no-preserve=mode,ownership,timestamps -- "$src"/. "$dest"/
-      fi
-      chmod -R u+rwX "$dest"
-    }
-    copy_dir "$repo/fish"       "${config.xdg.configHome}/fish"
-    copy_dir "$repo/hypr"       "${config.xdg.configHome}/hypr"
-    copy_dir "$repo/cava"       "${config.xdg.configHome}/cava"
-    copy_dir "$nvimrepo"        "${config.xdg.configHome}/nvim"
-    copy_dir "$dmsConfig"       "${config.xdg.configHome}/quickshell" "false"
-    if [ -f "$repo/starship.toml" ] && [ ! -e "${config.xdg.configHome}/starship.toml" ]; then
-      install -Dm0644 "$repo/starship.toml" "${config.xdg.configHome}/starship.toml"
-    fi
+    ${pkgs.rsync}/bin/rsync -rlD --ignore-existing "${hyprlanddots}/fish/"    "${config.xdg.configHome}/fish/"
+    ${pkgs.rsync}/bin/rsync -rlD --ignore-existing "${hyprlanddots}/hypr/"    "${config.xdg.configHome}/hypr/"
+    ${pkgs.rsync}/bin/rsync -rlD --ignore-existing "${hyprlanddots}/cava/"    "${config.xdg.configHome}/cava/"
+    ${pkgs.rsync}/bin/rsync -rlD --ignore-existing "${nvimDots}/"             "${config.xdg.configHome}/nvim/"
+    ${pkgs.rsync}/bin/rsync -rlD --ignore-existing "${dankMaterialShell}/etc/xdg/quickshell/dms/" "${config.xdg.configHome}/quickshell/"
+    ${pkgs.rsync}/bin/rsync -rlD --ignore-existing "${hyprlanddots}/starship.toml" "${config.xdg.configHome}/starship.toml"
   '';
 }

home-manager/modules/discord.nix

@@ -5,7 +5,11 @@
 }: {
   programs.nixcord = {
     enable = true;
-    discord.enable = true;
+    discord = {
+      enable = true;
+      branch = "canary";
+      autoscroll.enable = true;
+    };
     config = {
       autoUpdateNotification = true;
       notifyAboutUpdates = true;
@@ -32,12 +36,6 @@
         anonymiseFileNames = {
           enable = true;
         };
-        autoZipper = {
-          enable = true;
-        };
-        betterInvites = {
-          enable = true;
-        };
         biggerStreamPreview = {
           enable = true;
         };
@@ -65,6 +63,15 @@
         sendTimestamps = {
           enable = true;
         };
+        youtubeAdblock = {
+          enable = true;
+        };
+        summaries = {
+          enable = true;
+        };
+        translate = {
+          enable = true;
+        };
       };
     };
   };

home-manager/modules/emulators.nix

@@ -1,9 +1,6 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
     desmume
-    # ryujinx
-    retroarch
-    waydroid
     rpcs3
     input-remapper
   ];

home-manager/modules/ffmpeg.nix

@@ -1,6 +1,5 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
     ffmpeg
-    gpu-screen-recorder
   ];
 }

home-manager/modules/fish.nix

@@ -1,7 +1,6 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
     fish
-    nix-your-shell
     fzf
     ripgrep
     bat
@@ -9,7 +8,7 @@
     ugrep
     yazi
     chafa
-    btop
+    (btop.override {cudaSupport = true;})
     fastfetch
   ];
 }

home-manager/modules/lazygit.nix

@@ -12,11 +12,11 @@
   ];
   programs.git = {
     enable = true;
-    includes = [
-      {path = "${config.home.homeDirectory}/nix/.secrets/.gitconfig";}
-    ];
+    lfs.enable = true;
     settings = {
-      credential.helper = "store --file=${config.home.homeDirectory}/nix/.secrets/.git-credentials";
+      credential.helper = "store --file=/run/secrets/git/credentials";
+      user.name = "alsaiduq-lab";
+      user.email = "riiidge.racer@gmail.com";
       init.defaultBranch = "master";
       push.autoSetupRemote = true;
       pull.rebase = true;

home-manager/modules/quickshell.nix

@@ -31,12 +31,12 @@
     rebuildCommand = [
       "bash"
       "-c"
-      "cd ~/nix && nix flake update && sudo pixos-rebuild switch --flake ~/nix 2>&1"
+      "cd ~/nix && nix flake update && nix run nixpkgs#nh -- os boot ~/nix 2>&1"
     ];
     gcCommand = [
       "bash"
       "-c"
-      "sudo pix-collect-garbage -d 2>&1"
+      "nix run nixpkgs#nh -- clean all 2>&1"
     ];
     generationsCommand = ["bash" "-c" "sudo nix-env --list-generations --profile /nix/var/nix/profiles/system | wc -l"];
     updateInterval = 1800;

home-manager/modules/thorium.nix

@@ -1,9 +1,3 @@
 {pkgs, ...}: {
-  home.packages = [pkgs.thorium];
-  xdg.dataFile = {
-    "icons/hicolor" = {
-      source = "${pkgs.thorium}/share/icons/hicolor";
-      recursive = true;
-    };
-  };
+  home.packages = with pkgs; [thorium];
 }