diff --git a/files/nix-Wallpaper.png b/files/nix-Wallpaper.png new file mode 100644 index 0000000..abab9fd Binary files /dev/null and b/files/nix-Wallpaper.png differ diff --git a/flake.lock b/flake.lock index 1f65497..846baea 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1739298463, - "narHash": "sha256-oAFv9jKwwA7d7384d2LeywDSgwhvb3ZnrwbfoWPhXsI=", + "lastModified": 1742213273, + "narHash": "sha256-0l0vDb4anfsBu1rOs94bC73Hub+xEivgBAo6QXl2MmU=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "f239e5aadd6d23c48e085c2de3397e2058e54d16", + "rev": "484b732195cc53f4536ce4bd59a5c6402b1e7ccf", "type": "github" }, "original": { @@ -57,14 +57,16 @@ }, "catppuccin": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1739934729, - "narHash": "sha256-PcrLk10meIJICzUJqtCMOJxoITzbH52fZg2XAB7SSsM=", + "lastModified": 1742599566, + "narHash": "sha256-xr6ntmiUPXSh9o9mJ7og9vxALMQs1EQhIhWUAO2D1M0=", "owner": "catppuccin", "repo": "nix", - "rev": "b1ff2a638afa827f1473498190a2c1cae1cf41cf", + "rev": "5e303e8d7e251868fa79f83bbda69da90aa62402", "type": "github" }, "original": { @@ -79,14 +81,14 @@ "flake-schemas": "flake-schemas", "home-manager": "home-manager", "jovian": "jovian", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1740937018, - "narHash": "sha256-R4/+Vr4LpQWHwzZoM0fTyKKC1mGNF/NVHzIe6PqkJsY=", + "lastModified": 1743000413, + "narHash": "sha256-3F9ap1452VmR8xDjUmeCf9h2nnRIODY4Fh5RnCr0d0s=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "4ab66e175e54084ca831e2eb3e24fbb048f9cff0", + "rev": "21c2b03a213775c88eb0738f9ceb2e02b8463981", "type": "github" }, "original": { @@ -105,11 +107,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1740551776, - "narHash": "sha256-CkcCb2hGSL1owuZpjuNB6UQzlyaXgvuRXmjY6jLqjPc=", + "lastModified": 1742452566, + "narHash": "sha256-sVuLDQ2UIWfXUBbctzrZrXM2X05YjX08K7XHMztt36E=", "owner": "nix-community", "repo": "fenix", - "rev": "07a730bc80e8a4106df5b2341aa5602a240ee112", + "rev": "7d9ba794daf5e8cc7ee728859bc688d8e26d5f06", "type": "github" }, "original": { @@ -134,6 +136,22 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -143,11 +161,11 @@ ] }, "locked": { - "lastModified": 1738453229, - "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "type": "github" }, "original": { @@ -269,11 +287,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1741219435, - "narHash": "sha256-vJ1O1/wCyGXFlS6wgjnc3pJRduMpTxzeBWNJ9qQ4xDk=", + "lastModified": 1742908555, + "narHash": "sha256-VDfNSvObkY7YFJm4RiBOO4Sl/9XqGHUGsVcHQxKR19Q=", "ref": "refs/heads/main", - "rev": "21f53c22ad580a9a2baf3142f98d9fca111374ab", - "revCount": 119, + "rev": "865f04531c19ed2601d4381f5fe7f090925f3e6d", + "revCount": 145, "type": "git", "url": "https://gitlab.blahai.gay/elissa/haipkgs.git" }, @@ -291,11 +309,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1741133798, - "narHash": "sha256-LM7wQsDpw1FVdMgdD6yu8wZFCeGuZgMGdi9eyHZONtQ=", + "lastModified": 1742948217, + "narHash": "sha256-OJ+SgwvbzzAgCSFaGFr24KjKDA3uIrB3x39Qhqb711U=", "owner": "blahai", "repo": "haivim", - "rev": "bb6aa89edd5c649b339ed93f0e1d3c3c09806d47", + "rev": "513d55e7f9f15c2438a619c14d96da25e3aaa960", "type": "github" }, "original": { @@ -312,11 +330,11 @@ ] }, "locked": { - "lastModified": 1740494361, - "narHash": "sha256-Dd/GhJ9qKmUwuhgt/PAROG8J6YdU2ZjtJI9SQX5sVQI=", + "lastModified": 1742871411, + "narHash": "sha256-F3xBdOs5m0SE6Gq3jz+JxDOPvsLs22vbGfD05uF6xEc=", "owner": "nix-community", "repo": "home-manager", - "rev": "74f0a8546e3f2458c870cf90fc4b38ac1f498b17", + "rev": "869f2ec2add75ce2a70a6dbbf585b8399abec625", "type": "github" }, "original": { @@ -332,11 +350,11 @@ ] }, "locked": { - "lastModified": 1741217763, - "narHash": "sha256-g/TrltIjFHIjtzKY5CJpoPANfHQWDD43G5U1a/v5oVg=", + "lastModified": 1742996658, + "narHash": "sha256-snxgTLVq6ooaD3W3mPHu7LVWpoZKczhxHAUZy2ea4oA=", "owner": "nix-community", "repo": "home-manager", - "rev": "486b066025dccd8af7fbe5dd2cc79e46b88c80da", + "rev": "693840c01b9bef9e54100239cef937e53d4661bf", "type": "github" }, "original": { @@ -361,11 +379,11 @@ ] }, "locked": { - "lastModified": 1738664950, - "narHash": "sha256-xIeGNM+iivwVHkv9tHwOqoUP5dDrtees34bbFKKMZYs=", + "lastModified": 1742215578, + "narHash": "sha256-zfs71PXVVPEe56WEyNi2TJQPs0wabU4WAlq0XV7GcdE=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "7c6d165e1eb9045a996551eb9f121b6d1b30adc3", + "rev": "2fd36421c21aa87e2fe3bee11067540ae612f719", "type": "github" }, "original": { @@ -413,17 +431,17 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems_4", "xdph": "xdph" }, "locked": { - "lastModified": 1741218628, - "narHash": "sha256-Z+jPT8nijCV1EzCZ5XkLr8x82WPCX/GKk8OKg8Kr+s4=", + "lastModified": 1743009764, + "narHash": "sha256-ySdBBDjPGTzvca/0Cnuz3+EswXn33thVqYksMR+93M8=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "243376078655f304b01e5097c59108745bbb9da9", + "rev": "9ea76428b68fad5a68e9153bcb246547ac2e5d6c", "type": "github" }, "original": { @@ -541,11 +559,11 @@ ] }, "locked": { - "lastModified": 1739048914, - "narHash": "sha256-vd5rJBTmp2w7SDgfv23Zcd84ktI5eDA7e5UBzx+pKrU=", + "lastModified": 1741191527, + "narHash": "sha256-kM+11Nch47Xwfgtw2EpRitJuORy4miwoMuRi5tyMBDY=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "a7334904d591f38757c46fbe2ab68651877d9099", + "rev": "72df3861f1197e41b078faa3e38eedd60e00018d", "type": "github" }, "original": { @@ -566,11 +584,11 @@ ] }, "locked": { - "lastModified": 1739891528, - "narHash": "sha256-h8HOCZ/rw2Buzku+GKF77VXxrGjCSOQkLhptiEKMYg0=", + "lastModified": 1741534688, + "narHash": "sha256-EV3945SnjOCuRVbGRghsWx/9D89FyshnSO1Q6/TuQ14=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "61a5382f4b1ab578064d470b1b3d3f0df396b8ba", + "rev": "dd1f720cbc2dbb3c71167c9598045dd3261d27b3", "type": "github" }, "original": { @@ -591,11 +609,11 @@ ] }, "locked": { - "lastModified": 1739049028, - "narHash": "sha256-RleJp7LYbr6s+M1xgbmhtBs+fYa3ZdIiF7+QalJ4D1g=", + "lastModified": 1739870480, + "narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "04146df74a8d5ec0b579657307be01f1e241125f", + "rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b", "type": "github" }, "original": { @@ -643,11 +661,11 @@ ] }, "locked": { - "lastModified": 1740553144, - "narHash": "sha256-ujQ/f3mcYECH1o0vzakMLAQRCMeF/SXd8w4uBFHxYO8=", + "lastModified": 1742465245, + "narHash": "sha256-gpjtkoeq5Ye9J8GoR+rWg3NL4bbEtcLvvF4nN6MtxdU=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "14a125ea5c440c57310dc1bb3acf7641078d783a", + "rev": "a95606cae5c9e1f5b84debe7865ef171d4deb287", "type": "github" }, "original": { @@ -657,38 +675,48 @@ } }, "lix": { - "flake": false, + "inputs": { + "flake-compat": "flake-compat_2", + "nix2container": "nix2container", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-regression": "nixpkgs-regression", + "pre-commit-hooks": "pre-commit-hooks_2" + }, "locked": { - "lastModified": 1737234286, - "narHash": "sha256-CCKIAE84dzkrnlxJCKFyffAxP3yfsOAbdvydUGqq24g=", - "rev": "2837da71ec1588c1187d2e554719b15904a46c8b", + "lastModified": 1743005126, + "narHash": "sha256-d268do3GoJzDgLHbb35Ie55p9izeBQzE3pP/LsHMmdY=", + "rev": "f270d3ebe0b6d76df58ef631916655d963b4a953", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2837da71ec1588c1187d2e554719b15904a46c8b.tar.gz?rev=2837da71ec1588c1187d2e554719b15904a46c8b" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/f270d3ebe0b6d76df58ef631916655d963b4a953.tar.gz?rev=f270d3ebe0b6d76df58ef631916655d963b4a953" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/2.92.0.tar.gz" + "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz" } }, "lix-module": { "inputs": { "flake-utils": "flake-utils_3", "flakey-profile": "flakey-profile", - "lix": "lix", + "lix": [ + "lix" + ], "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1737237494, - "narHash": "sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7+b8=", - "rev": "b90bf629bbd835e61f1317b99e12f8c831017006", + "lastModified": 1742945498, + "narHash": "sha256-MB/b/xcDKqaVBxJIIxwb81r8ZiGLeKEcqokATRRroo8=", + "rev": "fa69ae26cc32dda178117b46487c2165c0e08316", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b90bf629bbd835e61f1317b99e12f8c831017006.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/fa69ae26cc32dda178117b46487c2165c0e08316.tar.gz?rev=fa69ae26cc32dda178117b46487c2165c0e08316" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz" + "url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz" } }, "nix-github-actions": { @@ -714,13 +742,29 @@ "type": "github" } }, + "nix2container": { + "flake": false, + "locked": { + "lastModified": 1724996935, + "narHash": "sha256-njRK9vvZ1JJsP8oV2OgkBrpJhgQezI03S7gzskCcHos=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "fa6bb0a1159f55d071ba99331355955ae30b3401", + "type": "github" + }, + "original": { + "owner": "nlewo", + "repo": "nix2container", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "lastModified": 1742889210, + "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "rev": "698214a32beb4f4c8e3942372c694f40848b360d", "type": "github" }, "original": { @@ -730,45 +774,29 @@ "type": "github" } }, - "nixpkgs-smol": { + "nixpkgs-regression": { "locked": { - "lastModified": 1741171237, - "narHash": "sha256-3IJy05lcahEv8KM2QUsvdukmyxlNfRfGSYzZqWMPBcU=", - "owner": "nixos", + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "59e3cd3bfcd5e27bb7f4498a5bd15084cecdb77c", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable-small", + "owner": "NixOS", "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1740828860, - "narHash": "sha256-cjbHI+zUzK5CPsQZqMhE3npTyYFt9tJ3+ohcfaOF/WM=", + "lastModified": 1742800061, + "narHash": "sha256-oDJGK1UMArK52vcW9S5S2apeec4rbfNELgc50LqiPNs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "303bd8071377433a2d8f76e684ec773d70c5b642", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1738797219, - "narHash": "sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R+7kIbGa+2s=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1da52dd49a127ad74486b135898da2cef8c62665", + "rev": "1750f3c1c89488e2ffdd47cab9d05454dddfb734", "type": "github" }, "original": { @@ -778,13 +806,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { - "lastModified": 1739020877, - "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", + "lastModified": 1742669843, + "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", + "rev": "1e5b653dff12029333a6546c11e108ede13052eb", "type": "github" }, "original": { @@ -794,29 +822,29 @@ "type": "github" } }, + "nixpkgs_4": { + "locked": { + "lastModified": 1743008566, + "narHash": "sha256-vqiNwWvNcIuHIPu6RC1WScwDHlcGerCZWZ8XOLVu0B0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "f55926cd4adb4db12ca97a86bc4e48e2c213f4d9", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable-small", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_5": { "locked": { - "lastModified": 1741010256, - "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", + "lastModified": 1742288794, + "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1735471104, - "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", + "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", "type": "github" }, "original": { @@ -829,15 +857,15 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1741098523, - "narHash": "sha256-gXDSXDr6tAb+JgxGMvcEjKC9YO8tVOd8hMMZHJLyQ6Q=", + "lastModified": 1742916868, + "narHash": "sha256-2eN75OsaNpL3FzAs3hz9Xm3+htIP3iLdfRP6PGfOoS8=", "owner": "nix-community", "repo": "nixvim", - "rev": "03065fd4708bfdf47dd541d655392a60daa25ded", + "rev": "6b95b825529aa2d8536f7684fe64382ef4d15d84", "type": "github" }, "original": { @@ -857,11 +885,11 @@ ] }, "locked": { - "lastModified": 1738508923, - "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=", + "lastModified": 1742659553, + "narHash": "sha256-i/JCrr/jApVorI9GkSV5to+USrRCa0rWuQDH8JSlK2A=", "owner": "NuschtOS", "repo": "search", - "rev": "86e2038290859006e05ca7201425ea5b5de4aecb", + "rev": "508752835128a3977985a4d5225ff241f7756181", "type": "github" }, "original": { @@ -880,11 +908,27 @@ ] }, "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", + "lastModified": 1742649964, + "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", + "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "pre-commit-hooks_2": { + "flake": false, + "locked": { + "lastModified": 1733318908, + "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", "type": "github" }, "original": { @@ -902,9 +946,9 @@ "haivim": "haivim", "home-manager": "home-manager_2", "hyprland": "hyprland", + "lix": "lix", "lix-module": "lix-module", - "nixpkgs": "nixpkgs_5", - "nixpkgs-smol": "nixpkgs-smol", + "nixpkgs": "nixpkgs_4", "spicetify-nix": "spicetify-nix", "zen-browser": "zen-browser" } @@ -912,11 +956,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1740470570, - "narHash": "sha256-iYjLS4jy/IJScOHZfbQ31vkrS5tl0bjXtzYP4XKA2Pc=", + "lastModified": 1742296961, + "narHash": "sha256-gCpvEQOrugHWLimD1wTFOJHagnSEP6VYBDspq96Idu0=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "89255449982473939a4f8ee954512d339225c182", + "rev": "15d87419f1a123d8f888d608129c3ce3ff8f13d4", "type": "github" }, "original": { @@ -956,11 +1000,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1740889006, - "narHash": "sha256-A1iyKVvZrLdLwqWPC9OvPjC85ADQn2R1EGfCzJBl+wI=", + "lastModified": 1742854930, + "narHash": "sha256-yry0JTKn3TotaCIgBjIl8rSsnqqxqT01rtJQUc0PeOA=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "f8d3757d4ae3af2175a631fb9598a42d30ee75fc", + "rev": "32663bb5e4dce31d252b1ba02deb3631d220d74e", "type": "github" }, "original": { @@ -1087,11 +1131,11 @@ ] }, "locked": { - "lastModified": 1737634991, - "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=", + "lastModified": 1741934139, + "narHash": "sha256-ZhTcTH9FoeAtbPfWGrhkH7RjLJZ7GeF18nygLAMR+WE=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a", + "rev": "150b0b6f52bb422a1b232a53698606fe0320dde0", "type": "github" }, "original": { @@ -1102,14 +1146,14 @@ }, "zen-browser": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1740554227, - "narHash": "sha256-xpwZeMw2gGenixGQDyVv+ja+epcR+EJ1BPuGFdgFS18=", + "lastModified": 1742973471, + "narHash": "sha256-nneE0lIst5IDINF6+dW6Xgp8KNmsC12pb05Ws+wXkVQ=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "7de16ae319e6f6852274fa90b0d41c00049767c9", + "rev": "bae854c6767fb5c004cd7a4049a77be9da1b16db", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 6ed7d84..71edb72 100644 --- a/flake.nix +++ b/flake.nix @@ -6,13 +6,22 @@ }; inputs = { - nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; - nixpkgs-smol.url = "github:nixos/nixpkgs?ref=nixos-unstable-small"; + nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable-small"; + #nixpkgs.url = "github:nixos/nixpkgs"; + #nixpkgs.url = "path:/home/pingu/Documents/GitHub/NixOS/nixpkgs"; chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; + # to keep lix up to date + lix = { + url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"; + inputs = {nixpkgs.follows = "nixpkgs";}; + }; lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz"; - inputs.nixpkgs.follows = "nixpkgs"; + url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"; + inputs = { + nixpkgs.follows = "nixpkgs"; + lix.follows = "lix"; + }; }; haipkgs = { @@ -42,7 +51,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - catppuccin = {url = "github:catppuccin/nix";}; + catppuccin = { + url = "github:catppuccin/nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; hyprland.url = "github:hyprwm/Hyprland"; zen-browser.url = "github:0xc000022070/zen-browser-flake"; @@ -50,23 +62,16 @@ outputs = { nixpkgs, - nixpkgs-smol, lix-module, chaotic, home-manager, haipkgs, ... - } @ inputs: let - system = "x86_64-linux"; - in { + } @ inputs: { nixosConfigurations = { nyx = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs; - pkgs-smol = import nixpkgs-smol { - inherit system; - config.allowUnfree = true; - }; }; modules = [ ./hosts/nyx/configuration.nix @@ -80,7 +85,6 @@ epimetheus = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs; - pkgs-smol = import nixpkgs-smol {inherit system;}; }; modules = [ ./hosts/epimetheus/configuration.nix diff --git a/hosts/nyx/configuration.nix b/hosts/nyx/configuration.nix index 2fcac67..5e39286 100644 --- a/hosts/nyx/configuration.nix +++ b/hosts/nyx/configuration.nix @@ -1,7 +1,6 @@ { config, pkgs, - pkgs-smol, inputs, lib, ... @@ -26,7 +25,7 @@ supportedFilesystems = ["zfs" "ext4" "btrfs"]; zfs = { forceImportRoot = false; - extraPools = ["zpool" "zootfs"]; + extraPools = ["zpool" "zootfs" "zepool"]; devNodes = "/dev/disk/by-id"; package = pkgs.zfs; allowHibernation = true; # might cause corruption? @@ -73,20 +72,32 @@ LC_TIME = "fi_FI.UTF-8"; }; + environment.etc."greetd/hyprland.conf".text = '' + exec-once = ${pkgs.greetd.regreet}/bin/regreet; hyprctl dispatch exit + + animations { + enabled = false + } + + misc { + disable_hyprland_logo = true + disable_splash_rendering = true + disable_hyprland_qtutils_check = true + } + ''; + services = { - displayManager.defaultSession = "hyprland"; - xserver = { - enable = true; - displayManager = { - gdm = { - enable = true; - autoSuspend = false; + greetd = { + settings = { + default_session = { + command = "${config.programs.hyprland.package}/bin/Hyprland --config /etc/greetd/hyprland.conf"; }; }; - xkb = { - layout = "us"; - variant = "euro"; - }; + }; + + xserver = { + enable = false; + excludePackages = [pkgs.xterm]; }; gnome.gnome-keyring.enable = true; @@ -110,14 +121,12 @@ packages = with pkgs; [ floorp vesktop-git - equibop - element-desktop ]; }; }; home-manager = { - extraSpecialArgs = {inherit inputs pkgs-smol;}; + extraSpecialArgs = {inherit inputs;}; useGlobalPkgs = true; useUserPackages = true; verbose = true; @@ -151,6 +160,19 @@ fish.enable = true; + regreet = { + enable = true; + settings = { + background = { + path = ../../files/nix-Wallpaper.png; + fit = "Cover"; + }; + GTK = { + application_prefer_dark_theme = true; + }; + }; + }; + hyprland = { enable = true; package = inputs.hyprland.packages."${pkgs.system}".hyprland; @@ -178,10 +200,8 @@ nixpkgs = { config.allowUnfree = true; - overlays = [ - inputs.haipkgs.overlays.default - ]; }; + nix = { nixPath = ["nixpkgs=${inputs.nixpkgs}"]; settings = { @@ -241,7 +261,7 @@ diff-so-fancy eog bottles - ffmpeg-full + ffmpeg gst_all_1.gstreamer gst_all_1.gst-libav gst_all_1.gst-vaapi @@ -295,9 +315,6 @@ glib cliphist playerctl - material-icons - material-design-icons - material-symbols imagemagick wireguard-tools mission-center @@ -316,8 +333,9 @@ google-fonts material-symbols material-icons - maple-mono - maple-mono-NF + material-design-icons + maple-mono.variable + maple-mono.NF ]; programs.gnupg.agent = { @@ -325,9 +343,9 @@ enableSSHSupport = true; }; - programs.localsend = { + services.fwupd.enable = true; + services.smartd = { enable = true; - openFirewall = true; }; services.openssh = { diff --git a/hosts/nyx/hardware-configuration.nix b/hosts/nyx/hardware-configuration.nix index a232f35..c9d295a 100644 --- a/hosts/nyx/hardware-configuration.nix +++ b/hosts/nyx/hardware-configuration.nix @@ -36,6 +36,12 @@ options = ["zfsutil"]; }; + fileSystems."/var/lib/immich" = { + device = "zepool/immich"; + fsType = "zfs"; + options = ["zfsutil"]; + }; + fileSystems."/var/lib/virt/images" = { device = "zepool/virt/images"; fsType = "zfs"; @@ -73,12 +79,6 @@ options = ["fmask=0022" "dmask=0022"]; }; - fileSystems."/mnt/ssd" = { - device = "/dev/disk/by-uuid/e4c31e1c-6667-4582-8d6a-d142d6118ce2"; - fsType = "btrfs"; - options = ["async" "auto" "noatime" "rw"]; - }; - fileSystems."/mnt/ext" = { device = "/dev/disk/by-uuid/43280a82-cf9a-452e-9bdc-a8cc66ccd7c8"; fsType = "btrfs"; diff --git a/hosts/nyx/home.nix b/hosts/nyx/home.nix index 38ba1e0..165b276 100644 --- a/hosts/nyx/home.nix +++ b/hosts/nyx/home.nix @@ -2,7 +2,6 @@ inputs, config, pkgs, - pkgs-smol, ... }: { imports = [ @@ -43,7 +42,7 @@ enable = true; extraConfig = '' Host theia - HostName 178.63.118.252 + HostName 5.231.45.234 User pingu Host artemis diff --git a/modules/home-manager/cli/wezterm/wezterm.lua b/modules/home-manager/cli/wezterm/wezterm.lua index 8324bb0..822aa38 100644 --- a/modules/home-manager/cli/wezterm/wezterm.lua +++ b/modules/home-manager/cli/wezterm/wezterm.lua @@ -50,18 +50,22 @@ if utils.is_linux() then else c.window_decorations = "RESIZE" end -c.window_padding = { left = 10, right = 0, top = 0, bottom = 0 } +c.window_padding = { left = 10, right = 10, top = 0, bottom = 0 } c.adjust_window_size_when_changing_font_size = false -- fonts c.font = wezterm.font_with_fallback({ - "Maple Mono", - "Symbols Nerd Font", + { + family = "Maple Mono NF", + weight = 500, + harfbuzz_features = { "cv03", "calt", "ss08" }, + }, + { family = "Symbols Nerd Font", weight = "Bold" }, }) c.font_size = 13 c.adjust_window_size_when_changing_font_size = false c.window_frame = { - font = wezterm.font("Maple Mono"), + font = wezterm.font("Maple Mono NF"), font_size = c.font_size, } diff --git a/modules/home-manager/hypr/default.nix b/modules/home-manager/hypr/default.nix index 0739fed..f0c87cc 100644 --- a/modules/home-manager/hypr/default.nix +++ b/modules/home-manager/hypr/default.nix @@ -1,9 +1,10 @@ { pkgs, - config, - inputs, + lib, ... -}: { +}: let + inherit (lib.modules) mkDefault; +in { imports = [ ./hyprland/rules.nix ./hyprland/keybinds.nix @@ -36,8 +37,7 @@ }; xdg.portal = { - enable = true; - configPackages = [config.wayland.windowManager.hyprland.package]; + enable = mkDefault true; extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; @@ -46,7 +46,9 @@ wayland.windowManager.hyprland = { enable = true; xwayland.enable = true; - package = inputs.hyprland.packages."${pkgs.system}".hyprland; + package = null; + portalPackage = null; + systemd.variables = ["--all"]; settings = { monitor = [ diff --git a/modules/home-manager/hypr/hyprland/execs.nix b/modules/home-manager/hypr/hyprland/execs.nix index 9c1cc98..c222d2a 100644 --- a/modules/home-manager/hypr/hyprland/execs.nix +++ b/modules/home-manager/hypr/hyprland/execs.nix @@ -12,7 +12,7 @@ "vesktop" "wl-paste --type text --watch cliphist store" "wl-paste --type image --watch cliphist store" - "JKPS" + # "JKPS" "ags" ]; }; diff --git a/modules/home-manager/hypr/hyprland/rules.nix b/modules/home-manager/hypr/hyprland/rules.nix index 645b971..28e7e86 100644 --- a/modules/home-manager/hypr/hyprland/rules.nix +++ b/modules/home-manager/hypr/hyprland/rules.nix @@ -5,27 +5,19 @@ _: { ]; windowrule = [ - "noblur,.*" - "workspace special, spotify" - "workspace 11 silent, JKPS" - "workspace 10 silent, ^(org.qbittorrent.qBittorrent)$" - "workspace 8 silent, Element" - "workspace 6 silent, firefox" - "workspace 5 silent, ^(org.prismlauncher.PrismLauncher)$" - "workspace 3 silent, vesktop" - "workspace 2 silent, ^(steam)$" - "workspace 1 silent, floorp" - "float, ^(blueberry.py)$" - "float, ^(com.github.Aylur.ags)$" - "float, ^(JKPS)(.*)" - ]; - - windowrulev2 = [ + "workspace special, class:spotify" + # "workspace 11 silent, class:JKPS" + "workspace 10 silent, class:(org.qbittorrent.qBittorrent)" + "workspace 6 silent, class:firefox" + "workspace 5 silent, class:(org.prismlauncher.PrismLauncher)" + "workspace 3 silent, class:vesktop" + "workspace 2 silent, class:steam" + "workspace 1 silent, class:floorp" + "noblur, class:(org.wezfurlong.wezterm)" ]; layerrule = [ "xray 0, .*" - "noanim, walker" "noanim, selection" "noanim, overview" "noanim, anyrun" @@ -35,8 +27,6 @@ _: { "blur, shell:*" "ignorealpha 0.6, shell:*" - "blur, eww" - "ignorealpha 0.8, eww" "noanim, noanim" "blur, noanim" "blur, gtk-layer-shell" @@ -46,8 +36,6 @@ _: { "blur, notifications" "ignorealpha 0.69, notifications" - "animation slide top, sideleft.*" - "animation slide top, sideright.*" "blur, session" "blur, bar" diff --git a/modules/home-manager/spotify/default.nix b/modules/home-manager/spotify/default.nix index d47a4d4..19836eb 100644 --- a/modules/home-manager/spotify/default.nix +++ b/modules/home-manager/spotify/default.nix @@ -1,7 +1,6 @@ { pkgs, lib, - config, inputs, ... }: { diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 8c1c6d6..5beb9dc 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -3,6 +3,6 @@ ./catppuccin.nix ./games/default.nix ./services/default.nix - ./virtualisation.nix + # ./virtualisation.nix ]; } diff --git a/modules/nixos/games/default.nix b/modules/nixos/games/default.nix index 23880c2..1d7b20e 100644 --- a/modules/nixos/games/default.nix +++ b/modules/nixos/games/default.nix @@ -12,8 +12,9 @@ protonup-qt prismlauncher osu-lazer-bin + mangohud # davinci-resolve - inputs.haipkgs.packages.${pkgs.system}.jkps + # jkps ]; programs = { @@ -53,7 +54,7 @@ enable = true; enable32Bit = true; extraPackages = with pkgs; [ - mesa.drivers + mesa egl-wayland libva libva-utils diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/default.nix index 2bb835a..5c54ea6 100644 --- a/modules/nixos/services/default.nix +++ b/modules/nixos/services/default.nix @@ -3,5 +3,6 @@ ./pipewire.nix ./tailscale.nix ./jellyfin.nix + ./immich.nix ]; } diff --git a/modules/nixos/services/immich.nix b/modules/nixos/services/immich.nix new file mode 100644 index 0000000..87148a2 --- /dev/null +++ b/modules/nixos/services/immich.nix @@ -0,0 +1,15 @@ +{pkgs, ...}: { + services = { + immich = { + enable = true; + host = "0.0.0.0"; + port = 2283; + openFirewall = true; + package = pkgs.immich; + user = "immich"; + group = "immich"; + accelerationDevices = ["/dev/dri/renderD128"]; + mediaLocation = "/var/lib/immich"; + }; + }; +} diff --git a/modules/nixos/services/jellyfin.nix b/modules/nixos/services/jellyfin.nix index 847ef18..d69c54d 100644 --- a/modules/nixos/services/jellyfin.nix +++ b/modules/nixos/services/jellyfin.nix @@ -42,6 +42,13 @@ group = "jellyfin"; }; + flaresolverr = { + enable = true; + openFirewall = true; + port = 8191; + package = pkgs.flaresolverr-21hsmw; + }; + prowlarr = { enable = true; openFirewall = true; diff --git a/modules/nixos/virtualisation.nix b/modules/nixos/virtualisation.nix index cb8284e..b56287c 100644 --- a/modules/nixos/virtualisation.nix +++ b/modules/nixos/virtualisation.nix @@ -4,7 +4,7 @@ config, ... }: let - enableIOMMU = true; + enableIOMMU = false; in { boot = lib.mkIf enableIOMMU { initrd.kernelModules = lib.mkBefore [