chore: update home flake.lock

flake.lock

@@ -20,11 +20,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771610171,
+        "lastModified": 1774211390,
-        "narHash": "sha256-+DeInuhbm6a6PpHDNUS7pozDouq2+8xSDefoNaZLW0E=",
+        "narHash": "sha256-sTtAgCCaX8VNNZlQFACd3i1IQ+DB0Wf3COgiFS152ds=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "7f9eb087703ec4acc6b288d02fa9ea3db803cd3d",
+        "rev": "f62a4dbfa4e5584f14ad4c62afedf6e4b433cf70",
         "type": "github"
       },
       "original": {
@@ -35,14 +35,16 @@
     },
     "catppuccin": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1771587924,
+        "lastModified": 1774799062,
-        "narHash": "sha256-eVYOGmF8nQBhudJyU6lHdgJI87kvGz8JyCq5/Vi9Mjk=",
+        "narHash": "sha256-U9RGxFsLeKivD1+7sVXj5TltHGfB4m/dkn3dENT2fSM=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "b0c65edbf31c2ad3d84438d82c2310f2c28373f3",
+        "rev": "948a8ee84858d053b83f01c8c168f9f4347937e6",
         "type": "github"
       },
       "original": {
@@ -88,6 +90,24 @@
         "type": "github"
       }
     },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
@@ -117,11 +137,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771851181,
+        "lastModified": 1774969509,
-        "narHash": "sha256-gFgE6mGUftwseV3DUENMb0k0EiHd739lZexPo5O/sdQ=",
+        "narHash": "sha256-LCmfWlT3tlGVj0Q20TKqs5PBwdH3vnNsxJEhqt0wH1o=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "9a4b494b1aa1b93d8edf167f46dc8e0c0011280c",
+        "rev": "a7d2aca3f0dd952b01d8ed5c45536b40af3841eb",
         "type": "github"
       },
       "original": {
@@ -146,11 +166,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1753964049,
+        "lastModified": 1772461003,
-        "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=",
+        "narHash": "sha256-pVICsV7FtcEeVwg5y/LFh3XFUkVJninm/P1j/JHzEbM=",
         "owner": "hyprwm",
         "repo": "hyprcursor",
-        "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5",
+        "rev": "b62396457b9cfe2ebf24fe05404b09d2a40f8ed7",
         "type": "github"
       },
       "original": {
@@ -159,6 +179,24 @@
         "type": "github"
       }
     },
+    "hyprcursor-phinger": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "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": [
@@ -175,11 +213,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1770511807,
+        "lastModified": 1772461523,
-        "narHash": "sha256-suKmSbSk34uPOJDTg/GbPrKEJutzK08vj0VoTvAFBCA=",
+        "narHash": "sha256-mI6A51do+hEUzeJKk9YSWfVHdI/SEEIBi2tp5Whq5mI=",
         "owner": "hyprwm",
         "repo": "hyprgraphics",
-        "rev": "7c75487edd43a71b61adb01cae8326d277aab683",
+        "rev": "7d63c04b4a2dd5e59ef943b4b143f46e713df804",
         "type": "github"
       },
       "original": {
@@ -205,11 +243,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1772022552,
+        "lastModified": 1774971547,
-        "narHash": "sha256-L3zktLSXcvsqczTz7YL5PXYgn4a08tRfl9t6YYLESM8=",
+        "narHash": "sha256-a5yiW4unGah5y/DfgUvVVmEozsPKYvwAxG0tPQ9XFwg=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "457617b5a31f70ea63e1fcc0729f29e4a9e6b486",
+        "rev": "ccdfa4070ee56232fbcd20595e3ba047756cce4d",
         "type": "github"
       },
       "original": {
@@ -251,11 +289,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1767023960,
+        "lastModified": 1772467975,
-        "narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=",
+        "narHash": "sha256-kipyuDBxrZq+beYpZqWzGvFWm4QbayW9agAvi94vDXY=",
         "owner": "hyprwm",
         "repo": "hyprland-guiutils",
-        "rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660",
+        "rev": "5e1c6b9025aaf4d578f3eff7c0eb1f0c197a9507",
         "type": "github"
       },
       "original": {
@@ -276,11 +314,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765214753,
+        "lastModified": 1772460177,
-        "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=",
+        "narHash": "sha256-/6G/MsPvtn7bc4Y32pserBT/Z4SUUdBd4XYJpOEKVR4=",
         "owner": "hyprwm",
         "repo": "hyprland-protocols",
-        "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab",
+        "rev": "1cb6db5fd6bb8aee419f4457402fa18293ace917",
         "type": "github"
       },
       "original": {
@@ -305,11 +343,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771866172,
+        "lastModified": 1772459629,
-        "narHash": "sha256-fYFoXhQLrm1rD8vSFKQBOEX4OGCuJdLt1amKfHd5GAw=",
+        "narHash": "sha256-/iwvNUYShmmnwmz/czEUh6+0eF5vCMv0xtDW0STPIuM=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "0b219224910e7642eb0ed49f0db5ec3d008e3e41",
+        "rev": "7615ee388de18239a4ab1400946f3d0e498a8186",
         "type": "github"
       },
       "original": {
@@ -357,11 +395,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764592794,
+        "lastModified": 1772462885,
-        "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=",
+        "narHash": "sha256-5pHXrQK9zasMnIo6yME6EOXmWGFMSnCITcfKshhKJ9I=",
         "owner": "hyprwm",
         "repo": "hyprtoolkit",
-        "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e",
+        "rev": "9af245a69fa6b286b88ddfc340afd288e00a6998",
         "type": "github"
       },
       "original": {
@@ -382,11 +420,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771271487,
+        "lastModified": 1774211405,
-        "narHash": "sha256-41gEiUS0Pyw3L/ge1l8MXn61cK14VAhgWB/JV8s/oNI=",
+        "narHash": "sha256-6KNwP4ojUzv3YBlZU5BqCpTrWHcix1Jo01BISsTT0xk=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "340a792e3b3d482c4ae5f66d27a9096bdee6d76d",
+        "rev": "cb4e152dc72095a2af422956c6b689590572231a",
         "type": "github"
       },
       "original": {
@@ -407,11 +445,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1770501770,
+        "lastModified": 1772459835,
-        "narHash": "sha256-NWRM6+YxTRv+bT9yvlhhJ2iLae1B1pNH3mAL5wi2rlQ=",
+        "narHash": "sha256-978jRz/y/9TKmZb/qD4lEYHCQGHpEXGqy+8X2lFZsak=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "0bd8b6cde9ec27d48aad9e5b4deefb3746909d40",
+        "rev": "0a692d4a645165eebd65f109146b8861e3a925e7",
         "type": "github"
       },
       "original": {
@@ -436,11 +474,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771606233,
+        "lastModified": 1773074819,
-        "narHash": "sha256-F3PLUqQ/TwgR70U+UeOqJnihJZ2EuunzojYC4g5xHr0=",
+        "narHash": "sha256-qRqYnXiKoJLRTcfaRukn7EifmST2IVBUMZOeZMAc5UA=",
         "owner": "hyprwm",
         "repo": "hyprwire",
-        "rev": "06c7f1f8c4194786c8400653c4efc49dc14c0f3a",
+        "rev": "f68afd0e73687598cc2774804fedad76693046f0",
         "type": "github"
       },
       "original": {
@@ -451,15 +489,15 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1771369470,
+        "lastModified": 1762977756,
-        "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
+        "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
-        "owner": "NixOS",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0182a361324364ae3f436a63005877674cf45efb",
+        "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
         "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
@@ -467,11 +505,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1771848320,
+        "lastModified": 1774106199,
-        "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
+        "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2fc6539b481e1d2569f25f8799236694180c0993",
+        "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
         "type": "github"
       },
       "original": {
@@ -483,11 +521,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1771369470,
+        "lastModified": 1774709303,
-        "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
+        "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0182a361324364ae3f436a63005877674cf45efb",
+        "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685",
         "type": "github"
       },
       "original": {
@@ -506,11 +544,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1771135771,
+        "lastModified": 1774802402,
-        "narHash": "sha256-wyvBIhDuyCRyjB3yPg77qoyxrlgQtBR1rVW3c9knV3E=",
+        "narHash": "sha256-L1UJ/zxKTyyaGGmytH6OYlgQ0HGSMhvPkvU+iz4Mkb8=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "ed0424f0b08d303a7348f52f7850ad1b2704f9ba",
+        "rev": "cbd8536a05d1aae2593cb5c9ace1010c8c5845cb",
         "type": "github"
       },
       "original": {
@@ -529,11 +567,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771858127,
+        "lastModified": 1774104215,
-        "narHash": "sha256-Gtre9YoYl3n25tJH2AoSdjuwcqij5CPxL3U3xysYD08=",
+        "narHash": "sha256-EAtviqz0sEAxdHS4crqu7JGR5oI3BwaqG0mw7CmXkO8=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "49bbbfc218bf3856dfa631cead3b052d78248b83",
+        "rev": "f799ae951fde0627157f40aec28dec27b22076d0",
         "type": "github"
       },
       "original": {
@@ -542,14 +580,67 @@
         "type": "github"
       }
     },
+    "pyproject-build-systems": {
+      "inputs": {
+        "nixpkgs": [
+          "zut-calendar",
+          "nixpkgs"
+        ],
+        "pyproject-nix": [
+          "zut-calendar",
+          "pyproject-nix"
+        ],
+        "uv2nix": [
+          "zut-calendar",
+          "uv2nix"
+        ]
+      },
+      "locked": {
+        "lastModified": 1771423342,
+        "narHash": "sha256-7uXPiWB0YQ4HNaAqRvVndYL34FEp1ZTwVQHgZmyMtC8=",
+        "owner": "pyproject-nix",
+        "repo": "build-system-pkgs",
+        "rev": "04e9c186e01f0830dad3739088070e4c551191a4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "pyproject-nix",
+        "repo": "build-system-pkgs",
+        "type": "github"
+      }
+    },
+    "pyproject-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "zut-calendar",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1771518446,
+        "narHash": "sha256-nFJSfD89vWTu92KyuJWDoTQJuoDuddkJV3TlOl1cOic=",
+        "owner": "pyproject-nix",
+        "repo": "pyproject.nix",
+        "rev": "eb204c6b3335698dec6c7fc1da0ebc3c6df05937",
+        "type": "github"
+      },
+      "original": {
+        "owner": "pyproject-nix",
+        "repo": "pyproject.nix",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "catppuccin": "catppuccin",
         "home-manager": "home-manager",
+        "hyprcursor-phinger": "hyprcursor-phinger",
         "hyprland": "hyprland",
         "nixpkgs": "nixpkgs_3",
         "nixvim": "nixvim",
-        "wallpapers": "wallpapers"
+        "wallpapers": "wallpapers",
+        "zut-calendar": "zut-calendar",
+        "zutui": "zutui"
       }
     },
     "systems": {
@@ -582,6 +673,46 @@
         "type": "github"
       }
     },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "uv2nix": {
+      "inputs": {
+        "nixpkgs": [
+          "zut-calendar",
+          "nixpkgs"
+        ],
+        "pyproject-nix": [
+          "zut-calendar",
+          "pyproject-nix"
+        ]
+      },
+      "locked": {
+        "lastModified": 1772408201,
+        "narHash": "sha256-3Va9Tq/tg9ZuCX+PFd9oPgwtBDQRjjh60cYKZjZDxNM=",
+        "owner": "pyproject-nix",
+        "repo": "uv2nix",
+        "rev": "4bac9176117824d4550deeba9b86d9f96ac5d081",
+        "type": "github"
+      },
+      "original": {
+        "owner": "pyproject-nix",
+        "repo": "uv2nix",
+        "type": "github"
+      }
+    },
     "wallpapers": {
       "flake": false,
       "locked": {
@@ -626,11 +757,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1761431178,
+        "lastModified": 1773601989,
-        "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=",
+        "narHash": "sha256-2tJf/CQoHApoIudxHeJye+0Ii7scR0Yyi7pNiWk0Hn8=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9",
+        "rev": "a9b862d1aa000a676d310cc62d249f7ad726233d",
         "type": "github"
       },
       "original": {
@@ -638,6 +769,50 @@
         "repo": "xdg-desktop-portal-hyprland",
         "type": "github"
       }
+    },
+    "zut-calendar": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "pyproject-build-systems": "pyproject-build-systems",
+        "pyproject-nix": "pyproject-nix",
+        "uv2nix": "uv2nix"
+      },
+      "locked": {
+        "lastModified": 1773515729,
+        "narHash": "sha256-+TfrJdqRxmzarLednTCFfxDi1uGNYnIbtyLAFw2Pj0U=",
+        "owner": "szymon-jozef",
+        "repo": "zut-calendar",
+        "rev": "3284491807e196414445326d11913b43e7a0225f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "szymon-jozef",
+        "repo": "zut-calendar",
+        "type": "github"
+      }
+    },
+    "zutui": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1774282006,
+        "narHash": "sha256-tF+/CbZhOvIl4F/WJtT2V376WjGIXSFXRSDMGI11KJk=",
+        "owner": "shv187",
+        "repo": "zutui",
+        "rev": "fcce7c254c74638efa667df7a4f603d01362a835",
+        "type": "github"
+      },
+      "original": {
+        "owner": "shv187",
+        "repo": "zutui",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -1,24 +1,42 @@
 {
-  description = "Home manager config";
+  description = "Amazing dotfiles";
 
   inputs = {
-    hyprland.url = "github:hyprwm/Hyprland";
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    catppuccin.url = "github:catppuccin/nix";
+    hyprland.url = "github:hyprwm/Hyprland";
-    wallpapers = {
-      url = "github:orangci/walls-catppuccin-mocha";
-      flake = false;
-    };
 
     nixvim = {
       url = "github:nix-community/nixvim";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    # theming stuff
+    catppuccin = {
+      url = "github:catppuccin/nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    hyprcursor-phinger.url = "github:jappie3/hyprcursor-phinger";
+    wallpapers = {
+      url = "github:orangci/walls-catppuccin-mocha";
+      flake = false;
+    };
+
+    # uni stuff
+    zut-calendar = {
+      url = "github:szymon-jozef/zut-calendar";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    zutui = {
+      url = "github:shv187/zutui";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
   };
 
   outputs =
@@ -28,68 +46,97 @@
       catppuccin,
       nixvim,
       wallpapers,
+      zut-calendar,
+      zutui,
       ...
     }@inputs:
 
     let
-      userConfig = {
+      defaultUserConfig = {
         username = "szymon";
-        # for git
         email = "szymon_jozef@proton.me";
         fullName = "Szymon P";
-        # 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";
-        statusBar = "ashell"; # available: ashell|waybar
+        statusBar = "ashell"; # available: ashell | waybar
 
         pathConfig = {
           wallpaper = "Obrazy/tapety/catppuccin";
           screenshot = "Obrazy/zrzuty/";
           obsidian = "Dokumenty/obsidian";
         };
+
+        isNixOS = true;
+        hostName = "default";
+        animations = true;
       };
 
       system = "x86_64-linux";
+
+      pkgs = import nixpkgs {
+        inherit system;
+        config.allowUnfree = true;
+      };
+
+      mkHome =
+        customConfig:
+        let
+          userConfig = defaultUserConfig // customConfig;
+        in
+        home-manager.lib.homeManagerConfiguration {
+          inherit pkgs;
+
+          extraSpecialArgs = {
+            inherit inputs userConfig;
+          };
+
+          modules = [
+            ./home.nix
+            catppuccin.homeModules.catppuccin
+            nixvim.homeModules.nixvim
+            inputs.hyprcursor-phinger.homeManagerModules.hyprcursor-phinger
+            (
+              { pkgs, ... }:
+              {
+                home.packages = [
+                  zut-calendar.packages.${pkgs.stdenv.hostPlatform.system}.default
+                  zutui.packages.${pkgs.stdenv.hostPlatform.system}.default
+                ];
+              }
+            )
+          ]
+          ++ (customConfig.extraModules or [ ]);
+        };
+
     in
     {
       homeConfigurations = {
-        "arch" = home-manager.lib.homeManagerConfiguration {
+        # You can overwrite default configuration here
-          pkgs = import nixpkgs {
-            inherit system;
-            config.allowUnfree = true;
-          };
-          extraSpecialArgs = {
-            inherit
-              inputs
-              userConfig
-              ;
-            isNixOS = false;
-          };
-          modules = [
-            ./home.nix
-            catppuccin.homeModules.catppuccin
-            nixvim.homeModules.nixvim
-          ];
 
+        "arch" = mkHome {
+          isNixOS = false;
+          hostName = "arch";
         };
-        "nixos" = home-manager.lib.homeManagerConfiguration {
+
-          pkgs = import nixpkgs {
+        "nixos" = mkHome {
-            inherit system;
+          isNixOS = true;
-            config.allowUnfree = true;
+          hostName = "nixos";
-          };
+        };
-          extraSpecialArgs = {
+
-            inherit
+        "${defaultUserConfig.username}@pitagoras" = mkHome {
-              inputs
+          hostName = "pitagoras";
-              userConfig
+          mainMonitor = "eDP-1";
-              ;
+          animations = false;
-            isNixOS = true;
+        };
-          };
+
-          modules = [
+        "${defaultUserConfig.username}@pilecki" = mkHome {
-            ./home.nix
+          hostName = "pilecki";
-            catppuccin.homeModules.catppuccin
+          mainMonitor = "LVDS-1";
-            nixvim.homeModules.nixvim
+        };
-          ];
+
+        "${defaultUserConfig.username}@paderewski" = mkHome {
+          hostName = "paderewski";
         };
       };
     };

hash.txt

@@ -0,0 +1 @@
+            got:    sha256-IGkP0z8gJj1dbNclpMebZXZvaRby1F8zGNEDPtitfqo=

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/bars/ashell.nix

@@ -1,6 +1,5 @@
 {
   lib,
-  isNixOS,
   userConfig,
   pkgs,
   ...
@@ -9,7 +8,7 @@
 {
   programs.ashell = {
     enable = true;
-    package = lib.mkIf (!isNixOS) null;
+    package = lib.mkIf (!userConfig.isNixOS) null;
     settings = {
       outputs = {
         Targets = [ userConfig.mainMonitor ];

modules/bars/waybar.nix

@@ -1,6 +1,5 @@
 {
   pkgs,
-  isNixOS,
   userConfig,
   ...
 }:
@@ -9,7 +8,7 @@
   programs.waybar = {
     enable = true;
     package =
-      if isNixOS then pkgs.waybar else (pkgs.writeShellScriptBin "waybar" "exec /usr/bin/waybar \"$@\"");
+      if userConfig.isNixOS then pkgs.waybar else (pkgs.writeShellScriptBin "waybar" "exec /usr/bin/waybar \"$@\"");
     settings = {
       mainBar = {
         layer = "top";

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, ... }:
+{ userConfig, ... }:
 
 {
   programs.fish = {
@@ -17,6 +17,8 @@
 
         fish_vi_key_bindings
 
+        direnv hook fish | source
+
         fastfetch --config ~/.config/fastfetch/startup.jsonc
       '';
 
@@ -45,7 +47,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
                         git add -A
                         set commit_msg "update: $rel_file"
                         git commit -m "$commit_msg"
@@ -61,17 +63,12 @@
 
       reload_dotfiles = {
         body = # fish
-          "nh home switch ~/.config/home-manager -c ${if isNixOS then "nixos" else "arch"}";
+          "nh home switch ~/.config/home-manager";
       };
 
-      ls = {
+      reload_system = {
         body = # fish
-          "eza --long --icons --group-directories-first --git $argv";
+          "nh os switch /etc/nixos/";
-      };
-
-      lst = {
-        body = # fish
-          "eza --long --icons --color --git --tree  $argv";
       };
 
       cp_mail = {
@@ -79,49 +76,135 @@
           "pandoc $argv -t html |wl-copy -t text/html";
       };
 
-      update = {
+      update_files = {
-        body = # fish
+        body =
+          # fish
           ''
-            echo "===System update==="
+            echo "=== System packages updates ==="
+            pushd /etc/nixos
 
-            if not type -q yay
+            git add -A
-              echo "Yay not found… Is this Arch? If yes, then please consider installing it!"
+            git commit -m 'chore: state before pulling'
-            else
+
-              yay
+            if git pull
+                reload_system
             end
 
-            if type -q pacman
+            popd
-                echo "===Remove orphans==="
+
-                set orphans (pacman -Qtdq)
+            echo "=== User packages update ==="
-                if test (count $orphans) -gt 0
+            pushd $HOME/.config/home-manager
-                    sudo pacman -Rns $orphans
+
-                end
+            git add -A 
+            git commit -m 'chore: state before pulling'
+
+            if git pull
+              reload_dotfiles
             end
 
-            if type -q flatpak
+            popd
-                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 = {
+      update = {
-        body = "trash $argv";
+        body =
-      };
+          if userConfig.isNixOS then
+            # fish
+            ''
+              echo "=== System packages update ==="
+              pushd /etc/nixos
 
-      open = {
+              if git pull
-        body = "nohup xdg-open $argv > /dev/null & ";
+                git add -A
-      };
+                git commit --allow-empty -m "chore: state before system update"
                 
+                nix flake update
+                
+                if test $status -eq 0
+                    git add ./flake.lock
+                    git commit --allow-empty -m "chore: update system flake.lock"
+                    reload_system 
+                    git push
+                else
+                    echo "Error while updating system flake!"
+                end
+              else
+                echo "Error: 'git pull' failed in /etc/nixos. Skipping system update."
+              end
+
+              popd
+
+              echo "=== User packages update ==="
+              pushd $HOME/.config/home-manager
+
+              if git pull
+                git add -A
+                git commit --allow-empty -m "chore: state before home-manager update"
+                
+                nix flake update
+                
+                if test $status -eq 0
+                    git add ./flake.lock
+                    git commit --allow-empty -m "chore: update home flake.lock"
+                    git push
+                    reload_dotfiles
+                else
+                    echo "Error while updating home flake!"
+                end
+              else
+                echo "Error: 'git pull' failed in home-manager. Skipping user update."
+              end
+
+              popd
+
+              if type -q flatpak
+                echo "=== Flatpak update ==="
+                flatpak update --noninteractive
+                
+                echo "=== Flatpak remove unused ==="
+                flatpak uninstall --unused --noninteractive
+              end
+            ''
+          else
+            # fish
+            ''
+              echo "===System update==="
+
+              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
+            '';
+      };
+    };
+    shellAliases = {
+      ls = "eza --long --icons --group-directories-first --git";
+      lst = "eza --long --icons --color --git --tree";
+      rm = "trash";
     };
   };
 }

modules/cli/git.nix

@@ -41,6 +41,7 @@
       "node_modules"
       "result"
       "__pycache__"
+      ".direnv"
     ];
 
   };

modules/cli/nixvim.nix

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

modules/gtk.nix

@@ -4,6 +4,7 @@
   gtk = {
     enable = true;
     colorScheme = "dark";
+    gtk4.theme = null;
   };
 
   dconf = {

modules/gui/browsers.nix

@@ -1,8 +1,8 @@
-{ isNixOS, lib, ... }:
+{ userConfig, lib, ... }:
 
 {
   programs.chromium = {
     enable = true;
-    package = lib.mkIf (!isNixOS) null;
+    package = lib.mkIf (!userConfig.isNixOS) null;
   };
 }

modules/gui/kitty.nix

@@ -1,9 +1,9 @@
-{ lib, isNixOS, ... }:
+{ lib, userConfig, ... }:
 
 {
   programs.kitty = {
     enable = true;
-    package = lib.mkIf (!isNixOS) null;
+    package = lib.mkIf (!userConfig.isNixOS) null;
     settings = {
       confirm_os_window_close = 0;
       dynamic_background_opacity = true;

modules/gui/mako.nix

@@ -1,4 +1,4 @@
-{ isNixOS, pkgs, ... }:
+{ userConfig, pkgs, ... }:
 
 {
   services.mako = {
@@ -21,7 +21,7 @@
       progress-color = "over #313244";
       output = "DP-1";
       on-notify =
-        if isNixOS then
+        if userConfig.isNixOS then
           "exec ${pkgs.pulseaudio}/bin/paplay ${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/dialog-information.oga"
         else
           "exec paplay /usr/share/sounds/freedesktop/stereo/dialog-information.oga";
@@ -36,7 +36,7 @@
 
       [urgency=critical]
       on-notify=${
-        if isNixOS then
+        if userConfig.isNixOS then
           "exec ${pkgs.pulseaudio}/bin/paplay ${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/dialog-information.oga"
         else
           "exec paplay /usr/share/sounds/freedesktop/stereo/dialog-information.oga"

modules/gui/mangohud.nix

@@ -1,7 +1,7 @@
 {
   config,
   pkgs,
-  isNixOS,
+  userConfig,
   ...
 }:
 
@@ -10,7 +10,7 @@
 
   programs.mangohud = {
     enable = true;
-    package = if isNixOS then pkgs.mangohud else (pkgs.runCommand "dummy-mangohud" { } "mkdir $out");
+    package = if userConfig.isNixOS then pkgs.mangohud else (pkgs.runCommand "dummy-mangohud" { } "mkdir $out");
   };
 
   xdg.configFile."MangoHud/MangoHud.conf".text = ''

modules/gui/obsidian-catppuccin.nix

@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     owner = "catppuccin";
     repo = "obsidian";
     rev = "main";
-    hash = "sha256-sN5k263geOtJ1mOCQGM8UdmA/71OhBI5NRwGxJwd80E=";
+    hash = "sha256-uB0a2nSZkHHf65xBYXyNh50vaAiqdEpKQVf3eXnCVlE=";
   };
 
   installPhase = ''

modules/gui/obsidian.nix

@@ -1,5 +1,4 @@
 {
-  isNixOS,
   lib,
   pkgs,
   userConfig,
@@ -9,7 +8,7 @@
 {
   programs.obsidian = {
     enable = true;
-    package = lib.mkIf (!isNixOS) null;
+    package = lib.mkIf (!userConfig.isNixOS) null;
 
     defaultSettings = {
       app = {

modules/gui/satty.nix

@@ -1,6 +1,5 @@
 {
   lib,
-  isNixOS,
   userConfig,
   ...
 }:
@@ -8,7 +7,7 @@
 {
   programs.satty = {
     enable = true;
-    package = lib.mkIf (!isNixOS) null;
+    package = lib.mkIf (!userConfig.isNixOS) null;
     settings = {
       general = {
         fullscreen = true;

modules/hypr/hypridle.nix

@@ -1,9 +1,9 @@
-{ isNixOS, lib, ... }:
+{ userConfig, lib, ... }:
 
 {
   services.hypridle = {
     enable = true;
-    package = lib.mkIf (!isNixOS) null;
+    package = lib.mkIf (!userConfig.isNixOS) null;
 
     settings = {
       general = {

modules/hypr/hyprland.nix

@@ -1,12 +1,12 @@
 {
-  isNixOS,
   lib,
   userConfig,
   pkgs,
+  inputs,
   ...
 }:
 let
-  exe = pkg: bin: if isNixOS then "${pkg}/bin/${bin}" else "/usr/bin/${bin}";
+  exe = pkg: bin: if userConfig.isNixOS then "${pkg}/bin/${bin}" else "/usr/bin/${bin}";
 
   jq = exe pkgs.jq "jq";
   grim = exe pkgs.grim "grim";
@@ -14,7 +14,7 @@ let
   wl_copy = exe pkgs.wl-clipboard "wl-copy";
   notify_send = exe pkgs.libnotify "notify-send";
   xdg-desktop-portal-hyprland =
-    if isNixOS then
+    if userConfig.isNixOS then
       "${pkgs.xdg-desktop-portal-hyprland}/libexec/xdg-desktop-portal-hyprland"
     else
       "/usr/lib/xdg-desktop-portal-hyprland";
@@ -24,15 +24,22 @@ in
 {
   wayland.windowManager.hyprland = {
     enable = true;
-    package = lib.mkIf (!isNixOS) null;
+    package =
+      if userConfig.isNixOS then
+        inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland
+      else
+        null;
+    portalPackage = lib.mkIf (userConfig.isNixOS
+    ) inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
+    xwayland.enable = true;
 
     settings = {
       "$mainMod" = "SUPER";
       "$terminal" = "uwsm app -- kitty";
       "$menu" = "hyprlauncher";
-      "$music_player" = "flatpak run com.spotify.Client";
+      "$music_player" = if userConfig.isNixOS then "spotify" else "flatpak run com.spotify.Client";
       "$notes" = "obsidian";
-      "$browser" = "zen-browser";
+      "$browser" = if userConfig.isNixOS then "zen-beta" else "zen-browser"; # beta on nixos
       "$openrgb_color" = "09ce30";
 
       env = [
@@ -50,11 +57,11 @@ in
         "col.inactive_border" = "$overlay1";
         resize_on_border = false;
         allow_tearing = false;
-        layout = "dwindle";
+        layout = "scrolling";
       };
 
       animations = {
-        enabled = true;
+        enabled = userConfig.animations;
         bezier = [
           "easeOutQuint,0.23,1,0.32,1"
           "easeInOutCubic,0.65,0.05,0.36,1"
@@ -129,13 +136,18 @@ in
         kb_options = "caps:escape_shifted_capslock";
         kb_rules = "";
         follow_mouse = 1;
-        left_handed = true;
+        left_handed = false;
-        sensitivity = 0;
+        sensitivity = -0.5;
         touchpad = {
           natural_scroll = true;
         };
       };
 
+      device = {
+        name = "msft0001:01-06cb:7f28-touchpad";
+        sensitivity = 0;
+      };
+
       cursor = {
         no_hardware_cursors = true;
         inactive_timeout = 5;
@@ -168,6 +180,7 @@ in
 
       workspace = [
         "1, monitor:DP-2"
+        "1, layout: dwindle"
         "2, monitor:DP-1"
         "3, monitor:DP-1"
         "4, monitor:DP-1"
@@ -191,6 +204,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"
@@ -202,6 +216,7 @@ 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"
@@ -343,8 +358,6 @@ in
       bindd = [
         "$mainMod, F, Make app fullscreen, fullscreen"
         "$mainMod, T, Toggle floating, togglefloating"
-        "$mainMod, P, Toggle pseudo, pseudo"
-        "$mainMod, S, Toggle split, togglesplit"
         "$mainMod, Q, Kill active window, killactive"
       ];
     };

modules/hypr/hyprlauncher.nix

@@ -1,9 +1,9 @@
-{ isNixOS, lib, ... }:
+{ userConfig, lib, ... }:
 
 {
   services.hyprlauncher = {
     enable = true;
-    package = lib.mkIf (!isNixOS) null;
+    package = lib.mkIf (!userConfig.isNixOS) null;
 
     settings = {
       cache.enabled = true;

modules/hypr/hyprlock.nix

@@ -1,9 +1,9 @@
-{ isNixOS, lib, ... }:
+{ userConfig, lib, ... }:
 
 {
   programs.hyprlock = {
     enable = true;
-    package = lib.mkIf (!isNixOS) null;
+    package = lib.mkIf (!userConfig.isNixOS) null;
 
     settings = {
       "$font" = "Monospace";

modules/hypr/hyprsunset.nix

@@ -1,5 +1,5 @@
 {
-  isNixOS,
+  userConfig,
   pkgs,
   ...
 }:
@@ -8,7 +8,7 @@
   services.hyprsunset = {
     enable = true;
     package =
-      if isNixOS then
+      if userConfig.isNixOS then
         pkgs.hyprsunset
       else
         (pkgs.writeShellScriptBin "hyprsunset" "exec /usr/bin/hyprsunset \"$@\"");

modules/packages.nix

@@ -19,5 +19,11 @@
     slurp
     bc
     nh
+    runc
   ];
+
+  xdg.configFile."containers/containers.conf".text = ''
+    [engine]
+    runtime = "runc"
+  '';
 }

modules/xdg.nix

@@ -59,5 +59,6 @@ in
     videos = "$HOME/Video";
     templates = null;
     publicShare = null;
+    setSessionVariables = true;
   };
 }

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/