Merge branch 'master' of github.com:szymon-jozef/amazing-dotfiles

flake.lock

@@ -159,6 +159,24 @@
         "type": "github"
       }
     },
+    "hyprcursor-phinger": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1763845612,
+        "narHash": "sha256-78zH5GrYa35bEkzeVnl8uXFbZ/zsiSHayjxZlNt+Xe8=",
+        "owner": "jappie3",
+        "repo": "hyprcursor-phinger",
+        "rev": "1207a845501a28e0e00d4a8e935ee0c9cab30650",
+        "type": "github"
+      },
+      "original": {
+        "owner": "jappie3",
+        "repo": "hyprcursor-phinger",
+        "type": "github"
+      }
+    },
     "hyprgraphics": {
       "inputs": {
         "hyprutils": [
@@ -199,7 +217,7 @@
         "hyprutils": "hyprutils",
         "hyprwayland-scanner": "hyprwayland-scanner",
         "hyprwire": "hyprwire",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
         "pre-commit-hooks": "pre-commit-hooks",
         "systems": "systems",
         "xdph": "xdph"
@@ -466,6 +484,22 @@
       }
     },
     "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1762977756,
+        "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1771848320,
         "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
@@ -481,7 +515,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1771369470,
         "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
@@ -546,8 +580,9 @@
       "inputs": {
         "catppuccin": "catppuccin",
         "home-manager": "home-manager",
+        "hyprcursor-phinger": "hyprcursor-phinger",
         "hyprland": "hyprland",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_4",
         "nixvim": "nixvim",
         "wallpapers": "wallpapers"
       }

flake.nix

@@ -19,6 +19,8 @@
       url = "github:nix-community/nixvim";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    hyprcursor-phinger.url = "github:jappie3/hyprcursor-phinger";
   };
 
   outputs =
@@ -61,6 +63,7 @@
         ./home.nix
         catppuccin.homeModules.catppuccin
         nixvim.homeModules.nixvim
+        inputs.hyprcursor-phinger.homeManagerModules.hyprcursor-phinger
       ];
 
       mkHomeConfig =
@@ -93,7 +96,7 @@
           hostName = "nixos";
         };
 
-        "pitagoras" = mkHomeConfig {
+        "${baseUserConfig.username}@pitagoras" = mkHomeConfig {
           isNixOS = true;
           overrides = {
             mainMonitor = "eDP-1";
@@ -101,7 +104,7 @@
           hostName = "pitagoras";
         };
 
-        "pilecki" = mkHomeConfig {
+        "${baseUserConfig.username}@pilecki" = mkHomeConfig {
           isNixOS = true;
           overrides = {
             mainMonitor = "LVDS-1";
@@ -109,13 +112,21 @@
           hostName = "pilecki";
         };
 
-        "paderewski" = mkHomeConfig {
+        "${baseUserConfig.username}@paderewski" = mkHomeConfig {
           isNixOS = false;
           overrides = {
             mainMonitor = "DP-1";
           };
           hostName = "paderewski";
         };
+
+        "${baseUserConfig.username}@paderewski-nix" = mkHomeConfig {
+          isNixOS = true;
+          overrides = {
+            mainMonitor = "DP-1";
+          };
+          hostName = "paderewski-nix";
+        };
       };
     };
 }

home.nix

@@ -68,13 +68,24 @@
     ".config/gtk-3.0/gtk.css".source = ./dotfiles/gtk-3.0/gtk.css;
     ${userConfig.pathConfig.wallpaper}.source = inputs.wallpapers;
   };
+  programs.hyprcursor-phinger.enable = true;
 
   # === VARS ===
 
-  home.sessionVariables = {
-    EDITOR = "nvim";
-    VISUAL = "nvim";
-    XDG_DATA_DIRS = "$HOME/.nix-profile/share/applications:$XDG_DATA_DIRS";
+  home = {
+    sessionVariables = {
+      EDITOR = "nvim";
+      VISUAL = "nvim";
+      XDG_DATA_DIRS = "$HOME/.nix-profile/share/applications:$XDG_DATA_DIRS";
+    };
+
+    pointerCursor = {
+      name = "phinger-cursors-light";
+      package = pkgs.phinger-cursors;
+      size = 24;
+      gtk.enable = true;
+      x11.enable = true;
+    };
   };
 
   programs.home-manager.enable = true;

modules/cli/fastfetch.nix

@@ -36,7 +36,7 @@
 
   xdg.configFile."fastfetch/startup.jsonc".text = builtins.toJSON {
     logo = {
-      source = "arch_small";
+      source = "nixos_small";
       padding = {
         bottom = 1;
       };

modules/cli/fish.nix

@@ -61,7 +61,12 @@
 
       reload_dotfiles = {
         body = # fish
-          "nh home switch ~/.config/home-manager -c ${hostName}";
+          "nh home switch ~/.config/home-manager";
+      };
+
+      reload_system = {
+        body = # fish
+          "nh os switch /etc/nixos/";
       };
 
       ls = {
@@ -80,38 +85,64 @@
       };
 
       update = {
-        body = # fish
-          ''
-            echo "===System update==="
+        body =
+          if isNixOS then
+            # fish
+            ''
+              echo "=== System packages update==="
+              pushd /etc/nixos
+              nix flake update
+              reload_system
+              popd
 
-            if not type -q yay
-              echo "Yay not found… Is this Arch? If yes, then please consider installing it!"
-            else
-              yay
-            end
+              echo "===User packages update==="
+              pushd $HOME/.config/home-manager
+              nix flake update
+              reload_dotfiles
+              popd
 
-            if type -q pacman
-                echo "===Remove orphans==="
-                set orphans (pacman -Qtdq)
-                if test (count $orphans) -gt 0
-                    sudo pacman -Rns $orphans
-                end
-            end
 
-            if type -q flatpak
-                echo "===Flatpak update==="
-                flatpak update --noninteractive
-                echo "===Flatpak remove unused==="
-                flatpak uninstall --unused
-            end
+              echo "=== Flatpak update==="
+              if type -q flatpak
+                  echo "===Flatpak update==="
+                  flatpak update --noninteractive
+                  echo "===Flatpak remove unused==="
+                  flatpak uninstall --unused
+              end
+            ''
+          else
+            # fish
+            ''
+              echo "===System update==="
 
-            if type -q nix-channel
-                echo "===Nix update==="
-                nix-channel --update
-                echo "===Nix garbage collection==="
-                home-manager expire-generations "-7 days"
-            end
-          '';
+              if not type -q yay
+                echo "Yay not found… Please consider installing it!"
+              else
+                yay
+              end
+
+              if type -q pacman
+                  echo "===Remove orphans==="
+                  set orphans (pacman -Qtdq)
+                  if test (count $orphans) -gt 0
+                      sudo pacman -Rns $orphans
+                  end
+              end
+
+              if type -q flatpak
+                  echo "===Flatpak update==="
+                  flatpak update --noninteractive
+                  echo "===Flatpak remove unused==="
+                  flatpak uninstall --unused
+              end
+
+              if type -q nix-channel
+                  echo "===Nix update==="
+                  nix-channel --update
+                  echo "===Nix garbage collection==="
+                  home-manager expire-generations "-7 days"
+              end
+            '';
       };
 
       rm = {

modules/cli/nixvim.nix

@@ -100,6 +100,14 @@
         action.__raw = "function() require('harpoon'):list():next() end";
         options.desc = "Toggle next harpoon buffer";
       }
+      {
+        key = "j";
+        action= "jzz";
+      }
+      {
+        key = "k";
+        action= "kzz";
+      }
     ];
 
     autoGroups = {
@@ -203,9 +211,14 @@
         };
       };
 
-      indent-blankline = {
+      cursorline = {
         enable = true;
-        settings.scope.enabled = true;
+        timeout = 0;
+      };
+
+      mini-indentscope = {
+        enable = true;
+        settings.draw.delay = 0;
       };
 
       cmp = {

modules/hypr/hyprland.nix

@@ -36,7 +36,7 @@ in
       "$mainMod" = "SUPER";
       "$terminal" = "uwsm app -- kitty";
       "$menu" = "hyprlauncher";
-      "$music_player" = "flatpak run com.spotify.Client";
+      "$music_player" = if isNixOS then "spotify" else "flatpak run com.spotify.Client";
       "$notes" = "obsidian";
       "$browser" = if isNixOS then "zen-beta" else "zen-browser"; # beta on nixos
       "$openrgb_color" = "09ce30";

scripts/home_backup.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 set -e
 
-rsync -avh --no-links --delete --exclude=.* --exclude=dyski /home/szymon/ /mnt/backup/home/szymon/
-rsync -avh --no-links --delete --exclude=.* --exclude=dyski /home/szymon/ /mnt/backup_wd/home/szymon/
+rsync -avh --no-links --delete --exclude=.* --exclude=dyski /home/szymon/ /mnt/uwu_backup/home/szymon/
+rsync -avh --no-links --delete --exclude=.* --exclude=dyski /home/szymon/ /mnt/wd_backup/home/szymon/