summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpolwex <polwex@sortug.com>2024-11-06 07:35:16 +0000
committerpolwex <polwex@sortug.com>2024-11-06 07:35:16 +0000
commited673f3c5c7932194b811a902d541f113bc41db7 (patch)
treea780048289fd53330cf733353615624b679de60b
parent8ba8980c12a1fb05970dead6228ddc3129ff5868 (diff)
m
-rw-r--r--flake.lock250
-rw-r--r--hosts/base.nix2
-rw-r--r--hosts/cloud/bkk/nginx.nix18
-rw-r--r--hosts/editors.nix4
-rw-r--r--hosts/local/s15/configuration.nix1
-rw-r--r--hosts/local/s15/zellij.kdl371
6 files changed, 147 insertions, 499 deletions
diff --git a/flake.lock b/flake.lock
index af81e82..430528e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -96,11 +96,11 @@
},
"crane_3": {
"locked": {
- "lastModified": 1728776144,
- "narHash": "sha256-fROVjMcKRoGHofDm8dY3uDUtCMwUICh/KjBFQnuBzfg=",
+ "lastModified": 1730652660,
+ "narHash": "sha256-+XVYfmVXAiYA0FZT7ijHf555dxCe+AoAT5A6RU+6vSo=",
"owner": "ipetkov",
"repo": "crane",
- "rev": "f876e3d905b922502f031aeec1a84490122254b7",
+ "rev": "a4ca93905455c07cb7e3aca95d4faf7601cba458",
"type": "github"
},
"original": {
@@ -139,11 +139,11 @@
]
},
"locked": {
- "lastModified": 1729281548,
- "narHash": "sha256-MuojlSnwAJAwfhgmW8ZtZrwm2Sko4fqubCvReqbUzYw=",
+ "lastModified": 1730751873,
+ "narHash": "sha256-sdY29RWz0S7VbaoTwSy6RummdHKf0wUTaBlqPxrtvmQ=",
"owner": "nix-community",
"repo": "disko",
- "rev": "a6a3179ddf396dfc28a078e2f169354d0c137125",
+ "rev": "856a2902156ba304efebd4c1096dbf7465569454",
"type": "github"
},
"original": {
@@ -252,11 +252,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
- "lastModified": 1727826117,
- "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
+ "lastModified": 1730504689,
+ "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
+ "rev": "506278e768c2a08bec68eb62932193e341f55c90",
"type": "github"
},
"original": {
@@ -273,11 +273,11 @@
]
},
"locked": {
- "lastModified": 1727826117,
- "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
+ "lastModified": 1730504689,
+ "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
+ "rev": "506278e768c2a08bec68eb62932193e341f55c90",
"type": "github"
},
"original": {
@@ -291,11 +291,11 @@
"nixpkgs-lib": "nixpkgs-lib_2"
},
"locked": {
- "lastModified": 1727826117,
- "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
+ "lastModified": 1730504689,
+ "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
+ "rev": "506278e768c2a08bec68eb62932193e341f55c90",
"type": "github"
},
"original": {
@@ -367,11 +367,11 @@
"systems": "systems_4"
},
"locked": {
- "lastModified": 1710146030,
- "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+ "lastModified": 1726560853,
+ "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+ "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github"
},
"original": {
@@ -457,11 +457,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
- "lastModified": 1729104314,
- "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=",
+ "lastModified": 1730814269,
+ "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=",
"owner": "cachix",
"repo": "git-hooks.nix",
- "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6",
+ "rev": "d70155fdc00df4628446352fc58adc640cd705c2",
"type": "github"
},
"original": {
@@ -543,11 +543,11 @@
"rust-overlay": "rust-overlay_2"
},
"locked": {
- "lastModified": 1729477666,
- "narHash": "sha256-ri40XjKyZIMH5wBCFNa50dq5wTBPF5qH/NVDo+syhNM=",
+ "lastModified": 1730790589,
+ "narHash": "sha256-xJ6bQ4VmdTB7A+dMbmOMaZ8a6erB6rkZkB+yzqD7gd4=",
"owner": "helix-editor",
"repo": "helix",
- "rev": "6d64e6288add793caf1c841ea295518414c04ea0",
+ "rev": "b53dafe326d51b7f64a1c52379e3d4150cd2991e",
"type": "github"
},
"original": {
@@ -598,11 +598,11 @@
},
"impermanence": {
"locked": {
- "lastModified": 1729068498,
- "narHash": "sha256-C2sGRJl1EmBq0nO98TNd4cbUy20ABSgnHWXLIJQWRFA=",
+ "lastModified": 1730403150,
+ "narHash": "sha256-W1FH5aJ/GpRCOA7DXT/sJHFpa5r8sq2qAUncWwRZ3Gg=",
"owner": "nix-community",
"repo": "impermanence",
- "rev": "e337457502571b23e449bf42153d7faa10c0a562",
+ "rev": "0d09341beeaa2367bac5d718df1404bf2ce45e6f",
"type": "github"
},
"original": {
@@ -617,11 +617,11 @@
},
"locked": {
"dir": "nix",
- "lastModified": 1729490360,
- "narHash": "sha256-qSlh9uWnsxtnxjWZbhWhUJTA/jcscooQcvwxTcfnSnE=",
+ "lastModified": 1730793763,
+ "narHash": "sha256-0yT0oGinFhmXPR+pzRcDnaw1OZjhMlzTU8eWsdjvMZs=",
"owner": "kmonad",
"repo": "kmonad",
- "rev": "dd58bd1d20e8cbb4d4d4bdbeb93799573b202603",
+ "rev": "606c488862df6c3be1e4e670f6e1e06008c84732",
"type": "github"
},
"original": {
@@ -641,11 +641,11 @@
"rust-overlay": "rust-overlay_3"
},
"locked": {
- "lastModified": 1729064530,
- "narHash": "sha256-oSr/w/5dvf/8ll6NvQlL7+rrK8wzjIcEMP1LvI4Ag08=",
+ "lastModified": 1730739295,
+ "narHash": "sha256-aYeJ/P/9AuK6Kee63ZdsmDjEwhnksF+gIv/OyGtlBJE=",
"owner": "nix-community",
"repo": "lanzaboote",
- "rev": "2fa1368f938b50e35ca87334b5aeba38a3402165",
+ "rev": "cef39a78679c266300874e7a7000b4da066228d4",
"type": "github"
},
"original": {
@@ -660,11 +660,11 @@
"nixpkgs-lib": "nixpkgs-lib_3"
},
"locked": {
- "lastModified": 1729426412,
- "narHash": "sha256-VGbpECf35W4LtWLfx2+ue8zZEPwKQnadJadlT8E1Ceo=",
+ "lastModified": 1730635946,
+ "narHash": "sha256-CdeoMnMXpCq4wBWEWHfUUs68zoyAJLfp1JmfXWtmAgc=",
"owner": "nix-community",
"repo": "lib-aggregate",
- "rev": "736c43de3c953104e1610183d56e90b419c6344e",
+ "rev": "d0ecc1890f77e9e170f2de279d6902d84a0cbc51",
"type": "github"
},
"original": {
@@ -680,11 +680,11 @@
"spectrum": "spectrum"
},
"locked": {
- "lastModified": 1728779945,
- "narHash": "sha256-RFKyZygnUbJlWq1uBn4JvEEcQKZW3AFBL3bQoywECPI=",
+ "lastModified": 1730499294,
+ "narHash": "sha256-RxV89z3TwhQT0Wue42aSPh3O7hXGbAFYHHNSnW9h6P8=",
"owner": "astro",
"repo": "microvm.nix",
- "rev": "4d81c4115ef832880561f243efec21f06d2a8b7c",
+ "rev": "93122446d6001f9789d05e565f73bebfa3f53b50",
"type": "github"
},
"original": {
@@ -700,11 +700,11 @@
]
},
"locked": {
- "lastModified": 1729382845,
- "narHash": "sha256-REiWck1zIOnZIgGmmOWfwvkQw1f4UrBsxxOSKVSAG4w=",
+ "lastModified": 1730779758,
+ "narHash": "sha256-5WI9AnsBwhLzVRnQm3Qn9oAbROnuLDQTpaXeyZCK8qw=",
"owner": "lnl7",
"repo": "nix-darwin",
- "rev": "a001f44cfc47164839eb61c6b1e7f4288813f7e8",
+ "rev": "0e3f3f017c14467085f15d42343a3aaaacd89bcb",
"type": "github"
},
"original": {
@@ -721,11 +721,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
- "lastModified": 1728593025,
- "narHash": "sha256-j/p2ftkP8MXYEK7Vx65jH/Knr2QkEcRSVoDnVOUDe6Q=",
+ "lastModified": 1730389079,
+ "narHash": "sha256-g/CJ/KKe5MGsVx1oCBl0F9aCdcNSDeOw8H7e5QDGa2c=",
"owner": "nix-community",
"repo": "nix-eval-jobs",
- "rev": "a3307ac4b38b6dae769f771c877a6f2c236ee238",
+ "rev": "7f9159a16584ee86eed077c8a73e845690b7d513",
"type": "github"
},
"original": {
@@ -741,11 +741,11 @@
"umu": "umu"
},
"locked": {
- "lastModified": 1729525221,
- "narHash": "sha256-c2K2DKeKDnDaVLOzBPpe2XWuoHyfXWjat2lLbNQbHhQ=",
+ "lastModified": 1730770711,
+ "narHash": "sha256-UHm56cW/04efHY4NgboGFOXliGQCqRRY+l1HM7c8/Ms=",
"owner": "fufexan",
"repo": "nix-gaming",
- "rev": "d5baae772ce87682c624233c7a9265b387caa818",
+ "rev": "0c25376479d11073346ed22de8571805543ede71",
"type": "github"
},
"original": {
@@ -872,11 +872,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1729509737,
- "narHash": "sha256-8OHgqz+tFo21h3hg4/GHizFPws+MMzpEru/+62Z0E8c=",
+ "lastModified": 1730874081,
+ "narHash": "sha256-VK7LkfdcpUi8tqcgMIYY2jejDh4O3MNw9An0FcKveRQ=",
"owner": "nixos",
"repo": "nixos-hardware",
- "rev": "cc2d3c0e060f981905d52337340ee6ec8b8eb037",
+ "rev": "12ad8c1bf13ff15ffa6afe82c59b4af0b9226035",
"type": "github"
},
"original": {
@@ -917,11 +917,11 @@
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
- "lastModified": 1729402248,
- "narHash": "sha256-G1QV7QNiGKKWHG9hlOgi9kvzwmALlH5AjtVpcRgk7Kg=",
+ "lastModified": 1730468442,
+ "narHash": "sha256-9OhrTUoVHDSsqWDsWsmMlrQGZI5zAeRbcP3rNqe7oT4=",
"owner": "ryan4yin",
"repo": "nixos-rk3588",
- "rev": "7976b137fe4bd4957c0f18603890797f26e6d334",
+ "rev": "981fc1b7e7ae3b939af5fe73518a2ca7b1392977",
"type": "github"
},
"original": {
@@ -937,11 +937,11 @@
"nixpkgs": "nixpkgs_9"
},
"locked": {
- "lastModified": 1729494942,
- "narHash": "sha256-c/WV0R0WWuK2UAjTCGntaa+y1UVPsTUJZXqwwKxcmYs=",
+ "lastModified": 1730453870,
+ "narHash": "sha256-d+kIgz4BvTXb7emjSFV3zjNydGmLUmuluQjdBb51R9o=",
"owner": "nix-community",
"repo": "NixOS-WSL",
- "rev": "f26ca94fdcfc1a3adfee70e4ed5e2d8b1bab4317",
+ "rev": "adb6bc4b661a43328752b4575be4968a4990c033",
"type": "github"
},
"original": {
@@ -953,11 +953,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1719082008,
- "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=",
+ "lastModified": 1730768919,
+ "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "9693852a2070b398ee123a329e68f0dab5526681",
+ "rev": "a04d33c0c3f1a59a2c1cb0c6e34cd24500e5a1dc",
"type": "github"
},
"original": {
@@ -984,11 +984,11 @@
},
"nixpkgs-darwin": {
"locked": {
- "lastModified": 1729324038,
- "narHash": "sha256-yp9XaqybgDGAGFZrQ+LTS4vOiksfLiE9vSomSJqNQio=",
+ "lastModified": 1730851983,
+ "narHash": "sha256-ooSCcuJ/vq0PmuoBzkodnZd+N2g9privwczPshW57Sc=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "b05f6e2067567e50bfda1e45e768d550cfeec25b",
+ "rev": "911e6111c71bc861769597f66aadcdc080c2db1e",
"type": "github"
},
"original": {
@@ -1000,35 +1000,35 @@
},
"nixpkgs-lib": {
"locked": {
- "lastModified": 1727825735,
- "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=",
+ "lastModified": 1730504152,
+ "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=",
"type": "tarball",
- "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
+ "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
},
"original": {
"type": "tarball",
- "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
+ "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
}
},
"nixpkgs-lib_2": {
"locked": {
- "lastModified": 1727825735,
- "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=",
+ "lastModified": 1730504152,
+ "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=",
"type": "tarball",
- "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
+ "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
},
"original": {
"type": "tarball",
- "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
+ "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
}
},
"nixpkgs-lib_3": {
"locked": {
- "lastModified": 1729386149,
- "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=",
+ "lastModified": 1730595754,
+ "narHash": "sha256-F6DyPKY2WAUf8fpaT9vQwwRUs74InQM36ng//h9wNhY=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
- "rev": "cce4521b6df014e79a7b7afc58c703ed683c916e",
+ "rev": "2376a861a1a15f05339245fbaa4422f2d1bdf485",
"type": "github"
},
"original": {
@@ -1039,11 +1039,11 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1720386169,
- "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=",
+ "lastModified": 1730741070,
+ "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "194846768975b7ad2c4988bdb82572c00222c0d7",
+ "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
"type": "github"
},
"original": {
@@ -1071,11 +1071,11 @@
},
"nixpkgs-stable_3": {
"locked": {
- "lastModified": 1729307008,
- "narHash": "sha256-QUvb6epgKi9pCu9CttRQW4y5NqJ+snKr1FZpG/x3Wtc=",
+ "lastModified": 1730741070,
+ "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "a9b86fc2290b69375c5542b622088eb6eca2a7c3",
+ "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
"type": "github"
},
"original": {
@@ -1095,11 +1095,11 @@
]
},
"locked": {
- "lastModified": 1729520362,
- "narHash": "sha256-zzdeTRJXEGUc6MEtaOWgBezwC5JUdGnDLxGPbWvgYcI=",
+ "lastModified": 1730865363,
+ "narHash": "sha256-dzH3lnYrfsReGeXGG2l998Sq0jiFtGSlwyUQzt+O+XE=",
"owner": "nix-community",
"repo": "nixpkgs-wayland",
- "rev": "f74cfe73a76d38ca3e8e9e12bb1c36331bac9859",
+ "rev": "720a6d9cfadb12febcccaeaeb88e1377894dd98e",
"type": "github"
},
"original": {
@@ -1110,11 +1110,11 @@
},
"nixpkgs_10": {
"locked": {
- "lastModified": 1729256560,
- "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
+ "lastModified": 1730785428,
+ "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
+ "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
"type": "github"
},
"original": {
@@ -1206,11 +1206,11 @@
},
"nixpkgs_5": {
"locked": {
- "lastModified": 1728897630,
- "narHash": "sha256-0utJPs4o2Mody8GDwo4hnGuxc8dJqju4u9lLJY4d/Lw=",
+ "lastModified": 1730642263,
+ "narHash": "sha256-UXqvGZOHUDeAo8Sv5A5oObiQgBPELVgHQi130TU0jMU=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "c9f0b4a395289ce18727e2a8e43cae6796693ccc",
+ "rev": "650fe87347086b30a6dbcc32b55987ce5a23c6ae",
"type": "github"
},
"original": {
@@ -1222,11 +1222,11 @@
},
"nixpkgs_6": {
"locked": {
- "lastModified": 1725432240,
- "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=",
+ "lastModified": 1729665710,
+ "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "ad416d066ca1222956472ab7d0555a6946746a80",
+ "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d",
"type": "github"
},
"original": {
@@ -1238,11 +1238,11 @@
},
"nixpkgs_7": {
"locked": {
- "lastModified": 1728538411,
- "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=",
+ "lastModified": 1730272153,
+ "narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221",
+ "rev": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53",
"type": "github"
},
"original": {
@@ -1254,27 +1254,27 @@
},
"nixpkgs_8": {
"locked": {
- "lastModified": 1728500571,
- "narHash": "sha256-dOymOQ3AfNI4Z337yEwHGohrVQb4yPODCW9MDUyAc4w=",
+ "lastModified": 1729256560,
+ "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "d51c28603def282a24fa034bcb007e2bcb5b5dd0",
+ "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-24.05",
+ "ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_9": {
"locked": {
- "lastModified": 1729181673,
- "narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=",
+ "lastModified": 1729973466,
+ "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3",
+ "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950",
"type": "github"
},
"original": {
@@ -1286,11 +1286,11 @@
},
"nur": {
"locked": {
- "lastModified": 1729536896,
- "narHash": "sha256-Wt5Nw5vNoXxzP7Qi0Y37CgJo8vTtwovj3tq2cGgUnQc=",
+ "lastModified": 1730874854,
+ "narHash": "sha256-UxK9i7Jtil75wN80m4wmA8EYU8Wu6VFon1XsWqkDxWc=",
"owner": "nix-community",
"repo": "NUR",
- "rev": "e7fee426abaf126e6bfb6c84f710f57f0e83491c",
+ "rev": "d92cc32aaa59284afc4e447440c48a4767499e60",
"type": "github"
},
"original": {
@@ -1302,11 +1302,11 @@
"polybar-themes": {
"flake": false,
"locked": {
- "lastModified": 1728572457,
- "narHash": "sha256-EXssvrzZ/vXf1APva0HYr9T5nqRgp7N+Dy0hiUmp0Uo=",
+ "lastModified": 1730818871,
+ "narHash": "sha256-/FypOYp2bmRpKokg2cOIOuf7cFfhgIGCcGVhZxOvhAA=",
"owner": "adi1090x",
"repo": "polybar-themes",
- "rev": "db5db496c8167202f3389cf3d872d23ed7d65e4b",
+ "rev": "7f79068e39992d35d6f6a7d5b8fced3405246ddf",
"type": "github"
},
"original": {
@@ -1362,11 +1362,11 @@
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
- "lastModified": 1728778939,
- "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=",
+ "lastModified": 1730302582,
+ "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
- "rev": "ff68f91754be6f3427e4986d7949e6273659be1d",
+ "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf",
"type": "github"
},
"original": {
@@ -1455,11 +1455,11 @@
]
},
"locked": {
- "lastModified": 1728959392,
- "narHash": "sha256-fp4he1QQjE+vasDMspZYeXrwTm9otwEqLwEN6FKZ5v0=",
+ "lastModified": 1730601085,
+ "narHash": "sha256-Sgax33jGuvVHTjl1P78IwzlhAGyOxtx5Q26inKja8S4=",
"owner": "oxalica",
"repo": "rust-overlay",
- "rev": "4c6e317300f05b8871f585b826b6f583e7dc4a9b",
+ "rev": "8d1b40f8dfd7539aaa3de56e207e22b3cc451825",
"type": "github"
},
"original": {
@@ -1471,11 +1471,11 @@
"spectrum": {
"flake": false,
"locked": {
- "lastModified": 1720264467,
- "narHash": "sha256-xzM92n3Q9L90faJIJrkrTtTx+JqCGRHMkHWztkV4PuY=",
+ "lastModified": 1729945407,
+ "narHash": "sha256-iGNMamNOAnVTETnIVqDWd6fl74J8fLEi1ejdZiNjEtY=",
"ref": "refs/heads/main",
- "rev": "fb59d42542049f586c84b0f8bb86ff3be338e9d3",
- "revCount": 674,
+ "rev": "f1d94ee7029af18637dbd5fdf4749621533693fa",
+ "revCount": 764,
"type": "git",
"url": "https://spectrum-os.org/git/spectrum"
},
@@ -1620,11 +1620,11 @@
},
"locked": {
"dir": "packaging/nix",
- "lastModified": 1728772489,
- "narHash": "sha256-6sHjXNhPrRXIV1au5jlSXHeqn/QHb9wyRt7V0F5p4PA=",
+ "lastModified": 1730559589,
+ "narHash": "sha256-o4NT2Kt7yEA63j38Ic5mrh2U/iQjs3YSNvIbCccIYP0=",
"ref": "refs/heads/main",
- "rev": "475e2b37e34a663b11f8c92b79dd45637a3e848c",
- "revCount": 770,
+ "rev": "70645c290dfc6ed10282bf4d2ae38c0bf7b1a3fb",
+ "revCount": 830,
"submodules": true,
"type": "git",
"url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix"
@@ -1644,11 +1644,11 @@
]
},
"locked": {
- "lastModified": 1729515514,
- "narHash": "sha256-rgLDuJImNQWVxCj2yR0bZ26f5be/tCT5wYZloMAgK3A=",
+ "lastModified": 1729839164,
+ "narHash": "sha256-kA+oY+B/0shEGVpEZxmMOOjJv8JB6ZifQn21V/tM5o8=",
"owner": "alexays",
"repo": "waybar",
- "rev": "dacecb9b265c1c7c36ee43d17526fa95f4e6596f",
+ "rev": "5f260516af9a3e5791c26c7fc18a85a47da5b23f",
"type": "github"
},
"original": {
diff --git a/hosts/base.nix b/hosts/base.nix
index 8d79398..96df7c4 100644
--- a/hosts/base.nix
+++ b/hosts/base.nix
@@ -8,7 +8,7 @@
dates = "weekly";
options = "--delete-older-than 7d";
};
- package = pkgs.nixFlakes;
+ # package = pkgs.nixFlakes;
extraOptions = ''
experimental-features = nix-command flakes
'';
diff --git a/hosts/cloud/bkk/nginx.nix b/hosts/cloud/bkk/nginx.nix
index ea6b785..3314674 100644
--- a/hosts/cloud/bkk/nginx.nix
+++ b/hosts/cloud/bkk/nginx.nix
@@ -25,6 +25,24 @@
proxy_cache off;
'';
};
+ virtualHosts."p.urbit.men" = {
+ enableACME = true;
+ forceSSL = true;
+ locations."/" = {
+ proxyPass = "http://127.0.0.1:8083";
+ # proxyWebsockets = true; # needed if you need to use WebSocket
+ extraConfig = ''
+ proxy_set_header Host $host;
+ proxy_set_header Forwarded $proxy_add_x_forwarded_for;
+ '';
+ };
+ extraConfig = ''
+ chunked_transfer_encoding off;
+ proxy_http_version 1.1;
+ proxy_buffering off;
+ proxy_cache off;
+ '';
+ };
virtualHosts."head.urbit.men" = {
enableACME = true;
forceSSL = true;
diff --git a/hosts/editors.nix b/hosts/editors.nix
index c9228c0..bd2acca 100644
--- a/hosts/editors.nix
+++ b/hosts/editors.nix
@@ -7,7 +7,7 @@
environment.variables.F = "hx";
environment.systemPackages = [
pkgs.neovim
- # inputs.helix.packages.${pkgs.system}.helix
- pkgs.helix
+ inputs.helix.packages.${pkgs.system}.helix
+ # pkgs.helix
];
}
diff --git a/hosts/local/s15/configuration.nix b/hosts/local/s15/configuration.nix
index 986dc62..ad0c57a 100644
--- a/hosts/local/s15/configuration.nix
+++ b/hosts/local/s15/configuration.nix
@@ -31,6 +31,7 @@ in {
];
environment.systemPackages = [
wrappers
+ pkgs.superhtml
];
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
diff --git a/hosts/local/s15/zellij.kdl b/hosts/local/s15/zellij.kdl
deleted file mode 100644
index 6640eb3..0000000
--- a/hosts/local/s15/zellij.kdl
+++ /dev/null
@@ -1,371 +0,0 @@
-// If you'd like to override the default keybindings completely, be sure to change "keybinds" to "keybinds clear-defaults=true"
-keybinds clear-defaults=true {
- // normal {
- // // uncomment this and adjust key if using copy_on_select=false
- // // bind "Alt c" { Copy; }
- // }
- normal clear-defaults=true {
- bind "F12" {SwitchToMode "locked";}
- bind "Ctrl r" {SwitchToMode "tmux"; }
- }
- locked {
- bind "F12" { SwitchToMode "Normal"; }
- }
- resize {
- bind "Ctrl n" { SwitchToMode "Normal"; }
- bind "h" "Left" { Resize "Increase Left"; }
- bind "j" "Down" { Resize "Increase Down"; }
- bind "k" "Up" { Resize "Increase Up"; }
- bind "l" "Right" { Resize "Increase Right"; }
- bind "H" { Resize "Decrease Left"; }
- bind "J" { Resize "Decrease Down"; }
- bind "K" { Resize "Decrease Up"; }
- bind "L" { Resize "Decrease Right"; }
- bind "=" "+" { Resize "Increase"; }
- bind "-" { Resize "Decrease"; }
- }
- pane {
- bind "Ctrl p" { SwitchToMode "Normal"; }
- bind "h" "Left" { MoveFocus "Left"; }
- bind "l" "Right" { MoveFocus "Right"; }
- bind "j" "Down" { MoveFocus "Down"; }
- bind "k" "Up" { MoveFocus "Up"; }
- bind "p" { SwitchFocus; }
- bind "n" { NewPane; SwitchToMode "Normal"; }
- bind "d" { NewPane "Down"; SwitchToMode "Normal"; }
- bind "r" { NewPane "Right"; SwitchToMode "Normal"; }
- bind "x" { CloseFocus; SwitchToMode "Normal"; }
- bind "f" { ToggleFocusFullscreen; SwitchToMode "Normal"; }
- bind "z" { TogglePaneFrames; SwitchToMode "Normal"; }
- bind "w" { ToggleFloatingPanes; SwitchToMode "Normal"; }
- bind "e" { TogglePaneEmbedOrFloating; SwitchToMode "Normal"; }
- bind "c" { SwitchToMode "RenamePane"; PaneNameInput 0;}
- }
- move {
- bind "Ctrl h" { SwitchToMode "Normal"; }
- bind "n" "Tab" { MovePane; }
- bind "p" { MovePaneBackwards; }
- bind "h" "Left" { MovePane "Left"; }
- bind "j" "Down" { MovePane "Down"; }
- bind "k" "Up" { MovePane "Up"; }
- bind "l" "Right" { MovePane "Right"; }
- }
- tab {
- bind "Ctrl t" { SwitchToMode "Normal"; }
- bind "r" { SwitchToMode "RenameTab"; TabNameInput 0; }
- bind "h" "Left" "Up" "k" { GoToPreviousTab; }
- bind "l" "Right" "Down" "j" { GoToNextTab; }
- bind "n" { NewTab; SwitchToMode "Normal"; }
- bind "x" { CloseTab; SwitchToMode "Normal"; }
- bind "s" { ToggleActiveSyncTab; SwitchToMode "Normal"; }
- bind "b" { BreakPane; SwitchToMode "Normal"; }
- bind "]" { BreakPaneRight; SwitchToMode "Normal"; }
- bind "[" { BreakPaneLeft; SwitchToMode "Normal"; }
- bind "1" { GoToTab 1; SwitchToMode "Normal"; }
- bind "2" { GoToTab 2; SwitchToMode "Normal"; }
- bind "3" { GoToTab 3; SwitchToMode "Normal"; }
- bind "4" { GoToTab 4; SwitchToMode "Normal"; }
- bind "5" { GoToTab 5; SwitchToMode "Normal"; }
- bind "6" { GoToTab 6; SwitchToMode "Normal"; }
- bind "7" { GoToTab 7; SwitchToMode "Normal"; }
- bind "8" { GoToTab 8; SwitchToMode "Normal"; }
- bind "9" { GoToTab 9; SwitchToMode "Normal"; }
- bind "Tab" { ToggleTab; }
- }
- scroll {
- bind "Ctrl s" { SwitchToMode "Normal"; }
- bind "e" { EditScrollback; SwitchToMode "Normal"; }
- bind "s" { SwitchToMode "EnterSearch"; SearchInput 0; }
- bind "Ctrl c" { ScrollToBottom; SwitchToMode "Normal"; }
- bind "j" "Down" { ScrollDown; }
- bind "k" "Up" { ScrollUp; }
- bind "Ctrl f" "PageDown" "Right" "l" { PageScrollDown; }
- bind "Ctrl b" "PageUp" "Left" "h" { PageScrollUp; }
- bind "d" { HalfPageScrollDown; }
- bind "u" { HalfPageScrollUp; }
- // uncomment this and adjust key if using copy_on_select=false
- // bind "Alt c" { Copy; }
- }
- search {
- bind "Ctrl s" { SwitchToMode "Normal"; }
- bind "Ctrl c" { ScrollToBottom; SwitchToMode "Normal"; }
- bind "j" "Down" { ScrollDown; }
- bind "k" "Up" { ScrollUp; }
- bind "Ctrl f" "PageDown" "Right" "l" { PageScrollDown; }
- bind "Ctrl b" "PageUp" "Left" "h" { PageScrollUp; }
- bind "d" { HalfPageScrollDown; }
- bind "u" { HalfPageScrollUp; }
- bind "n" { Search "down"; }
- bind "p" { Search "up"; }
- bind "c" { SearchToggleOption "CaseSensitivity"; }
- bind "w" { SearchToggleOption "Wrap"; }
- bind "o" { SearchToggleOption "WholeWord"; }
- }
- entersearch {
- bind "Ctrl c" "Esc" { SwitchToMode "Scroll"; }
- bind "Enter" { SwitchToMode "Search"; }
- }
- renametab {
- bind "Ctrl c" { SwitchToMode "Normal"; }
- bind "Esc" { UndoRenameTab; SwitchToMode "Tab"; }
- }
- renamepane {
- bind "Ctrl c" { SwitchToMode "Normal"; }
- bind "Esc" { UndoRenamePane; SwitchToMode "Pane"; }
- }
- session {
- bind "Ctrl o" { SwitchToMode "Normal"; }
- bind "Ctrl s" { SwitchToMode "Scroll"; }
- bind "d" { Detach; }
- bind "w" {
- LaunchOrFocusPlugin "session-manager" {
- floating true
- move_to_focused_tab true
- };
- SwitchToMode "Normal"
- }
- }
- tmux {
- bind "[" { SwitchToMode "Scroll"; }
- bind "Ctrl b" { Write 2; SwitchToMode "Normal"; }
- bind "\"" { NewPane "Down"; SwitchToMode "Normal"; }
- bind "%" { NewPane "Right"; SwitchToMode "Normal"; }
- bind "z" { ToggleFocusFullscreen; SwitchToMode "Normal"; }
- bind "c" { NewTab; SwitchToMode "Normal"; }
- bind "," { SwitchToMode "RenameTab"; }
- bind "p" { GoToPreviousTab; SwitchToMode "Normal"; }
- bind "n" { GoToNextTab; SwitchToMode "Normal"; }
- bind "Left" { MoveFocus "Left"; SwitchToMode "Normal"; }
- bind "Right" { MoveFocus "Right"; SwitchToMode "Normal"; }
- bind "Down" { MoveFocus "Down"; SwitchToMode "Normal"; }
- bind "Up" { MoveFocus "Up"; SwitchToMode "Normal"; }
- bind "h" { MoveFocus "Left"; SwitchToMode "Normal"; }
- bind "l" { MoveFocus "Right"; SwitchToMode "Normal"; }
- bind "j" { MoveFocus "Down"; SwitchToMode "Normal"; }
- bind "k" { MoveFocus "Up"; SwitchToMode "Normal"; }
- bind "o" { FocusNextPane; }
- bind "d" { Detach; }
- bind "Space" { NextSwapLayout; }
- bind "x" { CloseFocus; SwitchToMode "Normal"; }
- bind "e" {EditScrollback; SwitchToMode "Normal";}
- bind "p" {SwitchToMode "pane";}
- }
- shared_except "locked" {
- bind "Ctrl g" { SwitchToMode "Locked"; }
- bind "Ctrl q" { Quit; }
- bind "Alt n" { NewPane; }
- bind "Alt i" { MoveTab "Left"; }
- bind "Alt o" { MoveTab "Right"; }
- bind "Alt h" "Alt Left" { MoveFocusOrTab "Left"; }
- bind "Alt l" "Alt Right" { MoveFocusOrTab "Right"; }
- bind "Alt j" "Alt Down" { MoveFocus "Down"; }
- bind "Alt k" "Alt Up" { MoveFocus "Up"; }
- bind "Alt =" "Alt +" { Resize "Increase"; }
- bind "Alt -" { Resize "Decrease"; }
- bind "Alt [" { PreviousSwapLayout; }
- bind "Alt ]" { NextSwapLayout; }
- }
- shared_except "normal" "locked" {
- bind "Enter" "Esc" { SwitchToMode "Normal"; }
- }
- shared_except "pane" "locked" {
- bind "Ctrl p" { SwitchToMode "Pane"; }
- }
- shared_except "resize" "locked" {
- bind "Ctrl n" { SwitchToMode "Resize"; }
- }
- shared_except "scroll" "locked" {
- bind "Ctrl s" { SwitchToMode "Scroll"; }
- }
- shared_except "session" "locked" {
- bind "Ctrl o" { SwitchToMode "Session"; }
- }
- shared_except "tab" "locked" {
- bind "Ctrl t" { SwitchToMode "Tab"; }
- }
- shared_except "move" "locked" {
- bind "Ctrl h" { SwitchToMode "Move"; }
- }
- shared_except "tmux" "locked" {
- bind "Ctrl b" { SwitchToMode "Tmux"; }
- }
-}
-
-plugins {
- tab-bar location="zellij:tab-bar"
- status-bar location="zellij:status-bar"
- strider location="zellij:strider"
- compact-bar location="zellij:compact-bar"
- session-manager location="zellij:session-manager"
- welcome-screen location="zellij:session-manager" {
- welcome_screen true
- }
- filepicker location="zellij:strider" {
- cwd "/"
- }
-}
-
-// Choose what to do when zellij receives SIGTERM, SIGINT, SIGQUIT or SIGHUP
-// eg. when terminal window with an active zellij session is closed
-// Options:
-// - detach (Default)
-// - quit
-//
-// on_force_close "quit"
-
-// Send a request for a simplified ui (without arrow fonts) to plugins
-// Options:
-// - true
-// - false (Default)
-//
-simplified_ui true
-
-// Choose the path to the default shell that zellij will use for opening new panes
-// Default: $SHELL
-//
-// default_shell "fish"
-
-// Choose the path to override cwd that zellij will use for opening new panes
-//
-// default_cwd ""
-
-// Toggle between having pane frames around the panes
-// Options:
-// - true (default)
-// - false
-//
-pane_frames false
-
-// Toggle between having Zellij lay out panes according to a predefined set of layouts whenever possible
-// Options:
-// - true (default)
-// - false
-//
-// auto_layout true
-
-// Whether sessions should be serialized to the cache folder (including their tabs/panes, cwds and running commands) so that they can later be resurrected
-// Options:
-// - true (default)
-// - false
-//
-// session_serialization false
-
-// Whether pane viewports are serialized along with the session, default is false
-// Options:
-// - true
-// - false (default)
-// serialize_pane_viewport true
-
-// Scrollback lines to serialize along with the pane viewport when serializing sessions, 0
-// defaults to the scrollback size. If this number is higher than the scrollback size, it will
-// also default to the scrollback size. This does nothing if `serialize_pane_viewport` is not true.
-//
-// scrollback_lines_to_serialize 10000
-
-// Define color themes for Zellij
-// For more examples, see: https://github.com/zellij-org/zellij/tree/main/example/themes
-// Once these themes are defined, one of them should to be selected in the "theme" section of this file
-//
-// themes {
-// dracula {
-// fg 248 248 242
-// bg 40 42 54
-// red 255 85 85
-// green 80 250 123
-// yellow 241 250 140
-// blue 98 114 164
-// magenta 255 121 198
-// orange 255 184 108
-// cyan 139 233 253
-// black 0 0 0
-// white 255 255 255
-// }
-// }
-
-// Choose the theme that is specified in the themes section.
-// Default: default
-//
-// theme "default"
-
-// The name of the default layout to load on startup
-// Default: "default"
-//
-default_layout "compact"
-
-// Choose the mode that zellij uses when starting up.
-// Default: normal
-//
-// default_mode "locked"
-
-// Toggle enabling the mouse mode.
-// On certain configurations, or terminals this could
-// potentially interfere with copying text.
-// Options:
-// - true (default)
-// - false
-//
-// mouse_mode false
-
-// Configure the scroll back buffer size
-// This is the number of lines zellij stores for each pane in the scroll back
-// buffer. Excess number of lines are discarded in a FIFO fashion.
-// Valid values: positive integers
-// Default value: 10000
-//
-// scroll_buffer_size 10000
-
-// Provide a command to execute when copying text. The text will be piped to
-// the stdin of the program to perform the copy. This can be used with
-// terminal emulators which do not support the OSC 52 ANSI control sequence
-// that will be used by default if this option is not set.
-// Examples:
-//
-// copy_command "xclip -selection clipboard" // x11
-// copy_command "wl-copy" // wayland
-// copy_command "pbcopy" // osx
-
-// Choose the destination for copied text
-// Allows using the primary selection buffer (on x11/wayland) instead of the system clipboard.
-// Does not apply when using copy_command.
-// Options:
-// - system (default)
-// - primary
-//
-// copy_clipboard "primary"
-
-// Enable or disable automatic copy (and clear) of selection when releasing mouse
-// Default: true
-//
-// copy_on_select false
-
-// Path to the default editor to use to edit pane scrollbuffer
-// Default: $EDITOR or $VISUAL
-//
-// scrollback_editor "/usr/bin/vim"
-
-// When attaching to an existing session with other users,
-// should the session be mirrored (true)
-// or should each user have their own cursor (false)
-// Default: false
-//
-// mirror_session true
-
-// The folder in which Zellij will look for layouts
-//
-// layout_dir "/path/to/my/layout_dir"
-
-// The folder in which Zellij will look for themes
-//
-// theme_dir "/path/to/my/theme_dir"
-
-// Enable or disable the rendering of styled and colored underlines (undercurl).
-// May need to be disabled for certain unsupported terminals
-// Default: true
-//
-// styled_underlines false
-
-// Enable or disable writing of session metadata to disk (if disabled, other sessions might not know
-// metadata info on this session)
-// Default: false
-//
-// disable_session_metadata true