diff --git a/flake.lock b/flake.lock index 6f7948c..dbb6550 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "actions-preview-nvim": { "flake": false, "locked": { - "lastModified": 1704627848, - "narHash": "sha256-iXqs1+3z6ujm/6thDpbgoyWmUJ5Nd+D0zxAW4jc+T2c=", + "lastModified": 1710009411, + "narHash": "sha256-PIzXWOqmTeesPZg82iLkvLpJtOoDDljvwJq8wdvRtqQ=", "owner": "aznhe21", "repo": "actions-preview.nvim", - "rev": "dd63df1a4ed0ffe1458945ee50ecb1dd02b605ab", + "rev": "5072b1b1065a6b22bdd46b5c21780a91d6a08071", "type": "github" }, "original": { @@ -26,11 +26,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1703433843, - "narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=", + "lastModified": 1707830867, + "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=", "owner": "ryantm", "repo": "agenix", - "rev": "417caa847f9383e111d1397039c9d4337d024bf0", + "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6", "type": "github" }, "original": { @@ -42,11 +42,11 @@ "arkenfox-userjs": { "flake": false, "locked": { - "lastModified": 1700833105, - "narHash": "sha256-8mxKaA0yGx29X+E0ahCjsGXSc29I1+5timNP6cJHGM0=", + "lastModified": 1707077370, + "narHash": "sha256-624Giuo1TfeXQGzcGK9ETW86esNFhFZ5a46DCjT6K5I=", "owner": "arkenfox", "repo": "user.js", - "rev": "4a510a4b4ceda8a177831a77309f2faccf7e18d5", + "rev": "33a84b608c8a1f871c6ce9c4d2b932dc57078fae", "type": "github" }, "original": { @@ -100,11 +100,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1705332421, - "narHash": "sha256-USpGLPme1IuqG78JNqSaRabilwkCyHmVWY0M9vYyqEA=", + "lastModified": 1710156081, + "narHash": "sha256-4PMY6aumJi5dLFjBzF5O4flKXmadMNq3AGUHKYfchh0=", "owner": "numtide", "repo": "devshell", - "rev": "83cb93d6d063ad290beee669f4badf9914cc16ec", + "rev": "bc68b058dc7e6d4d6befc4ec6c60082b6e844b7d", "type": "github" }, "original": { @@ -118,11 +118,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1706261939, - "narHash": "sha256-KQ3Hb3XVSrxOLfiY2D63QD5+LsLwFeY81ZScD4GRp0o=", + "lastModified": 1711006105, + "narHash": "sha256-pvjqjx4L2Hx/NP3RWcwLjk+ABtMODAJ9+rgreU6fP6I=", "owner": "nix-community", "repo": "disko", - "rev": "c12719812dde4dcbc4119a2b09766a51c9c498d5", + "rev": "a8c966ee117c278a5aabc6f00b00ef62eb7e28f6", "type": "github" }, "original": { @@ -184,11 +184,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1704982712, - "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=", + "lastModified": 1709336216, + "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "07f6395285469419cf9d078f59b5b49993198c00", + "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", "type": "github" }, "original": { @@ -205,11 +205,11 @@ ] }, "locked": { - "lastModified": 1704982712, - "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=", + "lastModified": 1709336216, + "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "07f6395285469419cf9d078f59b5b49993198c00", + "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", "type": "github" }, "original": { @@ -227,11 +227,11 @@ ] }, "locked": { - "lastModified": 1701473968, - "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", + "lastModified": 1709336216, + "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", + "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", "type": "github" }, "original": { @@ -262,11 +262,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -276,24 +276,6 @@ } }, "flake-utils_3": { - "inputs": { - "systems": "systems_5" - }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { "inputs": { "systems": "systems_6" }, @@ -311,14 +293,32 @@ "type": "github" } }, + "flake-utils_4": { + "inputs": { + "systems": "systems_7" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "gen-nvim": { "flake": false, "locked": { - "lastModified": 1703233104, - "narHash": "sha256-cNz/yPTTgt1ng4C2BqN4P62FBV7lmDIEmEsdDhfyKHk=", + "lastModified": 1710408235, + "narHash": "sha256-aZ/ZMmatoIXnY3qtRjUqJStlpg0VGbJ1XdRjyDMhHqU=", "owner": "David-Kunz", "repo": "gen.nvim", - "rev": "41ad952c8269fa7aa3a4b8a5abb44541cb628313", + "rev": "2cb643b1a827bcdfc665a37d5f8174249d2d5bf5", "type": "github" }, "original": { @@ -335,11 +335,11 @@ ] }, "locked": { - "lastModified": 1703887061, - "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "type": "github" }, "original": { @@ -373,11 +373,11 @@ ] }, "locked": { - "lastModified": 1704029560, - "narHash": "sha256-a4Iu7x1OP+uSYpqadOu8VCPY+MPF3+f6KIi+MAxlgyw=", + "lastModified": 1710478346, + "narHash": "sha256-Xjf8BdnQG0tLhPMlqQdwCIjOp7Teox0DP3N/jjyiGM4=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "d5cbf433a6ae9cae05400189a8dbc6412a03ba16", + "rev": "64e7763d72c1e4c1e5e6472640615b6ae2d40fbf", "type": "github" }, "original": { @@ -414,17 +414,16 @@ ] }, "locked": { - "lastModified": 1705392270, - "narHash": "sha256-Y11fcK0ETTpfBxJ58w9amqTKuJSQ+lSs6nIV8DoplKo=", + "lastModified": 1710974515, + "narHash": "sha256-jZpdsypecYTOO9l12Vy77otGmh9uz8tGzcguifA30Vs=", "owner": "nix-community", "repo": "home-manager", - "rev": "bf4b576f84e1ce54ec886836bae7695738aa5a6c", + "rev": "1c2acec99933f9835cc7ad47e35303de92d923a4", "type": "github" }, "original": { "owner": "nix-community", "repo": "home-manager", - "rev": "bf4b576f84e1ce54ec886836bae7695738aa5a6c", "type": "github" } }, @@ -433,11 +432,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1706198673, - "narHash": "sha256-bHlxFd+3QHy6eXtTzzhwVNcyxBSOxTvBuJGNUzI4C4M=", + "lastModified": 1710868143, + "narHash": "sha256-U5DLWla6nNiomFyCskYn6QfNCpVyQTeyG6FOAuEKHRg=", "owner": "hyprwm", "repo": "contrib", - "rev": "16884001b26e6955ff4b88b4dfe4c8986e20f153", + "rev": "4ee76323053bfae15cc05c294c7fda9997ca7fc3", "type": "github" }, "original": { @@ -446,20 +445,48 @@ "type": "github" } }, + "hyprcursor": { + "inputs": { + "hyprlang": "hyprlang", + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1710257359, + "narHash": "sha256-43re5pzE/cswFAgw92/ugsB3+d5ufDaCcLtl9ztKfBo=", + "owner": "hyprwm", + "repo": "hyprcursor", + "rev": "1761f6cefd77f4fcd2039d930c88d6716ddc4974", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprcursor", + "type": "github" + } + }, "hyprland": { "inputs": { + "hyprcursor": "hyprcursor", "hyprland-protocols": "hyprland-protocols", + "hyprlang": "hyprlang_2", "nixpkgs": "nixpkgs_4", - "systems": "systems_4", + "systems": "systems_5", "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1706271892, - "narHash": "sha256-ln+6hdNB1gW7+pz9d24zdCGpVKW0M1c/Xea/w+ZKqGk=", + "lastModified": 1711034304, + "narHash": "sha256-K0Rt2uwpJ/5aFPwB7BICuSvZRardNKGLlgG+2CBnDxQ=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "5cd7e4587e0ae642ce60415f8e271df2095a3ff2", + "rev": "a94b902bef5eef3a4891726d51415c5d2e3391e3", "type": "github" }, "original": { @@ -497,16 +524,42 @@ "inputs": { "nixpkgs": [ "hyprland", - "xdph", + "hyprcursor", "nixpkgs" + ], + "systems": "systems_4" + }, + "locked": { + "lastModified": 1709914708, + "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprlang_2": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" ] }, "locked": { - "lastModified": 1704287638, - "narHash": "sha256-TuRXJGwtK440AXQNl5eiqmQqY4LZ/9+z/R7xC0ie3iA=", + "lastModified": 1709914708, + "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "6624f2bb66d4d27975766e81f77174adbe58ec97", + "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2", "type": "github" }, "original": { @@ -517,11 +570,11 @@ }, "impermanence": { "locked": { - "lastModified": 1703656108, - "narHash": "sha256-hCSUqdFJKHHbER8Cenf5JRzjMlBjIdwdftGQsO0xoJs=", + "lastModified": 1708968331, + "narHash": "sha256-VUXLaPusCBvwM3zhGbRIJVeYluh2uWuqtj4WirQ1L9Y=", "owner": "nix-community", "repo": "impermanence", - "rev": "033643a45a4a920660ef91caa391fbffb14da466", + "rev": "a33ef102a02ce77d3e39c25197664b7a636f9c30", "type": "github" }, "original": { @@ -564,11 +617,11 @@ }, "master": { "locked": { - "lastModified": 1706273017, - "narHash": "sha256-Jt5JdzUq8NysMrQL/OCXD7g+bJQbbZ9nK5hw0GZXQic=", + "lastModified": 1711034981, + "narHash": "sha256-Ug9/tGewXnV9Y6VFa1viuLfS5NoW+o+UXzZfGrpqMIU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e78f177a8a7a79d6c7e1fcfe509901e87658ec63", + "rev": "952804a3d25df456584e1c95b42a7196b35b2ebf", "type": "github" }, "original": { @@ -626,11 +679,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1706140641, - "narHash": "sha256-H1qHhkf7sF7yrG2rb9Ks1Y4EtLY3cXGp16KCGveJWY4=", + "lastModified": 1710978612, + "narHash": "sha256-I/dYjIzi+aCDHn6pWx5yVrifrOLbAeazFBMXrQlTRs8=", "owner": "neovim", "repo": "neovim", - "rev": "4e59422e1d4950a3042bad41a7b81c8db4f8b648", + "rev": "c1c6c1ee12fa601194a410f78ecde11a9982a793", "type": "github" }, "original": { @@ -649,11 +702,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1706141075, - "narHash": "sha256-o66/XFTXmcJSpEcO508V5r765HtgT8qtr+H4LRIB9BY=", + "lastModified": 1710979437, + "narHash": "sha256-xUawWDHG4x71YxTfsjkmQ2FMPpEKqFKno3IbuX6bbqE=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "1da2e054a16309d7d7f7669438c8b9a5ef1b4642", + "rev": "d6386bdcfda37b9c7dca0b7e4c29993541f87fa3", "type": "github" }, "original": { @@ -669,11 +722,11 @@ ] }, "locked": { - "lastModified": 1705806513, - "narHash": "sha256-FcOmNjhHFfPz2udZbRpZ1sfyhVMr+C2O8kOxPj+HDDk=", + "lastModified": 1710644923, + "narHash": "sha256-0fjbN5GYYDKPyPay0l8gYoH+tFfNqPPwP5sxxBreeA4=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "f8e04fbcebcc24cebc91989981bd45f69b963ed7", + "rev": "e25efda85e39fcdc845e371971ac4384989c4295", "type": "github" }, "original": { @@ -706,11 +759,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1701958654, - "narHash": "sha256-ZhXujNwvwTDLmCpYb7h2bTDdZG4h97hEYjzBmKP8p2U=", + "lastModified": 1708070219, + "narHash": "sha256-/2fidzoXrrNwr8te2cU3JdtrpockWIjU4DpLgNr4FTo=", "owner": "privatevoid-net", "repo": "nix-super", - "rev": "661b025c79eac08beda593ede47b41b2052e8ebf", + "rev": "924eb1127a21ebf4bd7f438d7c6aca133ce1de84", "type": "github" }, "original": { @@ -738,11 +791,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1703961334, - "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", + "lastModified": 1709237383, + "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", + "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", "type": "github" }, "original": { @@ -771,11 +824,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1704874635, - "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", + "lastModified": 1710695816, + "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", + "rev": "614b4613980a522ba49f0d194531beddbb7220d3", "type": "github" }, "original": { @@ -787,11 +840,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1706173671, - "narHash": "sha256-lciR7kQUK2FCAYuszyd7zyRRmTaXVeoZsCyK6QFpGdk=", + "lastModified": 1710889954, + "narHash": "sha256-Pr6F5Pmd7JnNEMHHmspZ0qVqIBVxyZ13ik1pJtm2QXk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4fddc9be4eaf195d631333908f2a454b03628ee5", + "rev": "7872526e9c5332274ea5932a0c3270d6e4724f3b", "type": "github" }, "original": { @@ -819,11 +872,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1705133751, - "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", + "lastModified": 1710272261, + "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", + "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", "type": "github" }, "original": { @@ -835,11 +888,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1706006310, - "narHash": "sha256-nDPz0fj0IFcDhSTlXBU2aixcnGs2Jm4Zcuoj0QtmiXQ=", + "lastModified": 1710889954, + "narHash": "sha256-Pr6F5Pmd7JnNEMHHmspZ0qVqIBVxyZ13ik1pJtm2QXk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b43bb235efeab5324c5e486882ef46749188eee2", + "rev": "7872526e9c5332274ea5932a0c3270d6e4724f3b", "type": "github" }, "original": { @@ -867,11 +920,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1706173671, - "narHash": "sha256-lciR7kQUK2FCAYuszyd7zyRRmTaXVeoZsCyK6QFpGdk=", + "lastModified": 1710889954, + "narHash": "sha256-Pr6F5Pmd7JnNEMHHmspZ0qVqIBVxyZ13ik1pJtm2QXk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4fddc9be4eaf195d631333908f2a454b03628ee5", + "rev": "7872526e9c5332274ea5932a0c3270d6e4724f3b", "type": "github" }, "original": { @@ -883,11 +936,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1704842529, - "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=", + "lastModified": 1710765496, + "narHash": "sha256-p7ryWEeQfMwTB6E0wIUd5V2cFTgq+DRRBz2hYGnJZyA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5", + "rev": "e367f7a1fb93137af22a3908f00b9a35e2d286a7", "type": "github" }, "original": { @@ -916,11 +969,11 @@ "none-ls-nvim": { "flake": false, "locked": { - "lastModified": 1706069423, - "narHash": "sha256-s+Hp0Yzge7FKKDez4DO8uytsNORIqeNWYOLSO7kSZbo=", + "lastModified": 1711021139, + "narHash": "sha256-FjDb53SNILxP9N9l5cJVBocj1ro/9eE8VKgR0Mv5+gs=", "owner": "nvimtools", "repo": "none-ls.nvim", - "rev": "a311c7cc8f17543143a7482cdbe3a384c371d56a", + "rev": "18910d09d21d7df339805343bfe4a2b2e41c057b", "type": "github" }, "original": { @@ -931,11 +984,11 @@ }, "nur": { "locked": { - "lastModified": 1706270864, - "narHash": "sha256-+OtaanZN6C4rS6bNujBban8fT4HsnozFZtXfPTLuaTI=", + "lastModified": 1711034660, + "narHash": "sha256-AURgOJFzS+k+Sj9Aif198WM5dDyLJ1GMLaa9ge1NETY=", "owner": "nix-community", "repo": "NUR", - "rev": "0293fc1d7aefc2204a922ad41bb5141f085a13ec", + "rev": "1f626d2e2e780e5ba0fe203a7e74f79b57f1af67", "type": "github" }, "original": { @@ -947,11 +1000,11 @@ "nvim-lspconfig": { "flake": false, "locked": { - "lastModified": 1705757419, - "narHash": "sha256-StYsN9C2rV471JkncUR1PFeXs0S15ZGTF1DigSbwOHI=", + "lastModified": 1710924139, + "narHash": "sha256-wW6vmaCLBpiLtk87UXzppIP2WRzG/gdtsIcPPCnwucM=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "8917d2c830e04bf944a699b8c41f097621283828", + "rev": "d67715d3b746a19e951b6b0a99663fa909bb9e64", "type": "github" }, "original": { @@ -963,11 +1016,11 @@ "nvim-puppeteer": { "flake": false, "locked": { - "lastModified": 1706210708, - "narHash": "sha256-tjL4qC1VAad4NXaZFDhTcmbrbdqNpVm7/MnyR/CE3rw=", + "lastModified": 1710266483, + "narHash": "sha256-rRsLPeLaJNvOxzwGO+LOXW8FMhHpVkjuccTZdaK3O7c=", "owner": "chrisgrieser", "repo": "nvim-puppeteer", - "rev": "048c819c8033e5febe0a04e63b98e74a5d0f8de6", + "rev": "ea340595967919222f3ba5c6c6def0787a336c82", "type": "github" }, "original": { @@ -979,11 +1032,11 @@ "nvim-treesitter": { "flake": false, "locked": { - "lastModified": 1706272330, - "narHash": "sha256-R+oQGVcmncAd39D5AkGV1HAPgGDPMiucrC1GHMLh/Xk=", + "lastModified": 1711032686, + "narHash": "sha256-jkZ8NuCUjUqHmpr8v1g/dbPDBTO6WRWmEhEJHY9HZWM=", "owner": "nvim-treesitter", "repo": "nvim-treesitter", - "rev": "efda19a54a157da8635aa6cb84f56a10593b1a23", + "rev": "722617e6726c1508adadf83d531f54987c703be0", "type": "github" }, "original": { @@ -1001,11 +1054,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1705757126, - "narHash": "sha256-Eksr+n4Q8EYZKAN0Scef5JK4H6FcHc+TKNHb95CWm+c=", + "lastModified": 1710923068, + "narHash": "sha256-6hOpUiuxuwpXXc/xfJsBUJeqqgGI+JMJuLo45aG3cKc=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "f56597d53fd174f796b5a7d3ee0b494f9e2285cc", + "rev": "e611897ddfdde3ed3eaac4758635d7177ff78673", "type": "github" }, "original": { @@ -1053,11 +1106,11 @@ "smartcolumn-nvim": { "flake": false, "locked": { - "lastModified": 1703592909, - "narHash": "sha256-c5tENO4LJaSRELxuCOp/aI94ifhKjqd8J2chJbxfFdc=", + "lastModified": 1710067624, + "narHash": "sha256-DHIeDNUF9n9s14GVeojIwc5QUPwJMYYl3gRvhvO/rdE=", "owner": "m4xshen", "repo": "smartcolumn.nvim", - "rev": "a52915d6d9abf9972e249ebcffcc651cf9b062dd", + "rev": "cefb17be095ad5526030a21bb2a80553cae09127", "type": "github" }, "original": { @@ -1085,11 +1138,11 @@ "statuscol-nvim": { "flake": false, "locked": { - "lastModified": 1703372986, - "narHash": "sha256-uEKdzttNTQqwZb2oPgzTDuvJRkoTCmGg3piFzwKBITc=", + "lastModified": 1708023805, + "narHash": "sha256-I6Wefl83mcMURtJEq1yaR2thxVMfpJmjSplapeVyKYE=", "owner": "luukvbaal", "repo": "statuscol.nvim", - "rev": "0a782cc73f935e9f790ed029dc316b297545d845", + "rev": "e9e4c30b68abe456d80a0b144149ebf3f4527ed8", "type": "github" }, "original": { @@ -1161,16 +1214,16 @@ }, "systems_5": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -1204,14 +1257,29 @@ "type": "github" } }, + "systems_8": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "telekasten-nvim": { "flake": false, "locked": { - "lastModified": 1702296926, - "narHash": "sha256-Y6LVli8fMLVVRtwrpZ2uIWDUogwUtFhTB6W2RZH5S8c=", + "lastModified": 1709039416, + "narHash": "sha256-fIXLxnPUMs8rXuEcsGIoz+UprtQlW9SB75dS6LKQGg4=", "owner": "renerocksai", "repo": "telekasten.nvim", - "rev": "8c2b3889eb31009ae510a43384d1957b37654176", + "rev": "a684d6ebe7026944b0a5323219d5f5364511e5b2", "type": "github" }, "original": { @@ -1242,7 +1310,7 @@ }, "utils": { "inputs": { - "systems": "systems_7" + "systems": "systems_8" }, "locked": { "lastModified": 1692799911, @@ -1262,18 +1330,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1703963193, - "narHash": "sha256-ke8drv6PTrdQDruWbajrRJffP9A9PU6FRyjJGNZRTs4=", + "lastModified": 1709983277, + "narHash": "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8=", "owner": "wlroots", "repo": "wlroots", - "rev": "f81c3d93cd6f61b20ae784297679283438def8df", + "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "f81c3d93cd6f61b20ae784297679283438def8df", + "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", "type": "gitlab" } }, @@ -1283,7 +1351,10 @@ "hyprland", "hyprland-protocols" ], - "hyprlang": "hyprlang", + "hyprlang": [ + "hyprland", + "hyprlang" + ], "nixpkgs": [ "hyprland", "nixpkgs" @@ -1294,11 +1365,11 @@ ] }, "locked": { - "lastModified": 1704659450, - "narHash": "sha256-3lyoUVtUWz1LuxbltAtkJSK2IlVXmKhxCRU2/0PYCms=", + "lastModified": 1709299639, + "narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "6a5de92769d5b7038134044053f90e7458f6a197", + "rev": "2d2fb547178ec025da643db57d40a971507b82fe", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0933a50..dd97e6a 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,7 @@ flake-parts.url = "github:hercules-ci/flake-parts"; flake-utils.url = "github:numtide/flake-utils"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - home-manager.url = "github:nix-community/home-manager/bf4b576f84e1ce54ec886836bae7695738aa5a6c"; # FIXME: + home-manager.url = "github:nix-community/home-manager"; impermanence.url = "github:nix-community/impermanence"; master.url = "github:nixos/nixpkgs"; nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; diff --git a/hosts/nixos-laptop/default.nix b/hosts/nixos-laptop/default.nix index 313b541..4a41c0b 100644 --- a/hosts/nixos-laptop/default.nix +++ b/hosts/nixos-laptop/default.nix @@ -20,7 +20,8 @@ webis.enable = true; impermanence.enable = true; }; - programs.hyprland.monitors = [ "HDMI-A-1,3840x2160,auto,1.2" ",preferred,auto,1" ]; + programs.hyprland.enable = false; + programs.river.enable = true; programs.exercism.enable = true; }; diff --git a/hosts/nixos-laptop/impermanence.nix b/hosts/nixos-laptop/impermanence.nix deleted file mode 100644 index 13bcc83..0000000 --- a/hosts/nixos-laptop/impermanence.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ config, ... }: - -{ - age.secrets = { - root-password.file = ../../secrets/root-password.age; - moritz-password.file = ../../secrets/moritz-password.age; - }; - users.users = { - root.hashedPasswordFile = config.age.secrets.root-password.path; - moritz.hashedPasswordFile = config.age.secrets.moritz-password.path; - }; - users.mutableUsers = false; - environment.persistence."/persist" = { - hideMounts = true; - directories = [ - "/etc/NetworkManager/system-connections" - "/var/db/dhcpcd/" - "/var/lib/NetworkManager/" - "/var/lib/bluetooth" - "/var/lib/nixos" - "/var/lib/systemd/coredump" - "/var/log" - ]; - files = [ - "/etc/machine-id" - "/etc/nix/id_rsa" - "/etc/ssh/ssh_host_ed25519_key" - "/etc/ssh/ssh_host_ed25519_key.pub" - "/etc/ssh/ssh_host_rsa_key" - "/etc/ssh/ssh_host_rsa_key.pub" - ]; - users.moritz = { - directories = [ - ".SynologyDrive/data" - ".SynologyDrive/log" - ".cache/keepassxc" - ".cache/nvim/luac" - ".config/Nextcloud" - ".config/keepassxc" - ".local/share/direnv" - ".local/share/nvim" - ".local/share/zoxide" - ".local/share/JetBrains" - ".config/JetBrains" - ".local/state/nvim" - ".config/kdeconnect" - ".cat_installer" # eduroam - ".mozilla" - "Documents" - "Downloads" - "Music" - "Pictures" - "Videos" - { directory = ".gnupg"; mode = "0700"; } - { directory = ".local/share/keyrings"; mode = "0700"; } - { directory = ".ssh"; mode = "0700"; } - ]; - files = [ - ".local/share/fish/fish_history" - ".local/share/nix/trusted-settings.json" - ".parallel/will-cite" - ]; - }; - users.root = { - home = "/root"; - directories = [ - { directory = ".gnupg"; mode = "0700"; } - { directory = ".ssh"; mode = "0700"; } - ]; - files = [ - ".local/share/nix/trusted-settings.json" - ]; - }; - }; -} diff --git a/modules/config/theming/_catppuccin.nix b/modules/config/theming/_catppuccin.nix index 17c9118..f205c62 100644 --- a/modules/config/theming/_catppuccin.nix +++ b/modules/config/theming/_catppuccin.nix @@ -47,6 +47,26 @@ prompt = "#${mauve}"; spinner = "#${rosewater}"; }; + foot.settings.colors = { + foreground = text; # Text + background = base; # Base + regular0 = surface1; # Surface 1 + regular1 = red; # red + regular2 = green; # green + regular3 = yellow; # yellow + regular4 = blue; + regular5 = pink; + regular6 = teal; + regular7 = subtext1; + bright0 = surface2; + bright1 = red; + bright2 = green; + bright3 = yellow; + bright4 = blue; + bright5 = pink; + bright6 = teal; + bright7 = subtext0; + }; kitty.extraConfig = '' # vim:ft=kitty diff --git a/modules/profiles/base.nix b/modules/profiles/base.nix index ad8cbe4..17eebd1 100644 --- a/modules/profiles/base.nix +++ b/modules/profiles/base.nix @@ -77,7 +77,7 @@ in isNormalUser = true; home = "/home/moritz"; extraGroups = [ "wheel" "networkmanager" "video" ]; - initialPassword = "password"; # CHANGE ME PLEASE + # initialPassword = "password"; # CHANGE ME PLEASE openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGoAqa2m7hIzZ2LS96Z+RCIlRvhBM/j7h27tMBCwMT+a" # Moritz "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDhtwHDGAZshiQWKkCcPWV9tC83b+bKBgjDcjP/N2CKO" # Laptop diff --git a/modules/programs/foot.nix b/modules/programs/foot.nix new file mode 100644 index 0000000..6cd4000 --- /dev/null +++ b/modules/programs/foot.nix @@ -0,0 +1,30 @@ +{ config +, lib +, ... +}: + +with lib; +let + cfg = config.my.programs.foot; +in +{ + options.my.programs.foot.enable = mkEnableOption "foot"; + + config = mkIf cfg.enable { + home-manager.users.moritz = { + # HACK: to make foot server work + systemd.user.services.foot.Service.Environment = "PATH=/run/current-system/sw/bin/"; + programs.foot = { + enable = true; + server.enable = true; + settings = { + main = { + term = "xterm-256color"; + font = "FiraCode Nerd Font:size=8"; + dpi-aware = true; + }; + }; + }; + }; + }; +} diff --git a/modules/programs/hyprland/_config.nix b/modules/programs/hyprland/_config.nix index 4ea8616..6703ae9 100644 --- a/modules/programs/hyprland/_config.nix +++ b/modules/programs/hyprland/_config.nix @@ -154,8 +154,9 @@ in bind = $mainMod , D , exec , hyprctl keyword general:layout dwindle bind = $mainMod , M , exec , hyprctl keyword general:layout master bind = $mainMod , R , exec , rofi -show combi - bind = $mainMod , RETURN , exec , kitty - bind = $mainMod SHIFT , RETURN , exec , kitty -- tmux new "ts || tn home ~" + bind = $mainMod , RETURN , exec , footclient + bind = $mainMod SHIFT , RETURN , exec , foot + # bind = $mainMod SHIFT , RETURN , exec , kitty -- tmux new "ts || tn home ~" # XF86 keys binde = , XF86AudioLowerVolume , exec , pamixer -d 5 diff --git a/modules/programs/hyprland/default.nix b/modules/programs/hyprland/default.nix index 1593b71..3b917a7 100644 --- a/modules/programs/hyprland/default.nix +++ b/modules/programs/hyprland/default.nix @@ -48,7 +48,7 @@ in ]; programs = { wallpaper.enable = true; - kitty.enable = true; + foot.enable = true; rofi.enable = true; }; wallpapers.enable = true; diff --git a/modules/programs/river/default.nix b/modules/programs/river/default.nix new file mode 100644 index 0000000..0580b88 --- /dev/null +++ b/modules/programs/river/default.nix @@ -0,0 +1,207 @@ +{ config +, lib +, pkgs +, inputs +, ... +} @ args: + +with lib; +let + cfg = config.my.programs.river; +in +{ + options.my.programs.river = { + enable = mkEnableOption "river"; + keyboardLayouts = mkOption { + type = types.listOf types.str; + description = "list of keyboard layouts"; + default = [ "de" "us" ]; + }; + monitors = mkOption { + type = types.listOf types.str; + description = "monitor settings"; + default = [ ",preferred,auto,1" ]; + }; + }; + + config = mkIf cfg.enable { + programs.river.enable = true; + my = { + programs = { + wallpaper.enable = true; + foot.enable = true; + rofi.enable = true; + }; + wallpapers.enable = true; + services = { + dunst.enable = true; + wallpaper = { + enable = true; + # target = "hyprland-session.target"; + }; + # spotify-player.target = "hyprland-session.target"; + }; + }; + + home-manager.users.moritz = { + # enable home-manager module + wayland.windowManager.river = { + enable = true; + settings = { + border-width = 2; + declare-mode = [ + "locked" + "normal" + "passthrough" + ]; + map = { + normal = { + "Super Q" = "close"; + "Super Return" = "spawn footclient"; + "Super+Shift Return" = "spawn foot"; + }; + }; + }; + }; + + # add waybar as a status bar + programs.waybar = { + enable = true; + + # start using systemd service + systemd = { + enable = true; + # target = "hyprland-session.target"; + }; + + settings = { + mainBar = { + start_hidden = true; + layer = "top"; + position = "top"; + height = 20; + modules-left = [ "river/mode" ]; + modules-center = [ "river/window" ]; + modules-right = [ "network" "memory" "cpu" "battery" "clock" ]; + }; + }; + }; + + # lock screen after timeout + programs.swaylock = { + enable = true; + settings = { + color = "000000"; + }; + }; + services.swayidle = { + enable = true; + events = [ + { + event = "before-sleep"; + command = "${getExe pkgs.swaylock} -fF"; + } + { + event = "lock"; + command = "${getExe pkgs.swaylock} -fF"; + } + ]; + timeouts = + let + lockTimeout = 10; + in + [ + { + timeout = lockTimeout * 60 - 10; + command = "${pkgs.libnotify}/bin/notify-send 'Locking screen!'"; + } + { + timeout = lockTimeout * 60 + 10; + command = "${pkgs.systemd}/bin/loginctl lock-session"; + } + ]; + # systemdTarget = "hyprland-session.target"; + }; + }; + + # adds pam module for swaylock + security.pam.services.swaylock = { }; + + # add user packages for wayland and hyprland in particular + users.users.moritz.packages = with pkgs; [ + brightnessctl # control brightness + grimblast # screenshot tool for hyprland + pamixer # pulse audio cli + playerctl # control media playback + slurp # region select for wayland (for screensharing) + wdisplays # manage monitors + wl-clipboard # clipboard tool for wayland + ]; + + + # additional environment variables + # environment.sessionVariables = + # { + # XDG_CURRENT_DESKTOP = "Hyprland"; + # XDG_SESSION_TYPE = "wayland"; + # XDG_SESSION_DESKTOP = "Hyprland"; + # QT_AUTO_SCREEN_SCALE_FACTOR = "1"; + # QT_QPA_PLATFORM = "wayland;xcb"; + # QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; + # QT_QPA_PLATFORMTHEME = "qt5ct"; + # _JAVA_AWT_WM_NONEREPARENTING = "1"; + # } // (optionalAttrs cfg.nvidiaSupport + # { + # LIBVA_DRIVER_NAME = "nvidia"; + # GBM_BACKEND = "nvidia-drm"; + # __GLX_VENDOR_LIBRARY_NAME = "nvidia"; + # WLR_NO_HARDWARE_CURSORS = "1"; + # __GL_VRR_ALLOWED = "0"; + # }); + + services = { + dbus.enable = true; + # use pipewire (needed for screensharing) + pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; + xserver = { + enable = true; + displayManager = { + lightdm.enable = true; + autoLogin = { + enable = true; + user = "moritz"; + }; + defaultSession = "river"; + }; + }; + }; + security.rtkit.enable = true; + + # home-manager.users.moritz.systemd.user.services = + # let + # units = [ "waybar" ]; + # mkAfter = _: { + # Unit = { + # After = [ "hyprland-session.target" ]; + # Wants = [ "hyprland-session.target" ]; + # }; + # }; + # in + # genAttrs units mkAfter; + # + # systemd.user.services = + # let + # units = [ "pipewire" "xdg-desktop-portal" "xdg-desktop-portal-hyprland" "wireplumber" ]; + # mkAfter = _: { + # after = [ "hyprland-session.target" ]; + # wants = [ "hyprland-session.target" ]; + # }; + # in + # genAttrs units mkAfter; + }; +}