init for thinkpad

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

flake.lock

@@ -20,11 +20,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772292445,
+        "lastModified": 1771610171,
-        "narHash": "sha256-4F1Q7U313TKUDDovCC96m/Za4wZcJ3yqtu4eSrj8lk8=",
+        "narHash": "sha256-+DeInuhbm6a6PpHDNUS7pozDouq2+8xSDefoNaZLW0E=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "1dbbba659c1cef0b0202ce92cadfe13bae550e8f",
+        "rev": "7f9eb087703ec4acc6b288d02fa9ea3db803cd3d",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1772153824,
+        "lastModified": 1771587924,
-        "narHash": "sha256-T65qXmlcD9qFpPTi+mOXsn4dIkO2N8Ls67nqmuzepv0=",
+        "narHash": "sha256-eVYOGmF8nQBhudJyU6lHdgJI87kvGz8JyCq5/Vi9Mjk=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "4b0f5b7bf7b3eeb484d49524f3c9791864ab9362",
+        "rev": "b0c65edbf31c2ad3d84438d82c2310f2c28373f3",
         "type": "github"
       },
       "original": {
@@ -117,11 +117,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772516620,
+        "lastModified": 1772060133,
-        "narHash": "sha256-2r4cKdqCVlQkvcTcLUMxmsmAYZZxCMd//w/PnDnukTE=",
+        "narHash": "sha256-VuyRptb8v1lVGMlLp4/1vRX3Efwec0CN0S6mKmDPzLg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2b9504d5a0169d4940a312abe2df2c5658db8de9",
+        "rev": "ce9b6e52500a0ea0ec48f0bbf6d7a3e431d9dfa4",
         "type": "github"
       },
       "original": {
@@ -159,24 +159,6 @@
         "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": [
@@ -217,17 +199,17 @@
         "hyprutils": "hyprutils",
         "hyprwayland-scanner": "hyprwayland-scanner",
         "hyprwire": "hyprwire",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_2",
         "pre-commit-hooks": "pre-commit-hooks",
         "systems": "systems",
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1772543027,
+        "lastModified": 1772107319,
-        "narHash": "sha256-3XOAKf8H5DiNgO4CvkNbrWtfexi5iI29zS30zkJnRrU=",
+        "narHash": "sha256-qdeeNrWmUe1P2FsnNU1ngoZl8UxczEMJBziwm78V42I=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "7299a3b0d5332da030e980e60b0ee35b93387cff",
+        "rev": "c71fbd854dfdedaae011f4b8b1fdb81f8054b309",
         "type": "github"
       },
       "original": {
@@ -468,6 +450,22 @@
       }
     },
     "nixpkgs": {
+      "locked": {
+        "lastModified": 1771369470,
+        "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "0182a361324364ae3f436a63005877674cf45efb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1771848320,
         "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
@@ -483,45 +481,13 @@
         "type": "github"
       }
     },
-    "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": 1772198003,
+        "lastModified": 1771848320,
-        "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=",
+        "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1772433332,
-        "narHash": "sha256-izhTDFKsg6KeVBxJS9EblGeQ8y+O8eCa6RcW874vxEc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "cf59864ef8aa2e178cccedbe2c178185b0365705",
+        "rev": "2fc6539b481e1d2569f25f8799236694180c0993",
         "type": "github"
       },
       "original": {
@@ -540,11 +506,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1772402258,
+        "lastModified": 1771135771,
-        "narHash": "sha256-3DmCFOdmbkFML1/G9gj8Wb+rCCZFPOQtNoMCpqOF8SA=",
+        "narHash": "sha256-wyvBIhDuyCRyjB3yPg77qoyxrlgQtBR1rVW3c9knV3E=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "21ae25e13b01d3b4cdc750b5f9e7bad68b150c10",
+        "rev": "ed0424f0b08d303a7348f52f7850ad1b2704f9ba",
         "type": "github"
       },
       "original": {
@@ -563,11 +529,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772024342,
+        "lastModified": 1771858127,
-        "narHash": "sha256-+eXlIc4/7dE6EcPs9a2DaSY3fTA9AE526hGqkNID3Wg=",
+        "narHash": "sha256-Gtre9YoYl3n25tJH2AoSdjuwcqij5CPxL3U3xysYD08=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "6e34e97ed9788b17796ee43ccdbaf871a5c2b476",
+        "rev": "49bbbfc218bf3856dfa631cead3b052d78248b83",
         "type": "github"
       },
       "original": {
@@ -580,9 +546,8 @@
       "inputs": {
         "catppuccin": "catppuccin",
         "home-manager": "home-manager",
-        "hyprcursor-phinger": "hyprcursor-phinger",
         "hyprland": "hyprland",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_3",
         "nixvim": "nixvim",
         "wallpapers": "wallpapers"
       }

flake.nix

@@ -19,8 +19,6 @@
       url = "github:nix-community/nixvim";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
-    hyprcursor-phinger.url = "github:jappie3/hyprcursor-phinger";
   };
 
   outputs =
@@ -34,7 +32,7 @@
     }@inputs:
 
     let
-      baseUserConfig = {
+      userConfig = {
         username = "szymon";
         # for git
         email = "szymon_jozef@proton.me";
@@ -42,7 +40,7 @@
         # your public ssh key
         signingKey = "~/.ssh/github.pub";
 
-        mainMonitor = "DP-1"; # only for some applications: you still need to set hyprland monitors yourself!
+        mainMonitor = "LVDS-1"; # only for some applications: you still need to set hyprland monitors yourself!
         statusBar = "ashell"; # available: ashell|waybar
 
         pathConfig = {
@@ -53,79 +51,45 @@
       };
 
       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" = mkHomeConfig {
+        "arch" = home-manager.lib.homeManagerConfiguration {
-          isNixOS = false;
+          pkgs = import nixpkgs {
-          hostName = "arch";
+            inherit system;
-        };
+            config.allowUnfree = true;
-
-        "nixos" = mkHomeConfig {
-          isNixOS = true;
-          hostName = "nixos";
-        };
-
-        "${baseUserConfig.username}@pitagoras" = mkHomeConfig {
-          isNixOS = true;
-          overrides = {
-            mainMonitor = "eDP-1";
           };
-          hostName = "pitagoras";
+          extraSpecialArgs = {
-        };
+            inherit
-
+              inputs
-        "${baseUserConfig.username}@pilecki" = mkHomeConfig {
+              userConfig
-          isNixOS = true;
+              ;
-          overrides = {
+            isNixOS = false;
-            mainMonitor = "LVDS-1";
           };
-          hostName = "pilecki";
+          modules = [
-        };
+            ./home.nix
+            catppuccin.homeModules.catppuccin
+            nixvim.homeModules.nixvim
+          ];
 
-        "${baseUserConfig.username}@paderewski" = mkHomeConfig {
-          isNixOS = false;
-          overrides = {
-            mainMonitor = "DP-1";
-          };
-          hostName = "paderewski";
         };
-
+        "nixos" = home-manager.lib.homeManagerConfiguration {
-        "${baseUserConfig.username}@paderewski-nix" = mkHomeConfig {
+          pkgs = import nixpkgs {
-          isNixOS = true;
+            inherit system;
-          overrides = {
+            config.allowUnfree = true;
-            mainMonitor = "DP-1";
           };
-          hostName = "paderewski-nix";
+          extraSpecialArgs = {
+            inherit
+              inputs
+              userConfig
+              ;
+            isNixOS = true;
+          };
+          modules = [
+            ./home.nix
+            catppuccin.homeModules.catppuccin
+            nixvim.homeModules.nixvim
+          ];
         };
       };
     };

home.nix

@@ -68,24 +68,13 @@
     ".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 = {
+  home.sessionVariables = {
-    sessionVariables = {
+    EDITOR = "nvim";
-      EDITOR = "nvim";
+    VISUAL = "nvim";
-      VISUAL = "nvim";
+    XDG_DATA_DIRS = "$HOME/.nix-profile/share/applications:$XDG_DATA_DIRS";
-      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 = "nixos_small";
+      source = "arch_small";
       padding = {
         bottom = 1;
       };

modules/cli/fish.nix

@@ -1,4 +1,4 @@
-{ isNixOS, hostName, ... }:
+{ isNixOS, ... }:
 
 {
   programs.fish = {
@@ -45,7 +45,7 @@
                     
                     set -l rel_file (realpath --relative-to=$config_dir $file)
                     
-                    if nh home switch $config_dir
+                    if nh home switch $config_dir -c ${if isNixOS then "nixos" else "arch"}
                         git add -A
                         set commit_msg "update: $rel_file"
                         git commit -m "$commit_msg"
@@ -61,12 +61,7 @@
 
       reload_dotfiles = {
         body = # fish
-          "nh home switch ~/.config/home-manager";
+          "nh home switch ~/.config/home-manager -c ${if isNixOS then "nixos" else "arch"}";
-      };
-
-      reload_system = {
-        body = # fish
-          "nh os switch /etc/nixos/";
       };
 
       ls = {
@@ -85,64 +80,38 @@
       };
 
       update = {
-        body =
+        body = # fish
-          if isNixOS then
+          ''
-            # fish
+            echo "===System update==="
-            ''
-              echo "=== System packages update==="
-              pushd /etc/nixos
-              nix flake update
-              reload_system
-              popd
 
-              echo "===User packages update==="
+            if not type -q yay
-              pushd $HOME/.config/home-manager
+              echo "Yay not found… Is this Arch? If yes, then please consider installing it!"
-              nix flake update
+            else
-              reload_dotfiles
+              yay
-              popd
+            end
 
+            if type -q pacman
+                echo "===Remove orphans==="
+                set orphans (pacman -Qtdq)
+                if test (count $orphans) -gt 0
+                    sudo pacman -Rns $orphans
+                end
+            end
 
-              echo "=== Flatpak update==="
+            if type -q flatpak
-              if type -q flatpak
+                echo "===Flatpak update==="
-                  echo "===Flatpak update==="
+                flatpak update --noninteractive
-                  flatpak update --noninteractive
+                echo "===Flatpak remove unused==="
-                  echo "===Flatpak remove unused==="
+                flatpak uninstall --unused
-                  flatpak uninstall --unused
+            end
-              end
-            ''
-          else
-            # fish
-            ''
-              echo "===System update==="
 
-              if not type -q yay
+            if type -q nix-channel
-                echo "Yay not found… Please consider installing it!"
+                echo "===Nix update==="
-              else
+                nix-channel --update
-                yay
+                echo "===Nix garbage collection==="
-              end
+                home-manager expire-generations "-7 days"
-
+            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,14 +100,6 @@
         action.__raw = "function() require('harpoon'):list():next() end";
         options.desc = "Toggle next harpoon buffer";
       }
-      {
-        key = "j";
-        action= "jzz";
-      }
-      {
-        key = "k";
-        action= "kzz";
-      }
     ];
 
     autoGroups = {
@@ -211,14 +203,9 @@
         };
       };
 
-      cursorline = {
+      indent-blankline = {
         enable = true;
-        timeout = 0;
+        settings.scope.enabled = true;
-      };
-
-      mini-indentscope = {
-        enable = true;
-        settings.draw.delay = 0;
       };
 
       cmp = {

modules/hypr/hyprland.nix

@@ -2,8 +2,8 @@
   isNixOS,
   lib,
   userConfig,
-  pkgs,
   inputs,
+  pkgs,
   ...
 }:
 let
@@ -36,9 +36,9 @@ in
       "$mainMod" = "SUPER";
       "$terminal" = "uwsm app -- kitty";
       "$menu" = "hyprlauncher";
-      "$music_player" = if isNixOS then "spotify" else "flatpak run com.spotify.Client";
+      "$music_player" = "flatpak run com.spotify.Client";
       "$notes" = "obsidian";
-      "$browser" = if isNixOS then "zen-beta" else "zen-browser"; # beta on nixos
+      "$browser" = "zen-browser";
       "$openrgb_color" = "09ce30";
 
       env = [
@@ -174,7 +174,6 @@ in
 
       workspace = [
         "1, monitor:DP-2"
-        "1, layout: dwindle"
         "2, monitor:DP-1"
         "3, monitor:DP-1"
         "4, monitor:DP-1"
@@ -198,7 +197,6 @@ 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"
@@ -210,7 +208,6 @@ in
         "match:class ^(net.lutris.Lutris)$, workspace 3"
         "match:class ^(rpcs3)$, workspace 3"
         "match:class ^(winboat)$, workspace 5"
-        "match:class ^(qemu)$, workspace 5"
         "match:class ^(obsidian)$, workspace 6"
         "match:class ^(gimp)$, workspace 8"
         "match:class .*potify, workspace 9 silent"
@@ -352,8 +349,8 @@ in
       bindd = [
         "$mainMod, F, Make app fullscreen, fullscreen"
         "$mainMod, T, Toggle floating, togglefloating"
-        "$mainMod, S, layoutmsg, swapsplit"
+        "$mainMod, P, Toggle pseudo, pseudo"
-        "$mainMod, C, layoutmsg, togglesplit"
+        "$mainMod, S, Toggle split, togglesplit"
         "$mainMod, Q, Kill active window, killactive"
       ];
     };

modules/packages.nix

@@ -2,6 +2,9 @@
 
 {
   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/uwu_backup/home/szymon/
+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/wd_backup/home/szymon/
+rsync -avh --no-links --delete --exclude=.* --exclude=dyski /home/szymon/ /mnt/backup_wd/home/szymon/