merge

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

flake.lock

@@ -20,11 +20,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774211390,
+        "lastModified": 1771610171,
-        "narHash": "sha256-sTtAgCCaX8VNNZlQFACd3i1IQ+DB0Wf3COgiFS152ds=",
+        "narHash": "sha256-+DeInuhbm6a6PpHDNUS7pozDouq2+8xSDefoNaZLW0E=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "f62a4dbfa4e5584f14ad4c62afedf6e4b433cf70",
+        "rev": "7f9eb087703ec4acc6b288d02fa9ea3db803cd3d",
         "type": "github"
       },
       "original": {
@@ -35,16 +35,14 @@
     },
     "catppuccin": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs"
-          "nixpkgs"
-        ]
       },
       "locked": {
-        "lastModified": 1774098279,
+        "lastModified": 1771587924,
-        "narHash": "sha256-OoQRoQmwCuBBXObi82F6C+eYV1lYCt5Va5k/VckJ6vo=",
+        "narHash": "sha256-eVYOGmF8nQBhudJyU6lHdgJI87kvGz8JyCq5/Vi9Mjk=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "cb374516af3ccc3aa0c6ef518292bf4ae417a60e",
+        "rev": "b0c65edbf31c2ad3d84438d82c2310f2c28373f3",
         "type": "github"
       },
       "original": {
@@ -90,24 +88,6 @@
         "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": [
@@ -137,11 +117,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774584114,
+        "lastModified": 1772060133,
-        "narHash": "sha256-uWR9fC+4NykFJVn4GN4Ini9LX+w8Llj7BnWKKp0N6bw=",
+        "narHash": "sha256-VuyRptb8v1lVGMlLp4/1vRX3Efwec0CN0S6mKmDPzLg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "4b1be5c38be350ee9452a4847945ce71d950dc31",
+        "rev": "ce9b6e52500a0ea0ec48f0bbf6d7a3e431d9dfa4",
         "type": "github"
       },
       "original": {
@@ -166,11 +146,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772461003,
+        "lastModified": 1753964049,
-        "narHash": "sha256-pVICsV7FtcEeVwg5y/LFh3XFUkVJninm/P1j/JHzEbM=",
+        "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=",
         "owner": "hyprwm",
         "repo": "hyprcursor",
-        "rev": "b62396457b9cfe2ebf24fe05404b09d2a40f8ed7",
+        "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5",
         "type": "github"
       },
       "original": {
@@ -179,24 +159,6 @@
         "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": [
@@ -213,11 +175,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772461523,
+        "lastModified": 1770511807,
-        "narHash": "sha256-mI6A51do+hEUzeJKk9YSWfVHdI/SEEIBi2tp5Whq5mI=",
+        "narHash": "sha256-suKmSbSk34uPOJDTg/GbPrKEJutzK08vj0VoTvAFBCA=",
         "owner": "hyprwm",
         "repo": "hyprgraphics",
-        "rev": "7d63c04b4a2dd5e59ef943b4b143f46e713df804",
+        "rev": "7c75487edd43a71b61adb01cae8326d277aab683",
         "type": "github"
       },
       "original": {
@@ -243,11 +205,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1774561136,
+        "lastModified": 1772107319,
-        "narHash": "sha256-R/PNW48UnEwUIUr9QXMT6KY/laufI4ikiz7Druxpglg=",
+        "narHash": "sha256-qdeeNrWmUe1P2FsnNU1ngoZl8UxczEMJBziwm78V42I=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "2fde538e0fa5663ac99f631fcfee6742e09368f6",
+        "rev": "c71fbd854dfdedaae011f4b8b1fdb81f8054b309",
         "type": "github"
       },
       "original": {
@@ -289,11 +251,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772467975,
+        "lastModified": 1767023960,
-        "narHash": "sha256-kipyuDBxrZq+beYpZqWzGvFWm4QbayW9agAvi94vDXY=",
+        "narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=",
         "owner": "hyprwm",
         "repo": "hyprland-guiutils",
-        "rev": "5e1c6b9025aaf4d578f3eff7c0eb1f0c197a9507",
+        "rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660",
         "type": "github"
       },
       "original": {
@@ -314,11 +276,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772460177,
+        "lastModified": 1765214753,
-        "narHash": "sha256-/6G/MsPvtn7bc4Y32pserBT/Z4SUUdBd4XYJpOEKVR4=",
+        "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=",
         "owner": "hyprwm",
         "repo": "hyprland-protocols",
-        "rev": "1cb6db5fd6bb8aee419f4457402fa18293ace917",
+        "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab",
         "type": "github"
       },
       "original": {
@@ -343,11 +305,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772459629,
+        "lastModified": 1771866172,
-        "narHash": "sha256-/iwvNUYShmmnwmz/czEUh6+0eF5vCMv0xtDW0STPIuM=",
+        "narHash": "sha256-fYFoXhQLrm1rD8vSFKQBOEX4OGCuJdLt1amKfHd5GAw=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "7615ee388de18239a4ab1400946f3d0e498a8186",
+        "rev": "0b219224910e7642eb0ed49f0db5ec3d008e3e41",
         "type": "github"
       },
       "original": {
@@ -395,11 +357,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772462885,
+        "lastModified": 1764592794,
-        "narHash": "sha256-5pHXrQK9zasMnIo6yME6EOXmWGFMSnCITcfKshhKJ9I=",
+        "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=",
         "owner": "hyprwm",
         "repo": "hyprtoolkit",
-        "rev": "9af245a69fa6b286b88ddfc340afd288e00a6998",
+        "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e",
         "type": "github"
       },
       "original": {
@@ -420,11 +382,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774211405,
+        "lastModified": 1771271487,
-        "narHash": "sha256-6KNwP4ojUzv3YBlZU5BqCpTrWHcix1Jo01BISsTT0xk=",
+        "narHash": "sha256-41gEiUS0Pyw3L/ge1l8MXn61cK14VAhgWB/JV8s/oNI=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "cb4e152dc72095a2af422956c6b689590572231a",
+        "rev": "340a792e3b3d482c4ae5f66d27a9096bdee6d76d",
         "type": "github"
       },
       "original": {
@@ -445,11 +407,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772459835,
+        "lastModified": 1770501770,
-        "narHash": "sha256-978jRz/y/9TKmZb/qD4lEYHCQGHpEXGqy+8X2lFZsak=",
+        "narHash": "sha256-NWRM6+YxTRv+bT9yvlhhJ2iLae1B1pNH3mAL5wi2rlQ=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "0a692d4a645165eebd65f109146b8861e3a925e7",
+        "rev": "0bd8b6cde9ec27d48aad9e5b4deefb3746909d40",
         "type": "github"
       },
       "original": {
@@ -474,11 +436,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773074819,
+        "lastModified": 1771606233,
-        "narHash": "sha256-qRqYnXiKoJLRTcfaRukn7EifmST2IVBUMZOeZMAc5UA=",
+        "narHash": "sha256-F3PLUqQ/TwgR70U+UeOqJnihJZ2EuunzojYC4g5xHr0=",
         "owner": "hyprwm",
         "repo": "hyprwire",
-        "rev": "f68afd0e73687598cc2774804fedad76693046f0",
+        "rev": "06c7f1f8c4194786c8400653c4efc49dc14c0f3a",
         "type": "github"
       },
       "original": {
@@ -489,15 +451,15 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1762977756,
+        "lastModified": 1771369470,
-        "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
+        "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
-        "owner": "nixos",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
+        "rev": "0182a361324364ae3f436a63005877674cf45efb",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
+        "owner": "NixOS",
         "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
@@ -505,11 +467,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1774106199,
+        "lastModified": 1771848320,
-        "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
+        "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
+        "rev": "2fc6539b481e1d2569f25f8799236694180c0993",
         "type": "github"
       },
       "original": {
@@ -521,11 +483,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1774386573,
+        "lastModified": 1771848320,
-        "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
+        "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
+        "rev": "2fc6539b481e1d2569f25f8799236694180c0993",
         "type": "github"
       },
       "original": {
@@ -544,11 +506,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1774309640,
+        "lastModified": 1771135771,
-        "narHash": "sha256-8oWL7YLwElBY9ebYri1LlSlhf/gd1Qoqj0nbBwG2yso=",
+        "narHash": "sha256-wyvBIhDuyCRyjB3yPg77qoyxrlgQtBR1rVW3c9knV3E=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "28c58bf023bf537354f78d6e496a349d7a0ed554",
+        "rev": "ed0424f0b08d303a7348f52f7850ad1b2704f9ba",
         "type": "github"
       },
       "original": {
@@ -567,11 +529,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774104215,
+        "lastModified": 1771858127,
-        "narHash": "sha256-EAtviqz0sEAxdHS4crqu7JGR5oI3BwaqG0mw7CmXkO8=",
+        "narHash": "sha256-Gtre9YoYl3n25tJH2AoSdjuwcqij5CPxL3U3xysYD08=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "f799ae951fde0627157f40aec28dec27b22076d0",
+        "rev": "49bbbfc218bf3856dfa631cead3b052d78248b83",
         "type": "github"
       },
       "original": {
@@ -580,67 +542,14 @@
         "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": {
@@ -673,46 +582,6 @@
         "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": {
@@ -757,11 +626,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773601989,
+        "lastModified": 1761431178,
-        "narHash": "sha256-2tJf/CQoHApoIudxHeJye+0Ii7scR0Yyi7pNiWk0Hn8=",
+        "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "a9b862d1aa000a676d310cc62d249f7ad726233d",
+        "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9",
         "type": "github"
       },
       "original": {
@@ -769,50 +638,6 @@
         "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,42 +1,24 @@
 {
-  description = "Amazing dotfiles";
+  description = "Home manager config";
 
   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";
     };
 
-    hyprland.url = "github:hyprwm/Hyprland";
+    catppuccin.url = "github:catppuccin/nix";
-
-    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
+    nixvim = {
-    zut-calendar = {
+      url = "github:nix-community/nixvim";
-      url = "github:szymon-jozef/zut-calendar";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    zutui = {
-      url = "github:shv187/zutui";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
   };
 
   outputs =
@@ -46,97 +28,68 @@
       catppuccin,
       nixvim,
       wallpapers,
-      zut-calendar,
-      zutui,
       ...
     }@inputs:
 
     let
-      defaultUserConfig = {
+      userConfig = {
         username = "szymon";
+        # for git
         email = "szymon_jozef@proton.me";
         fullName = "Szymon P";
+        # your public ssh key
         signingKey = "~/.ssh/github.pub";
 
-        mainMonitor = "DP-1";
+        mainMonitor = "eDP-1"; # only for some applications: you still need to set hyprland monitors yourself!
-        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";
-
+    in
-      pkgs = import nixpkgs {
+    {
-        inherit system;
+      homeConfigurations = {
-        config.allowUnfree = true;
+        "arch" = home-manager.lib.homeManagerConfiguration {
-      };
+          pkgs = import nixpkgs {
-
+            inherit system;
-      mkHome =
+            config.allowUnfree = true;
-        customConfig:
+          };
-        let
+          extraSpecialArgs = {
-          userConfig = defaultUserConfig // customConfig;
+            inherit
-        in
+              inputs
-        home-manager.lib.homeManagerConfiguration {
+              userConfig
-          inherit pkgs;
+              ;
-
+            isNixOS = false;
-          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 [ ]);
         };
-
+        "nixos" = home-manager.lib.homeManagerConfiguration {
-    in
+          pkgs = import nixpkgs {
-    {
+            inherit system;
-      homeConfigurations = {
+            config.allowUnfree = true;
-        # You can overwrite default configuration here
+          };
-
+          extraSpecialArgs = {
-        "arch" = mkHome {
+            inherit
-          isNixOS = false;
+              inputs
-          hostName = "arch";
+              userConfig
-        };
+              ;
-
+            isNixOS = true;
-        "nixos" = mkHome {
+          };
-          isNixOS = true;
+          modules = [
-          hostName = "nixos";
+            ./home.nix
-        };
+            catppuccin.homeModules.catppuccin
-
+            nixvim.homeModules.nixvim
-        "${defaultUserConfig.username}@pitagoras" = mkHome {
+          ];
-          hostName = "pitagoras";
-          mainMonitor = "eDP-1";
-          animations = false;
-        };
-
-        "${defaultUserConfig.username}@pilecki" = mkHome {
-          hostName = "pilecki";
-          mainMonitor = "LVDS-1";
-        };
-
-        "${defaultUserConfig.username}@paderewski" = mkHome {
-          hostName = "paderewski";
         };
       };
     };

hash.txt

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

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

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

modules/bars/waybar.nix

@@ -1,5 +1,6 @@
 {
   pkgs,
+  isNixOS,
   userConfig,
   ...
 }:
@@ -8,7 +9,7 @@
   programs.waybar = {
     enable = true;
     package =
-      if userConfig.isNixOS then pkgs.waybar else (pkgs.writeShellScriptBin "waybar" "exec /usr/bin/waybar \"$@\"");
+      if 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 = "nixos_small";
+      source = "arch_small";
       padding = {
         bottom = 1;
       };

modules/cli/fish.nix

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

modules/cli/git.nix

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

modules/cli/nixvim.nix

@@ -100,30 +100,6 @@
         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 = {
@@ -227,14 +203,9 @@
         };
       };
 
-      cursorline = {
+      indent-blankline = {
         enable = true;
-        timeout = 0;
+        settings.scope.enabled = true;
-      };
-
-      mini-indentscope = {
-        enable = true;
-        settings.draw.delay = 0;
       };
 
       cmp = {

modules/gtk.nix

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

modules/gui/browsers.nix

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

modules/gui/kitty.nix

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

modules/gui/mako.nix

@@ -1,4 +1,4 @@
-{ userConfig, pkgs, ... }:
+{ isNixOS, pkgs, ... }:
 
 {
   services.mako = {
@@ -21,7 +21,7 @@
       progress-color = "over #313244";
       output = "DP-1";
       on-notify =
-        if userConfig.isNixOS then
+        if 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 userConfig.isNixOS then
+        if 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,
-  userConfig,
+  isNixOS,
   ...
 }:
 
@@ -10,7 +10,7 @@
 
   programs.mangohud = {
     enable = true;
-    package = if userConfig.isNixOS then pkgs.mangohud else (pkgs.runCommand "dummy-mangohud" { } "mkdir $out");
+    package = if 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-uB0a2nSZkHHf65xBYXyNh50vaAiqdEpKQVf3eXnCVlE=";
+    hash = "sha256-sN5k263geOtJ1mOCQGM8UdmA/71OhBI5NRwGxJwd80E=";
   };
 
   installPhase = ''

modules/gui/obsidian.nix

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

modules/gui/satty.nix

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

modules/hypr/hypridle.nix

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

modules/hypr/hyprland.nix

@@ -1,12 +1,13 @@
 {
+  isNixOS,
   lib,
   userConfig,
-  pkgs,
   inputs,
+  pkgs,
   ...
 }:
 let
-  exe = pkg: bin: if userConfig.isNixOS then "${pkg}/bin/${bin}" else "/usr/bin/${bin}";
+  exe = pkg: bin: if isNixOS then "${pkg}/bin/${bin}" else "/usr/bin/${bin}";
 
   jq = exe pkgs.jq "jq";
   grim = exe pkgs.grim "grim";
@@ -14,7 +15,7 @@ let
   wl_copy = exe pkgs.wl-clipboard "wl-copy";
   notify_send = exe pkgs.libnotify "notify-send";
   xdg-desktop-portal-hyprland =
-    if userConfig.isNixOS then
+    if isNixOS then
       "${pkgs.xdg-desktop-portal-hyprland}/libexec/xdg-desktop-portal-hyprland"
     else
       "/usr/lib/xdg-desktop-portal-hyprland";
@@ -25,11 +26,9 @@ in
   wayland.windowManager.hyprland = {
     enable = true;
     package =
-      if userConfig.isNixOS then
+      if isNixOS then inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland else null;
-        inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland
+    portalPackage = lib.mkIf (
-      else
+      isNixOS
-        null;
-    portalPackage = lib.mkIf (userConfig.isNixOS
     ) inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
     xwayland.enable = true;
 
@@ -37,9 +36,9 @@ in
       "$mainMod" = "SUPER";
       "$terminal" = "uwsm app -- kitty";
       "$menu" = "hyprlauncher";
-      "$music_player" = if userConfig.isNixOS then "spotify" else "flatpak run com.spotify.Client";
+      "$music_player" = "flatpak run com.spotify.Client";
       "$notes" = "obsidian";
-      "$browser" = if userConfig.isNixOS then "zen-beta" else "zen-browser"; # beta on nixos
+      "$browser" = "zen-browser";
       "$openrgb_color" = "09ce30";
 
       env = [
@@ -61,7 +60,7 @@ in
       };
 
       animations = {
-        enabled = userConfig.animations;
+        enabled = true;
         bezier = [
           "easeOutQuint,0.23,1,0.32,1"
           "easeInOutCubic,0.65,0.05,0.36,1"
@@ -136,18 +135,13 @@ in
         kb_options = "caps:escape_shifted_capslock";
         kb_rules = "";
         follow_mouse = 1;
-        left_handed = false;
+        left_handed = true;
-        sensitivity = -0.5;
+        sensitivity = 0;
         touchpad = {
           natural_scroll = true;
         };
       };
 
-      device = {
-        name = "msft0001:01-06cb:7f28-touchpad";
-        sensitivity = 0;
-      };
-
       cursor = {
         no_hardware_cursors = true;
         inactive_timeout = 5;
@@ -180,7 +174,6 @@ in
 
       workspace = [
         "1, monitor:DP-2"
-        "1, layout: dwindle"
         "2, monitor:DP-1"
         "3, monitor:DP-1"
         "4, monitor:DP-1"
@@ -204,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"
@@ -216,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"
@@ -358,6 +349,8 @@ 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 @@
-{ userConfig, lib, ... }:
+{ isNixOS, lib, ... }:
 
 {
   services.hyprlauncher = {
     enable = true;
-    package = lib.mkIf (!userConfig.isNixOS) null;
+    package = lib.mkIf (!isNixOS) null;
 
     settings = {
       cache.enabled = true;

modules/hypr/hyprlock.nix

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

modules/hypr/hyprsunset.nix

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

modules/packages.nix

@@ -2,6 +2,9 @@
 
 {
   home.packages = with pkgs; [
+    waypaper
+    swww
+    gnupg
     libnotify
     cliphist
     gh
@@ -19,11 +22,5 @@
     slurp
     bc
     nh
-    runc
   ];
-
-  xdg.configFile."containers/containers.conf".text = ''
-    [engine]
-    runtime = "runc"
-  '';
 }

modules/xdg.nix

@@ -59,6 +59,5 @@ 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/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/