Merge remote-tracking branch 'refs/remotes/origin/nixos' into nixos

feat: refresh ssh-home
feat(nvim): add templ, htmx and tailwind lsp
2024-01-20 12:29:51 +01:00 · 2024-01-20 12:29:29 +01:00 · 2024-01-16 12:46:39 +01:00 · 2024-01-16 12:45:33 +01:00 · 2024-01-16 12:41:10 +01:00 · 2024-01-16 12:40:37 +01:00
15 changed files with 261 additions and 273 deletions
--- a/flake.lock
+++ b/flake.lock
@ -22,14 +22,15 @@
        "home-manager": "home-manager",
        "nixpkgs": [
          "nixpkgs"
-        ]
+        ],
+        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1701216516,
-        "narHash": "sha256-jKSeJn+7hZ1dZdiH1L+NWUGT2i/BGomKAJ54B9kT06Q=",
+        "lastModified": 1703433843,
+        "narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=",
        "owner": "ryantm",
        "repo": "agenix",
-        "rev": "13ac9ac6d68b9a0896e3d43a082947233189e247",
+        "rev": "417caa847f9383e111d1397039c9d4337d024bf0",
        "type": "github"
      },
      "original": {
@ -79,11 +80,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1673295039,
-        "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=",
+        "lastModified": 1700795494,
+        "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "87b9d090ad39b25b2400029c64825fc2a8868943",
+        "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
        "type": "github"
      },
      "original": {
@ -96,7 +97,7 @@
    "devshell": {
      "inputs": {
        "nixpkgs": "nixpkgs",
-        "systems": "systems"
+        "systems": "systems_2"
      },
      "locked": {
        "lastModified": 1701787589,
@ -117,11 +118,11 @@
        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
-        "lastModified": 1701905325,
-        "narHash": "sha256-lda63LmEIlDMeCgWfjr3/wb487XPllBByfrGRieyEk4=",
+        "lastModified": 1704318910,
+        "narHash": "sha256-wOIJwAsnZhM0NlFRwYJRgO4Lldh8j9viyzwQXtrbNtM=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "1144887c6f4d2dcbb2316a24364ef53e25b0fcfe",
+        "rev": "aef9a509db64a081186af2dc185654d78dc8e344",
        "type": "github"
      },
      "original": {
@ -183,11 +184,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1701473968,
-        "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=",
+        "lastModified": 1704152458,
+        "narHash": "sha256-DS+dGw7SKygIWf9w4eNBUZsK+4Ug27NwEWmn2tnbycg=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5",
+        "rev": "88a2cd8166694ba0b6cb374700799cec53aef527",
        "type": "github"
      },
      "original": {
@ -204,11 +205,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1696343447,
-        "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=",
+        "lastModified": 1704152458,
+        "narHash": "sha256-DS+dGw7SKygIWf9w4eNBUZsK+4Ug27NwEWmn2tnbycg=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4",
+        "rev": "88a2cd8166694ba0b6cb374700799cec53aef527",
        "type": "github"
      },
      "original": {
@ -226,11 +227,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1696343447,
-        "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=",
+        "lastModified": 1701473968,
+        "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4",
+        "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5",
        "type": "github"
      },
      "original": {
@ -240,7 +241,7 @@
    },
    "flake-utils": {
      "inputs": {
-        "systems": "systems_2"
+        "systems": "systems_3"
      },
      "locked": {
        "lastModified": 1701680307,
@ -258,14 +259,14 @@
    },
    "flake-utils_2": {
      "inputs": {
-        "systems": "systems_4"
+        "systems": "systems_5"
      },
      "locked": {
-        "lastModified": 1685518550,
-        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
+        "lastModified": 1701680307,
+        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
+        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
        "type": "github"
      },
      "original": {
@ -276,7 +277,7 @@
    },
    "flake-utils_3": {
      "inputs": {
-        "systems": "systems_5"
+        "systems": "systems_6"
      },
      "locked": {
        "lastModified": 1685518550,
@ -295,11 +296,11 @@
    "gen-nvim": {
      "flake": false,
      "locked": {
-        "lastModified": 1702112421,
-        "narHash": "sha256-oF6LT8Q6Dp4mKDNTcm/hx0F8a6iN/HvpZKgGRkctrI4=",
+        "lastModified": 1703233104,
+        "narHash": "sha256-cNz/yPTTgt1ng4C2BqN4P62FBV7lmDIEmEsdDhfyKHk=",
        "owner": "David-Kunz",
        "repo": "gen.nvim",
-        "rev": "1319b03357fd7017bbaf1d45cd6b72bd9e106226",
+        "rev": "41ad952c8269fa7aa3a4b8a5abb44541cb628313",
        "type": "github"
      },
      "original": {
@ -338,11 +339,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1698165573,
-        "narHash": "sha256-cnMTgCDnZiQKsf+wVzigpexskqRCFTKgS58Wx2rNU1c=",
+        "lastModified": 1704029560,
+        "narHash": "sha256-a4Iu7x1OP+uSYpqadOu8VCPY+MPF3+f6KIi+MAxlgyw=",
        "owner": "hercules-ci",
        "repo": "hercules-ci-effects",
-        "rev": "300e0af24a1bbe32d115beb182efb01785582c45",
+        "rev": "d5cbf433a6ae9cae05400189a8dbc6412a03ba16",
        "type": "github"
      },
      "original": {
@ -351,22 +352,6 @@
        "type": "github"
      }
    },
-    "hmts-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1693226725,
-        "narHash": "sha256-jUuztOqNBltC3axa7s3CPJz9Cmukfwkf846+Z/gAxCU=",
-        "owner": "calops",
-        "repo": "hmts.nvim",
-        "rev": "14fd941d7ec2bb98314a1aacaa2573d97f1629ab",
-        "type": "github"
-      },
-      "original": {
-        "owner": "calops",
-        "repo": "hmts.nvim",
-        "type": "github"
-      }
-    },
    "home-manager": {
      "inputs": {
        "nixpkgs": [
@ -375,11 +360,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1682203081,
-        "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=",
+        "lastModified": 1703113217,
+        "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1",
+        "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1",
        "type": "github"
      },
      "original": {
@ -395,11 +380,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1701728041,
-        "narHash": "sha256-x0pyrI1vC8evVDxCxyO6olOyr4wlFg9+VS3C3p4xFYQ=",
+        "lastModified": 1704498488,
+        "narHash": "sha256-yINKdShHrtjdiJhov+q0s3Y3B830ujRoSbHduUNyKag=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "ac7216918cd65f3824ba7817dea8f22e61221eaf",
+        "rev": "51e44a13acea71b36245e8bd8c7db53e0a3e61ee",
        "type": "github"
      },
      "original": {
@ -413,11 +398,11 @@
        "nixpkgs": "nixpkgs_3"
      },
      "locked": {
-        "lastModified": 1700963402,
-        "narHash": "sha256-JhkanLmYRLekGOysO6JpCWKPlgRoemHPzUrARCGBqYA=",
+        "lastModified": 1704293951,
+        "narHash": "sha256-wf72LCfp4w8bZ8gJE/1IN+ZWYyX7/TNC1tr6hN1u9ZQ=",
        "owner": "hyprwm",
        "repo": "contrib",
-        "rev": "65e567a81176d39be7ce6513d1af23954f00cbec",
+        "rev": "fe26a90afdf9690052955899355bdc564c184e14",
        "type": "github"
      },
      "original": {
@ -430,16 +415,16 @@
      "inputs": {
        "hyprland-protocols": "hyprland-protocols",
        "nixpkgs": "nixpkgs_4",
-        "systems": "systems_3",
+        "systems": "systems_4",
        "wlroots": "wlroots",
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1701988578,
-        "narHash": "sha256-44jQ4XMNP5ql3fdXLN+SCEnKfZcK1aY34koIwFLWgYw=",
+        "lastModified": 1704475363,
+        "narHash": "sha256-isiBkAsjXIvb/6McVK42/iBbC4h+UL3JRkkLqTSPE48=",
        "owner": "hyprwm",
        "repo": "Hyprland",
-        "rev": "6fb1b89b982eea26ecae75b93f1742537c4f31ae",
+        "rev": "7e033e48ace5406a9bc442f7d403f9ce3af193f3",
        "type": "github"
      },
      "original": {
@ -473,31 +458,31 @@
        "type": "github"
      }
    },
-    "hyprpaper": {
+    "hyprlang": {
      "inputs": {
        "nixpkgs": "nixpkgs_5"
      },
      "locked": {
-        "lastModified": 1701083219,
-        "narHash": "sha256-0j4Poy2OEZ55GWagfj6ookxG6jXdsDHZLh6vU3DBuz4=",
+        "lastModified": 1704287638,
+        "narHash": "sha256-TuRXJGwtK440AXQNl5eiqmQqY4LZ/9+z/R7xC0ie3iA=",
        "owner": "hyprwm",
-        "repo": "hyprpaper",
-        "rev": "b94f84605d6d6d8d3c17a42a72fc3b01df69ab7f",
+        "repo": "hyprlang",
+        "rev": "6624f2bb66d4d27975766e81f77174adbe58ec97",
        "type": "github"
      },
      "original": {
        "owner": "hyprwm",
-        "repo": "hyprpaper",
+        "repo": "hyprlang",
        "type": "github"
      }
    },
    "impermanence": {
      "locked": {
-        "lastModified": 1697303681,
-        "narHash": "sha256-caJ0rXeagaih+xTgRduYtYKL1rZ9ylh06CIrt1w5B4g=",
+        "lastModified": 1703656108,
+        "narHash": "sha256-hCSUqdFJKHHbER8Cenf5JRzjMlBjIdwdftGQsO0xoJs=",
        "owner": "nix-community",
        "repo": "impermanence",
-        "rev": "0f317c2e9e56550ce12323eb39302d251618f5b5",
+        "rev": "033643a45a4a920660ef91caa391fbffb14da466",
        "type": "github"
      },
      "original": {
@ -509,11 +494,11 @@
    "libgit2": {
      "flake": false,
      "locked": {
-        "lastModified": 1700492800,
-        "narHash": "sha256-bGNcbA6AMUWhpuagnVWR1ZBdbUcZVdZtbMaRxY5JiCU=",
+        "lastModified": 1697646580,
+        "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=",
        "owner": "libgit2",
        "repo": "libgit2",
-        "rev": "d9475611fec95cacec30fbd2c334b270e5265d3b",
+        "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5",
        "type": "github"
      },
      "original": {
@ -540,11 +525,11 @@
    },
    "master": {
      "locked": {
-        "lastModified": 1702047654,
-        "narHash": "sha256-GYTb8in0dHg7/iaFmCcle8A+Ab85HpX9L57dIDpZKiw=",
+        "lastModified": 1704532737,
+        "narHash": "sha256-CV1elXkO4PfDm+8aDAB6XN8rt8znEoTT+SeEJ4PqC2Y=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "0e342e3226b7f25d82a413b09454e5bff8778e53",
+        "rev": "868769dc6c52c597dcf8275cd8eb7c019787536e",
        "type": "github"
      },
      "original": {
@ -602,11 +587,11 @@
      },
      "locked": {
        "dir": "contrib",
-        "lastModified": 1698359872,
-        "narHash": "sha256-/migmIszx7Kqa/x9I6hKYATeFSpZ7P+6NKRDA1nkZfk=",
+        "lastModified": 1704494961,
+        "narHash": "sha256-gQiTqBZLl4lpvCZ6zz8FZkE2u+9RmzGqVIdPQpY99E8=",
        "owner": "neovim",
        "repo": "neovim",
-        "rev": "9dc440400cdb470b317c4169ba916e1cd9a316e1",
+        "rev": "28c183b38cdc00436d95af80ee8e34e4793ee38d",
        "type": "github"
      },
      "original": {
@ -625,11 +610,11 @@
        "nixpkgs": "nixpkgs_6"
      },
      "locked": {
-        "lastModified": 1701993865,
-        "narHash": "sha256-2BksxNhmUG+MFCejvXeIPivJ8273r6aS5sqC4W8pjw8=",
+        "lastModified": 1704499431,
+        "narHash": "sha256-P6PfGHT2VkjVkW1SuvzHGwf9n043Zq3XACVQ/U2oXuo=",
        "owner": "nix-community",
        "repo": "neovim-nightly-overlay",
-        "rev": "3094e82f5b8b3ccf6ddd4917e881209faea35d90",
+        "rev": "713cb443519c554eb5957d5b5573483e94a90902",
        "type": "github"
      },
      "original": {
@ -645,11 +630,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1701980277,
-        "narHash": "sha256-qSMnoUIZl3lyaAXgXGQ4qnA5jufnNrBAI0bYw7kJgtE=",
+        "lastModified": 1703992163,
+        "narHash": "sha256-709CGmwU34dxv8DjSpRBZ+HibVJIVaFcA4JH+GFnhyM=",
        "owner": "Mic92",
        "repo": "nix-index-database",
-        "rev": "ca1f1798f63ada20dffcb8b23039b00a597dafe9",
+        "rev": "d6510ce144f5da7dd9bac667ba3d5a4946c00d11",
        "type": "github"
      },
      "original": {
@ -682,17 +667,16 @@
        "nixpkgs-regression": "nixpkgs-regression"
      },
      "locked": {
-        "lastModified": 1700941252,
-        "narHash": "sha256-2c8miJcsG24YEtXOSjvgW0ES1ND5DpY+ymGPq3S56YE=",
+        "lastModified": 1701958654,
+        "narHash": "sha256-ZhXujNwvwTDLmCpYb7h2bTDdZG4h97hEYjzBmKP8p2U=",
        "owner": "privatevoid-net",
        "repo": "nix-super",
-        "rev": "c076362db8b438c921d9bbe196ede50205f788c6",
+        "rev": "661b025c79eac08beda593ede47b41b2052e8ebf",
        "type": "github"
      },
      "original": {
        "owner": "privatevoid-net",
        "repo": "nix-super",
-        "rev": "c076362db8b438c921d9bbe196ede50205f788c6",
        "type": "github"
      }
    },
@ -715,11 +699,11 @@
    "nixpkgs-lib": {
      "locked": {
        "dir": "lib",
-        "lastModified": 1701253981,
-        "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=",
+        "lastModified": 1703961334,
+        "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58",
+        "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9",
        "type": "github"
      },
      "original": {
@ -780,11 +764,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1697915759,
-        "narHash": "sha256-WyMj5jGcecD+KC8gEs+wFth1J1wjisZf8kVZH13f1Zo=",
+        "lastModified": 1704008649,
+        "narHash": "sha256-rGPSWjXTXTurQN9beuHdyJhB8O761w1Zc5BqSSmHvoM=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "51d906d2341c9e866e48c2efcaac0f2d70bfd43e",
+        "rev": "d44d59d2b5bd694cd9d996fd8c51d03e3e9ba7f7",
        "type": "github"
      },
      "original": {
@ -812,11 +796,11 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1700612854,
-        "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=",
+        "lastModified": 1704194953,
+        "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614",
+        "rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6",
        "type": "github"
      },
      "original": {
@ -828,11 +812,11 @@
    },
    "nixpkgs_5": {
      "locked": {
-        "lastModified": 1683014792,
-        "narHash": "sha256-6Va9iVtmmsw4raBc3QKvQT2KT/NGRWlvUlJj46zN8B8=",
-        "owner": "NixOS",
+        "lastModified": 1702645756,
+        "narHash": "sha256-qKI6OR3TYJYQB3Q8mAZ+DG4o/BR9ptcv9UnRV2hzljc=",
+        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "1a411f23ba299db155a5b45d5e145b85a7aafc42",
+        "rev": "40c3c94c241286dd2243ea34d3aef8a488f9e4d0",
        "type": "github"
      },
      "original": {
@ -844,11 +828,11 @@
    },
    "nixpkgs_6": {
      "locked": {
-        "lastModified": 1698266953,
-        "narHash": "sha256-jf72t7pC8+8h8fUslUYbWTX5rKsRwOzRMX8jJsGqDXA=",
+        "lastModified": 1704161960,
+        "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "75a52265bda7fd25e06e3a67dee3f0354e73243c",
+        "rev": "63143ac2c9186be6d9da6035fa22620018c85932",
        "type": "github"
      },
      "original": {
@ -860,11 +844,11 @@
    },
    "nixpkgs_7": {
      "locked": {
-        "lastModified": 1695283060,
-        "narHash": "sha256-CJz71xhCLlRkdFUSQEL0pIAAfcnWFXMzd9vXhPrnrEg=",
+        "lastModified": 1700748986,
+        "narHash": "sha256-/nqLrNU297h3PCw4QyDpZKZEUHmialJdZW2ceYFobds=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "31ed632c692e6a36cfc18083b88ece892f863ed4",
+        "rev": "9ba29e2346bc542e9909d1021e8fd7d4b3f64db0",
        "type": "github"
      },
      "original": {
@ -876,11 +860,11 @@
    },
    "nixpkgs_8": {
      "locked": {
-        "lastModified": 1701693815,
-        "narHash": "sha256-7BkrXykVWfkn6+c1EhFA3ko4MLi3gVG0p9G96PNnKTM=",
+        "lastModified": 1704161960,
+        "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "09ec6a0881e1a36c29d67497693a67a16f4da573",
+        "rev": "63143ac2c9186be6d9da6035fa22620018c85932",
        "type": "github"
      },
      "original": {
@ -909,11 +893,11 @@
    "none-ls-nvim": {
      "flake": false,
      "locked": {
-        "lastModified": 1701961425,
-        "narHash": "sha256-hLGai3rrA1tVWn4XdLO/z9dNo6X9tyhVbnnDPvJhuzw=",
+        "lastModified": 1704269551,
+        "narHash": "sha256-RywvfEblN0dukmPVCn0r7+hQr9L1VP5fyHHnOcfvda8=",
        "owner": "nvimtools",
        "repo": "none-ls.nvim",
-        "rev": "45d0e8fa9094dcc3fabad9065a5822af9cf099c7",
+        "rev": "fbdcbf8e152529af846b3a333f039751829b84c2",
        "type": "github"
      },
      "original": {
@ -924,11 +908,11 @@
    },
    "nur": {
      "locked": {
-        "lastModified": 1702043062,
-        "narHash": "sha256-Q4iifG2pgHJ09zrxHIeVbSPnhpGsP0ssRbA0x9rVM6s=",
+        "lastModified": 1704535142,
+        "narHash": "sha256-iNCliUH8hvi7KF6HGDvWa80qZR4FW+ajz4VJ6zQb4gg=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "4ca441c58bbfaa1728c4a5b4115f79569f6ff186",
+        "rev": "33ac9895fdc714eff02e0ccf3b80711a5fd34913",
        "type": "github"
      },
      "original": {
@ -940,11 +924,11 @@
    "nvim-lspconfig": {
      "flake": false,
      "locked": {
-        "lastModified": 1702007833,
-        "narHash": "sha256-4Ogx+58962qoph8iMyHBGEqoRARK5KQAYEaa1wsgdsw=",
+        "lastModified": 1704517718,
+        "narHash": "sha256-CsMf78TIzvB9OETUOSxj2lFPdZFnIna1keCotq8SvZw=",
        "owner": "neovim",
        "repo": "nvim-lspconfig",
-        "rev": "511609ae0311abfcfaed3c398429a147e895ce2c",
+        "rev": "796394fd19fb878e8dbc4fd1e9c9c186ed07a5f4",
        "type": "github"
      },
      "original": {
@ -956,11 +940,11 @@
    "nvim-puppeteer": {
      "flake": false,
      "locked": {
-        "lastModified": 1702039678,
-        "narHash": "sha256-gapO2oSprw85a5BKFi+rhB11edGwB1JqATQUBudqKHU=",
+        "lastModified": 1703769812,
+        "narHash": "sha256-En+4JBF9CI6AdEGto9JJ1XuRhWVN32iupkU5PZEA3Fc=",
        "owner": "chrisgrieser",
        "repo": "nvim-puppeteer",
-        "rev": "486502b9c8207b53459061783310bca5f476c48b",
+        "rev": "d7e1b2d67c89d32b6ecada88ff67b539ba09f2d7",
        "type": "github"
      },
      "original": {
@ -972,16 +956,15 @@
    "nvim-treesitter": {
      "flake": false,
      "locked": {
-        "lastModified": 1691831669,
-        "narHash": "sha256-1Iuvq0hVQ7LyBYOkJ5d07NkwbGcR1K61ZZmAAA7ABGs=",
+        "lastModified": 1704537069,
+        "narHash": "sha256-PIqaMzakP0boyInkDagkl+95IwbMgEhgc/o7TnmD9m4=",
        "owner": "nvim-treesitter",
        "repo": "nvim-treesitter",
-        "rev": "63260da18bf273c76b8e2ea0db84eb901cab49ce",
+        "rev": "5032f9952ad2a3a7f7792ac438c4f9e2bd53e0b9",
        "type": "github"
      },
      "original": {
        "owner": "nvim-treesitter",
-        "ref": "v0.9.1",
        "repo": "nvim-treesitter",
        "type": "github"
      }
@ -995,11 +978,11 @@
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1700922917,
-        "narHash": "sha256-ej2fch/T584b5K9sk1UhmZF7W6wEfDHuoUYpFN8dtvM=",
+        "lastModified": 1703939133,
+        "narHash": "sha256-Gxe+mfOT6bL7wLC/tuT2F+V+Sb44jNr8YsJ3cyIl4Mo=",
        "owner": "cachix",
        "repo": "pre-commit-hooks.nix",
-        "rev": "e5ee5c5f3844550c01d2131096c7271cec5e9b78",
+        "rev": "9d3d7e18c6bc4473d7520200d4ddab12f8402d38",
        "type": "github"
      },
      "original": {
@ -1008,23 +991,6 @@
        "type": "github"
      }
    },
-    "rofi-wayland": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1701359387,
-        "narHash": "sha256-AjZMjEKv3Ksp93KMJoPibgb/ibNlgt3WKez8WMsY4a0=",
-        "owner": "lbonn",
-        "repo": "rofi",
-        "rev": "36621af0e49e1272fcafb161e1dbf0c1345b394f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lbonn",
-        "ref": "wayland",
-        "repo": "rofi",
-        "type": "github"
-      }
-    },
    "root": {
      "inputs": {
        "actions-preview-nvim": "actions-preview-nvim",
@ -1036,11 +1002,9 @@
        "flake-parts": "flake-parts",
        "flake-utils": "flake-utils",
        "gen-nvim": "gen-nvim",
-        "hmts-nvim": "hmts-nvim",
        "home-manager": "home-manager_2",
        "hypr-contrib": "hypr-contrib",
        "hyprland": "hyprland",
-        "hyprpaper": "hyprpaper",
        "impermanence": "impermanence",
        "master": "master",
        "neotest-python": "neotest-python",
@ -1055,7 +1019,6 @@
        "nvim-puppeteer": "nvim-puppeteer",
        "nvim-treesitter": "nvim-treesitter",
        "pre-commit-hooks": "pre-commit-hooks",
-        "rofi-wayland": "rofi-wayland",
        "smartcolumn-nvim": "smartcolumn-nvim",
        "stable": "stable",
        "statuscol-nvim": "statuscol-nvim",
@ -1066,11 +1029,11 @@
    "smartcolumn-nvim": {
      "flake": false,
      "locked": {
-        "lastModified": 1694526430,
-        "narHash": "sha256-O9lPx4WVtiH8tCXVGtNHpcNDDIC+IdcZl8ielDD+rcY=",
+        "lastModified": 1703592909,
+        "narHash": "sha256-c5tENO4LJaSRELxuCOp/aI94ifhKjqd8J2chJbxfFdc=",
        "owner": "m4xshen",
        "repo": "smartcolumn.nvim",
-        "rev": "c6abf3917fcec487c7475e208ae37f5788af5b04",
+        "rev": "a52915d6d9abf9972e249ebcffcc651cf9b062dd",
        "type": "github"
      },
      "original": {
@ -1081,11 +1044,11 @@
    },
    "stable": {
      "locked": {
-        "lastModified": 1701615100,
-        "narHash": "sha256-7VI84NGBvlCTduw2aHLVB62NvCiZUlALLqBe5v684Aw=",
+        "lastModified": 1704018918,
+        "narHash": "sha256-erjg/HrpC9liEfm7oLqb8GXCqsxaFwIIPqCsknW5aFY=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "e9f06adb793d1cca5384907b3b8a4071d5d7cb19",
+        "rev": "2c9c58e98243930f8cb70387934daa4bc8b00373",
        "type": "github"
      },
      "original": {
@ -1098,11 +1061,11 @@
    "statuscol-nvim": {
      "flake": false,
      "locked": {
-        "lastModified": 1700946586,
-        "narHash": "sha256-g36X+9hoOhHlw/DRSYdidQpHTx3ibjXNHJvONi29Yk8=",
+        "lastModified": 1703372986,
+        "narHash": "sha256-uEKdzttNTQqwZb2oPgzTDuvJRkoTCmGg3piFzwKBITc=",
        "owner": "luukvbaal",
        "repo": "statuscol.nvim",
-        "rev": "fb56a46dc446d3e9b61c269dd4aadbfd509223a7",
+        "rev": "0a782cc73f935e9f790ed029dc316b297545d845",
        "type": "github"
      },
      "original": {
@ -1143,21 +1106,6 @@
      }
    },
    "systems_3": {
-      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
-    },
-    "systems_4": {
      "locked": {
        "lastModified": 1681028828,
        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -1172,6 +1120,21 @@
        "type": "github"
      }
    },
+    "systems_4": {
+      "locked": {
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "type": "github"
+      }
+    },
    "systems_5": {
      "locked": {
        "lastModified": 1681028828,
@ -1202,14 +1165,29 @@
        "type": "github"
      }
    },
+    "systems_7": {
+      "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": 1697095424,
-        "narHash": "sha256-lLy83LiGhyAdVV82YSJUfWyLqxK3ghFJ/FWNxBFl7mQ=",
+        "lastModified": 1702296926,
+        "narHash": "sha256-Y6LVli8fMLVVRtwrpZ2uIWDUogwUtFhTB6W2RZH5S8c=",
        "owner": "renerocksai",
        "repo": "telekasten.nvim",
-        "rev": "3fd50c62c1ed2f973ce8639c1218445e4e91a962",
+        "rev": "8c2b3889eb31009ae510a43384d1957b37654176",
        "type": "github"
      },
      "original": {
@ -1240,7 +1218,7 @@
    },
    "utils": {
      "inputs": {
-        "systems": "systems_6"
+        "systems": "systems_7"
      },
      "locked": {
        "lastModified": 1692799911,
@ -1260,18 +1238,18 @@
      "flake": false,
      "locked": {
        "host": "gitlab.freedesktop.org",
-        "lastModified": 1701368958,
-        "narHash": "sha256-7kvyoA91etzVEl9mkA/EJfB6z/PltxX7Xc4gcr7/xlo=",
+        "lastModified": 1703963193,
+        "narHash": "sha256-ke8drv6PTrdQDruWbajrRJffP9A9PU6FRyjJGNZRTs4=",
        "owner": "wlroots",
        "repo": "wlroots",
-        "rev": "5d639394f3e83b01596dcd166a44a9a1a2583350",
+        "rev": "f81c3d93cd6f61b20ae784297679283438def8df",
        "type": "gitlab"
      },
      "original": {
        "host": "gitlab.freedesktop.org",
        "owner": "wlroots",
        "repo": "wlroots",
-        "rev": "5d639394f3e83b01596dcd166a44a9a1a2583350",
+        "rev": "f81c3d93cd6f61b20ae784297679283438def8df",
        "type": "gitlab"
      }
    },
@ -1281,6 +1259,7 @@
          "hyprland",
          "hyprland-protocols"
        ],
+        "hyprlang": "hyprlang",
        "nixpkgs": [
          "hyprland",
          "nixpkgs"
@ -1291,11 +1270,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1700508250,
-        "narHash": "sha256-X4o/mifI7Nhu0UKYlxx53wIC+gYDo3pVM9L2u3PE2bE=",
+        "lastModified": 1704400467,
+        "narHash": "sha256-IsEAKBCorRlN53FwFAMbyGLRsPVu/ZrWEJtCwykPds8=",
        "owner": "hyprwm",
        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "eb120ff25265ecacd0fc13d7dab12131b60d0f47",
+        "rev": "1c802128f6cc3db29a8ef01552b1a22f894eeefd",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -21,16 +21,12 @@
    nix-index-database.inputs.nixpkgs.follows = "nixpkgs";

    # Programs
-    nix-super.url = "github:privatevoid-net/nix-super/c076362db8b438c921d9bbe196ede50205f788c6";
-    rofi-wayland.flake = false;
-    rofi-wayland.url = "github:lbonn/rofi/wayland";
+    nix-super.url = "github:privatevoid-net/nix-super";
    timers.url = "git+https://gitea.moritzboeh.me/moritz/timers.git";

    # Neovim
    actions-preview-nvim.flake = false;
    actions-preview-nvim.url = "github:aznhe21/actions-preview.nvim";
-    hmts-nvim.flake = false;
-    hmts-nvim.url = "github:calops/hmts.nvim";
    neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
    nix-lazy-nvim.url = "git+https://git.moritzboeh.me/moritz/NixLazy.nvim";
    nvim-lspconfig.flake = false;
@ -38,7 +34,7 @@
    nvim-puppeteer.flake = false;
    nvim-puppeteer.url = "github:chrisgrieser/nvim-puppeteer";
    nvim-treesitter.flake = false;
-    nvim-treesitter.url = "github:nvim-treesitter/nvim-treesitter/v0.9.1"; # NOTE: to fix weird latest issues
+    nvim-treesitter.url = "github:nvim-treesitter/nvim-treesitter";
    smartcolumn-nvim.flake = false;
    smartcolumn-nvim.url = "github:m4xshen/smartcolumn.nvim";
    telekasten-nvim.flake = false;
@ -55,7 +51,6 @@
    # Hyprland
    hypr-contrib.url = "github:hyprwm/contrib";
    hyprland.url = "github:hyprwm/Hyprland";
-    hyprpaper.url = "github:hyprwm/hyprpaper";

    # Laptop
    asus-touchpad-numpad-driver.url = "github:MoritzBoehme/asus-touchpad-numpad-driver/german-layout";
@ -220,8 +215,10 @@
      "https://hyprland.cachix.org"
      "https://nix-community.cachix.org"
      "https://pre-commit-hooks.cachix.org"
+      "https://cache.privatevoid.net"
    ];
    extra-trusted-public-keys = [
+      "cache.privatevoid.net:SErQ8bvNWANeAvtsOESUwVYr2VJynfuc9JRwlzTTkVg="
      "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
      "pre-commit-hooks.cachix.org-1:Pkk3Panw5AW24TOv6kz3PvLhlH8puAsJTBbOPmBo7Rc="
--- a/modules/profiles/base.nix
+++ b/modules/profiles/base.nix
@ -101,7 +101,6 @@ in
        cat = "bat";
        rm = "rm -i";
        mv = "mv -i";
-        cd = "__zoxide_z";

        nixos-update = "pushd ~/.dotfiles && nix flake update && popd";
      };
--- a/modules/profiles/impermanence.nix
+++ b/modules/profiles/impermanence.nix
@ -52,6 +52,7 @@ in
          ".config/calibre"
          ".local/state/nvim"
          ".config/kdeconnect"
+          ".config/github-copilot"
          ".cat_installer" # eduroam
          ".mozilla"
          "Documents"
--- a/modules/programs/hyprland/default.nix
+++ b/modules/programs/hyprland/default.nix
@ -1,6 +1,7 @@
 { config
 , lib
 , pkgs
+, inputs
 , ...
 } @ args:

@ -60,6 +61,7 @@ in

    programs.hyprland = {
      enable = true;
+      package = inputs.hyprland.packages.${pkgs.system}.default;
    };

    home-manager.users.moritz = {
--- a/modules/programs/nix.nix
+++ b/modules/programs/nix.nix
@ -26,7 +26,7 @@ in
  config.nix = {
    nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];

-    package = pkgs.nix-super;
+    package = inputs.nix-super.packages.${pkgs.system}.default;

    extraOptions = "experimental-features = nix-command flakes";

--- a/modules/programs/nvim/default.nix
+++ b/modules/programs/nvim/default.nix
@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, inputs, ... }:

 with lib;
 let
@ -21,7 +21,7 @@ in

      programs.neovim = {
        enable = true;
-        package = pkgs.neovim-nightly;
+        package = inputs.neovim-nightly-overlay.packages.${pkgs.system}.default;
        vimAlias = true;
        vimdiffAlias = true;
        withNodeJs = true;
--- a/modules/programs/nvim/options.lua
+++ b/modules/programs/nvim/options.lua
@ -26,6 +26,17 @@ vim.opt.updatetime = 300
 vim.opt_local.spell = true
 vim.opt_local.spelllang = { "en", "de_20" } -- all English regions and new German spelling

+-- Abbreviations for common typos
+vim.cmd("cnoreabbrev W! w!")
+vim.cmd("cnoreabbrev Q! q!")
+vim.cmd("cnoreabbrev Qall! qall!")
+vim.cmd("cnoreabbrev Wq wq")
+vim.cmd("cnoreabbrev Wa wa")
+vim.cmd("cnoreabbrev wQ wq")
+vim.cmd("cnoreabbrev WQ wq")
+vim.cmd("cnoreabbrev W w")
+vim.cmd("cnoreabbrev Q q")
+
 if vim.g.neovide then
  vim.opt.guifont = "Fira Code Nerd Font:h10"
  vim.g.neovide_scale_factor = 0.7
--- a/modules/programs/nvim/plugins/lua/nvim-lspconfig.lua
+++ b/modules/programs/nvim/plugins/lua/nvim-lspconfig.lua
@ -102,7 +102,7 @@ local on_attach_def = function(client, bufnr)
    }
    local timeout = vim.tbl_contains(slow_lsp_servers, client.name, {}) and 500 or 0
    vim.defer_fn(function()
-      vim.lsp.inlay_hint(bufnr, true)
+      vim.lsp.inlay_hint.enable(bufnr, true)
    end, timeout)
  end
 end
@ -130,12 +130,25 @@ local servers = {
  "nil_ls",
  "nixd",
  "ruff_lsp",
+  "templ",
  "typst_lsp",
 }
 for _, lsp in ipairs(servers) do
  lspconfig_setup(lsp, {})
 end

+-- Add templ filetype
+vim.filetype.add({ extension = { templ = "templ" } })
+
+lspconfig_setup("htmx", {
+  filetypes = { "html", "templ" },
+})
+
+lspconfig_setup("tailwindcss", {
+  filetypes = { "templ", "astro", "javascript", "typescript", "react" },
+  init_options = { userLanguages = { templ = "html" } },
+})
+
 lspconfig_setup("pylsp", {
  settings = {
    pylsp = {
--- a/modules/programs/nvim/plugins/treesitter.nix
+++ b/modules/programs/nvim/plugins/treesitter.nix
@ -1,8 +1,15 @@
-{ lib, pkgs, ... }:
+{ pkgs, config, ... }:

 with builtins;
 {
  config.home-manager.users.moritz.programs.neovim.lazy.plugins = with pkgs.vimPlugins; [
+    (
+      let
+        parserDir = pkgs.symlinkJoin {
+          name = "tresitter-grammars-all";
+          paths = pkgs.vimPlugins.nvim-treesitter.withAllGrammars.dependencies;
+        };
+      in
      {
        plugin = nvim-treesitter;
        event = [ "BufReadPost" "BufNewFile" ];
@ -44,23 +51,22 @@ with builtins;
            };
        };
        conf =
-        let
-          parserDir = pkgs.symlinkJoin
-            {
-              name = "tresitter-grammars-all";
-              paths = lib.attrValues (lib.filterAttrs (_: builtins.isAttrs) nvim-treesitter-parsers);
-            };
-        in
          ''
-          vim.opt.runtimepath:append("${parserDir}")
            local final_opts = vim.tbl_deep_extend("keep", opts, { parser_install_dir = "${parserDir}" })
            require('nvim-treesitter.configs').setup(final_opts)
          '';
+        init = ''
+          local runtimepath = vim.opt.runtimepath:get()
+          table.insert(runtimepath, 4, "${parserDir}")
+          vim.opt.runtimepath = runtimepath
+        '';
+        priority = 100;
        dependencies = [
          { plugin = nvim-treesitter-textobjects; }
          { plugin = nvim-ts-context-commentstring; opts = { }; }
        ];
      }
+    )
    {
      plugin = nvim-treesitter-textsubjects;
      event = [ "BufReadPost" "BufNewFile" ];
@ -71,9 +77,5 @@ with builtins;
      event = [ "BufReadPost" "BufNewFile" ];
      opts = { };
    }
-    {
-      plugin = hmts-nvim;
-      ft = [ "nix" ];
-    }
  ];
 }
--- a/modules/services/printing.nix
+++ b/modules/services/printing.nix
@ -15,7 +15,7 @@ in
      };
      avahi = {
        enable = true;
-        nssmdns = true;
+        nssmdns4 = true;
      };
    };
  };
--- a/modules/services/timers.nix
+++ b/modules/services/timers.nix
@ -1,4 +1,5 @@
 { config
+, inputs
 , lib
 , pkgs
 , ...
@ -12,7 +13,7 @@ in
  options.my.services.timers.enable = mkEnableOption "timers";
  options.my.services.timers.package = mkOption {
    type = types.package;
-    default = pkgs.timers;
+    inherit (inputs.timers.packages.${pkgs.system}) default;
  };

  config = lib.mkIf cfg.enable {
--- a/overlays/packages.nix
+++ b/overlays/packages.nix
@ -1,18 +1,7 @@
-{ inputs, lib, ... }:
+_:

 _: prev:
 {
-  agenix = inputs.agenix.packages.${prev.system}.default;
-  hyprpaper = inputs.hyprpaper.packages.${prev.system}.default;
-  nix-super = inputs.nix-super.packages.${prev.system}.default;
-  rofi-wayland = prev.rofi-wayland.overrideAttrs (_: {
-    src = inputs.rofi-wayland;
-    version = lib.my.mkVersionInput inputs.rofi-wayland;
-  });
-  timers = inputs.timers.packages.${prev.system}.default;
-  hyprland = inputs.hyprland.packages.${prev.system}.default;
-  neovim-nightly = inputs.neovim-nightly-overlay.packages.${prev.system}.default;
-
  xorg = prev.xorg // {
    lndir = prev.xorg.lndir.overrideAttrs (_: {
      meta.mainProgram = "lndir";
--- a/overlays/vimPlugins.nix
+++ b/overlays/vimPlugins.nix
@ -16,12 +16,6 @@ with lib.my;
      src = inputs.telekasten-nvim;
    };

-    hmts-nvim = prev.vimUtils.buildVimPlugin {
-      pname = "hmts-nvim";
-      version = mkVersionInput inputs.hmts-nvim;
-      src = inputs.hmts-nvim;
-    };
-
    actions-preview-nvim = prev.vimUtils.buildVimPlugin {
      pname = "actions-preview-nvim";
      version = mkVersionInput inputs.actions-preview-nvim;
--- a/secrets/ssh-home.age
+++ b/secrets/ssh-home.age
Author	SHA1	Message	Date
Moritz Böhme	8d5300682c	Merge remote-tracking branch 'refs/remotes/origin/nixos' into nixos	2024-01-20 12:29:51 +01:00
Moritz Böhme	d50a58463f	feat: refresh ssh-home	2024-01-20 12:29:29 +01:00
Moritz Böhme	cb881fbbc8	feat(nvim): add templ, htmx and tailwind lsp	2024-01-16 12:46:39 +01:00
Moritz Böhme	f79dec2ebf	chore!: update inputs and fix issues	2024-01-16 12:45:33 +01:00
Moritz Böhme	c17fe56071	fix(impermanence): keep github copilot credentials	2024-01-16 12:41:10 +01:00
Moritz Böhme	a3289ee611	refactor!: use inputs directly instead of overlays	2024-01-16 12:40:37 +01:00
Moritz Böhme	6ceddb1f94	feat!: treesitter injections not needed anymore	2024-01-16 12:35:34 +01:00
Moritz Böhme	e468d26c51	feat(nvim): add abbreviations for typos	2024-01-16 12:34:34 +01:00
Moritz Böhme	8364d22f92	feat: add nix super cache	2024-01-16 12:33:48 +01:00