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

flake.lock

@@ -117,11 +117,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772060133,
+        "lastModified": 1771851181,
-        "narHash": "sha256-VuyRptb8v1lVGMlLp4/1vRX3Efwec0CN0S6mKmDPzLg=",
+        "narHash": "sha256-gFgE6mGUftwseV3DUENMb0k0EiHd739lZexPo5O/sdQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ce9b6e52500a0ea0ec48f0bbf6d7a3e431d9dfa4",
+        "rev": "9a4b494b1aa1b93d8edf167f46dc8e0c0011280c",
         "type": "github"
       },
       "original": {
@@ -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,17 +217,17 @@
         "hyprutils": "hyprutils",
         "hyprwayland-scanner": "hyprwayland-scanner",
         "hyprwire": "hyprwire",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
         "pre-commit-hooks": "pre-commit-hooks",
         "systems": "systems",
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1772107319,
+        "lastModified": 1772022552,
-        "narHash": "sha256-qdeeNrWmUe1P2FsnNU1ngoZl8UxczEMJBziwm78V42I=",
+        "narHash": "sha256-L3zktLSXcvsqczTz7YL5PXYgn4a08tRfl9t6YYLESM8=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "c71fbd854dfdedaae011f4b8b1fdb81f8054b309",
+        "rev": "457617b5a31f70ea63e1fcc0729f29e4a9e6b486",
         "type": "github"
       },
       "original": {
@@ -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,13 +515,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_4": {
       "locked": {
-        "lastModified": 1771848320,
+        "lastModified": 1771369470,
-        "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
+        "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2fc6539b481e1d2569f25f8799236694180c0993",
+        "rev": "0182a361324364ae3f436a63005877674cf45efb",
         "type": "github"
       },
       "original": {
@@ -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 =
@@ -32,7 +34,7 @@
     }@inputs:
 
     let
-      userConfig = {
+      baseUserConfig = {
         username = "szymon";
         # for git
         email = "szymon_jozef@proton.me";
@@ -40,7 +42,7 @@
         # your public ssh key
         signingKey = "~/.ssh/github.pub";
 
-        mainMonitor = "eDP-1"; # only for some applications: you still need to set hyprland monitors yourself!
+        mainMonitor = "DP-1"; # only for some applications: you still need to set hyprland monitors yourself!
         statusBar = "ashell"; # available: ashell|waybar
 
         pathConfig = {
@@ -51,45 +53,79 @@
       };
 
       system = "x86_64-linux";
+
+      general_import = import nixpkgs {
+        inherit system;
+        config.allowUnfree = true;
+      };
+
+      general_module_import = [
+        ./home.nix
+        catppuccin.homeModules.catppuccin
+        nixvim.homeModules.nixvim
+        inputs.hyprcursor-phinger.homeManagerModules.hyprcursor-phinger
+      ];
+
+      mkHomeConfig =
+        {
+          isNixOS,
+          overrides ? { },
+          hostName,
+        }:
+        home-manager.lib.homeManagerConfiguration {
+          pkgs = general_import;
+
+          extraSpecialArgs = {
+            inherit inputs isNixOS hostName;
+            userConfig = baseUserConfig // overrides;
+          };
+
+          modules = general_module_import;
+        };
+
     in
     {
       homeConfigurations = {
-        "arch" = home-manager.lib.homeManagerConfiguration {
+        "arch" = mkHomeConfig {
-          pkgs = import nixpkgs {
+          isNixOS = false;
-            inherit system;
+          hostName = "arch";
-            config.allowUnfree = true;
-          };
-          extraSpecialArgs = {
-            inherit
-              inputs
-              userConfig
-              ;
-            isNixOS = false;
-          };
-          modules = [
-            ./home.nix
-            catppuccin.homeModules.catppuccin
-            nixvim.homeModules.nixvim
-          ];
-
         };
-        "nixos" = home-manager.lib.homeManagerConfiguration {
+
-          pkgs = import nixpkgs {
+        "nixos" = mkHomeConfig {
-            inherit system;
+          isNixOS = true;
-            config.allowUnfree = true;
+          hostName = "nixos";
+        };
+
+        "${baseUserConfig.username}@pitagoras" = mkHomeConfig {
+          isNixOS = true;
+          overrides = {
+            mainMonitor = "eDP-1";
           };
-          extraSpecialArgs = {
+          hostName = "pitagoras";
-            inherit
+        };
-              inputs
+
-              userConfig
+        "${baseUserConfig.username}@pilecki" = mkHomeConfig {
-              ;
+          isNixOS = true;
-            isNixOS = true;
+          overrides = {
+            mainMonitor = "LVDS-1";
           };
-          modules = [
+          hostName = "pilecki";
-            ./home.nix
+        };
-            catppuccin.homeModules.catppuccin
+
-            nixvim.homeModules.nixvim
+        "${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 = {
+  home = {
-    EDITOR = "nvim";
+    sessionVariables = {
-    VISUAL = "nvim";
+      EDITOR = "nvim";
-    XDG_DATA_DIRS = "$HOME/.nix-profile/share/applications:$XDG_DATA_DIRS";
+      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

@@ -1,4 +1,4 @@
-{ isNixOS, ... }:
+{ isNixOS, hostName, ... }:
 
 {
   programs.fish = {
@@ -45,7 +45,7 @@
                     
                     set -l rel_file (realpath --relative-to=$config_dir $file)
                     
-                    if nh home switch $config_dir -c ${if isNixOS then "nixos" else "arch"}
+                    if nh home switch $config_dir -c ${hostName}
                         git add -A
                         set commit_msg "update: $rel_file"
                         git commit -m "$commit_msg"
@@ -61,7 +61,12 @@
 
       reload_dotfiles = {
         body = # fish
-          "nh home switch ~/.config/home-manager -c ${if isNixOS then "nixos" else "arch"}";
+          "nh home switch ~/.config/home-manager";
+      };
+
+      reload_system = {
+        body = # fish
+          "nh os switch /etc/nixos/";
       };
 
       ls = {
@@ -80,38 +85,64 @@
       };
 
       update = {
-        body = # fish
+        body =
-          ''
+          if isNixOS then
-            echo "===System update==="
+            # fish
+            ''
+              echo "=== System packages update==="
+              pushd /etc/nixos
+              nix flake update
+              reload_system
+              popd
 
-            if not type -q yay
+              echo "===User packages update==="
-              echo "Yay not found… Is this Arch? If yes, then please consider installing it!"
+              pushd $HOME/.config/home-manager
-            else
+              nix flake update
-              yay
+              reload_dotfiles
-            end
+              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==="
-                echo "===Flatpak update==="
+              if type -q flatpak
-                flatpak update --noninteractive
+                  echo "===Flatpak update==="
-                echo "===Flatpak remove unused==="
+                  flatpak update --noninteractive
-                flatpak uninstall --unused
+                  echo "===Flatpak remove unused==="
-            end
+                  flatpak uninstall --unused
+              end
+            ''
+          else
+            # fish
+            ''
+              echo "===System update==="
 
-            if type -q nix-channel
+              if not type -q yay
-                echo "===Nix update==="
+                echo "Yay not found… Please consider installing it!"
-                nix-channel --update
+              else
-                echo "===Nix garbage collection==="
+                yay
-                home-manager expire-generations "-7 days"
+              end
-            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

@@ -2,8 +2,8 @@
   isNixOS,
   lib,
   userConfig,
-  inputs,
   pkgs,
+  inputs,
   ...
 }:
 let
@@ -36,9 +36,9 @@ 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" = "zen-browser";
+      "$browser" = if isNixOS then "zen-beta" else "zen-browser"; # beta on nixos
       "$openrgb_color" = "09ce30";
 
       env = [
@@ -174,6 +174,7 @@ in
 
       workspace = [
         "1, monitor:DP-2"
+        "1, layout: dwindle"
         "2, monitor:DP-1"
         "3, monitor:DP-1"
         "4, monitor:DP-1"
@@ -197,6 +198,7 @@ in
         "match:class ^(vesktop)$, workspace 1 silent"
         "match:class ^(chrome-facebook.com__-Default)$, workspace 1"
         "match:class ^(zen)$, workspace 2"
+        "match:class ^(zen-beta)$, workspace 2"
         "match:class ^(com.github.IsmaelMartinez.teams_for_linux)$, workspace 2"
         "match:class ^(FreeTube)$, workspace 2"
         "match:class ^(brave-x.com__-Default)$, workspace 2"
@@ -349,8 +351,8 @@ in
       bindd = [
         "$mainMod, F, Make app fullscreen, fullscreen"
         "$mainMod, T, Toggle floating, togglefloating"
-        "$mainMod, P, Toggle pseudo, pseudo"
+        "$mainMod, S, layoutmsg, swapsplit"
-        "$mainMod, S, Toggle split, togglesplit"
+        "$mainMod, C, layoutmsg, togglesplit"
         "$mainMod, Q, Kill active window, killactive"
       ];
     };

modules/packages.nix

@@ -2,9 +2,6 @@
 
 {
   home.packages = with pkgs; [
-    waypaper
-    swww
-    gnupg
     libnotify
     cliphist
     gh

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/uwu_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/wd_backup/home/szymon/