From 55ce4239241895a736b77bc4d582a044bd87cf03 Mon Sep 17 00:00:00 2001 From: cnst Date: Sat, 22 Mar 2025 06:03:07 +0100 Subject: [PATCH] adding first steps to cnixlab and some small fixes --- flake.lock | 293 +++++++++--------- hosts/{cnix => cnixlab}/default.nix | 0 .../hardware-configuration.nix | 0 hosts/{cnix => cnixlab}/modules.nix | 0 hosts/cnixtop/default.nix | 51 +++ hosts/cnixtop/hardware-configuration.nix | 71 +++++ hosts/cnixtop/modules.nix | 224 +++++++++++++ hosts/default.nix | 54 ++-- modules/home/programs/firefox/default.nix | 6 +- modules/home/programs/fuzzel/default.nix | 2 +- modules/home/programs/ghostty/default.nix | 2 +- modules/home/services/hypridle/default.nix | 1 - modules/home/services/hyprpaper/default.nix | 3 +- modules/home/services/xdg/default.nix | 2 +- modules/nixos/programs/hyprland/inputs.nix | 2 +- modules/nixos/programs/hyprland/keybinds.nix | 2 +- modules/nixos/programs/hyprland/rules.nix | 2 +- modules/nixos/programs/hyprland/startup.nix | 2 +- modules/nixos/services/agenix/default.nix | 4 +- users/cnstlab/default.nix | 49 +++ users/cnstlab/git.nix | 62 ++++ users/cnstlab/modules/default.nix | 6 + users/cnstlab/modules/home.nix | 160 ++++++++++ users/cnstlab/modules/options.nix | 43 +++ users/default.nix | 7 +- 25 files changed, 868 insertions(+), 180 deletions(-) rename hosts/{cnix => cnixlab}/default.nix (100%) rename hosts/{cnix => cnixlab}/hardware-configuration.nix (100%) rename hosts/{cnix => cnixlab}/modules.nix (100%) create mode 100644 hosts/cnixtop/default.nix create mode 100644 hosts/cnixtop/hardware-configuration.nix create mode 100644 hosts/cnixtop/modules.nix create mode 100644 users/cnstlab/default.nix create mode 100644 users/cnstlab/git.nix create mode 100644 users/cnstlab/modules/default.nix create mode 100644 users/cnstlab/modules/home.nix create mode 100644 users/cnstlab/modules/options.nix diff --git a/flake.lock b/flake.lock index 59eea37e..65e73738 100644 --- a/flake.lock +++ b/flake.lock @@ -80,11 +80,11 @@ ] }, "locked": { - "lastModified": 1741282631, - "narHash": "sha256-jZE1CmQ53uN1Gq4FjaLFzSSjDqzL0pG4mdRbjBqSmho=", + "lastModified": 1742213273, + "narHash": "sha256-0l0vDb4anfsBu1rOs94bC73Hub+xEivgBAo6QXl2MmU=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "81498562d0f53e613d30368bb5b076784fa86f80", + "rev": "484b732195cc53f4536ce4bd59a5c6402b1e7ccf", "type": "github" }, "original": { @@ -123,11 +123,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1741386040, - "narHash": "sha256-Ru0yl1HwurhHtEiD1fqqrNgDXcy26t0uF5fqLV7CH+k=", + "lastModified": 1742572951, + "narHash": "sha256-agPhzkYO6G0qaXXQhkg/yuUkl+z8NVlzFoO9y0FiFxU=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "6150aecfc2fabaee54086a3124997c7df970ea00", + "rev": "7603a3d49776bff0c68e68b2c6b0d31259c6c3d7", "type": "github" }, "original": { @@ -183,11 +183,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1741156584, - "narHash": "sha256-Xju6PhR09gR8cSS1s4FOHw4AhUUmrFDUs9Wj/9KFoGY=", + "lastModified": 1742452566, + "narHash": "sha256-sVuLDQ2UIWfXUBbctzrZrXM2X05YjX08K7XHMztt36E=", "owner": "nix-community", "repo": "fenix", - "rev": "1271797d7c0537b4e5bdd4061a2954b846f2c29c", + "rev": "7d9ba794daf5e8cc7ee728859bc688d8e26d5f06", "type": "github" }, "original": { @@ -204,11 +204,11 @@ "rust-analyzer-src": "rust-analyzer-src_2" }, "locked": { - "lastModified": 1741415406, - "narHash": "sha256-FUhq3GLsUw/5Go3zsrvXWrU1QJ/0Y4YHuw+sUpBfUh0=", + "lastModified": 1742452566, + "narHash": "sha256-sVuLDQ2UIWfXUBbctzrZrXM2X05YjX08K7XHMztt36E=", "owner": "nix-community", "repo": "fenix", - "rev": "37e933dde18c77a219e0d6d48e16f2e2a22d3976", + "rev": "7d9ba794daf5e8cc7ee728859bc688d8e26d5f06", "type": "github" }, "original": { @@ -332,11 +332,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1738453229, - "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "type": "github" }, "original": { @@ -476,14 +476,14 @@ "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", "zig": "zig", - "zig2nix": "zig2nix" + "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1741387872, - "narHash": "sha256-GUnDSZbTQZFFl2b92JV86VRAIGUcxchwAw4mojiYFdQ=", + "lastModified": 1742589311, + "narHash": "sha256-YCAEmOPDSHVKygFov2zOg3Fkb060SRgjiGi4P7y9+kc=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "e03e98e106e96d9ceff5a9781b147376eaed0491", + "rev": "747c43ffa0047aa2ef550aa361ba63f4060a85ba", "type": "github" }, "original": { @@ -538,11 +538,11 @@ }, "hardware": { "locked": { - "lastModified": 1741325094, - "narHash": "sha256-RUAdT8dZ6k/486vnu3tiNRrNW6+Q8uSD2Mq7gTX4jlo=", + "lastModified": 1742376361, + "narHash": "sha256-VFMgJkp/COvkt5dnkZB4D2szVdmF6DGm5ZdVvTUy61c=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "b48cc4dab0f9711af296fc367b6108cf7b8ccb16", + "rev": "daaae13dff0ecc692509a1332ff9003d9952d7a9", "type": "github" }, "original": { @@ -575,11 +575,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1741370148, - "narHash": "sha256-nzGqv+4teMbOjhylRCfGsqH7XFLt5m+uwJHgGA0YpUQ=", + "lastModified": 1742566224, + "narHash": "sha256-8uZamLPJdJV+JodhLwLtEpHkB44eBXv0h3/gpoRCPKg=", "owner": "helix-editor", "repo": "helix", - "rev": "dc4761ad3a09a1cc9a3219d75765ff098fb203af", + "rev": "1c9a5bd366720bcec96b5f98747112355df0bdea", "type": "github" }, "original": { @@ -595,11 +595,11 @@ ] }, "locked": { - "lastModified": 1741416850, - "narHash": "sha256-iqRxCsRxE/Q/3W1RHxQMthPKEda0hhY65uxEpE5TNk4=", + "lastModified": 1742588233, + "narHash": "sha256-Fi5g8H5FXMSRqy+mU6gPG0v+C9pzjYbkkiePtz8+PpA=", "owner": "nix-community", "repo": "home-manager", - "rev": "26f6b862645ff281f3bada5d406e8c20de8d837c", + "rev": "296ddc64627f4a6a4eb447852d7346b9dd16197d", "type": "github" }, "original": { @@ -637,11 +637,11 @@ ] }, "locked": { - "lastModified": 1741217763, - "narHash": "sha256-g/TrltIjFHIjtzKY5CJpoPANfHQWDD43G5U1a/v5oVg=", + "lastModified": 1742569620, + "narHash": "sha256-igC2cu+cPRB3E4QwKR+vGagyAtoyB+DrmWwDKm8jkaw=", "owner": "nix-community", "repo": "home-manager", - "rev": "486b066025dccd8af7fbe5dd2cc79e46b88c80da", + "rev": "8a68f18e96bcab13e4f97bece61e6602298a3141", "type": "github" }, "original": { @@ -666,11 +666,11 @@ ] }, "locked": { - "lastModified": 1738664950, - "narHash": "sha256-xIeGNM+iivwVHkv9tHwOqoUP5dDrtees34bbFKKMZYs=", + "lastModified": 1742215578, + "narHash": "sha256-zfs71PXVVPEe56WEyNi2TJQPs0wabU4WAlq0XV7GcdE=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "7c6d165e1eb9045a996551eb9f121b6d1b30adc3", + "rev": "2fd36421c21aa87e2fe3bee11067540ae612f719", "type": "github" }, "original": { @@ -759,11 +759,11 @@ ] }, "locked": { - "lastModified": 1740698205, - "narHash": "sha256-9/X4+kKFcrldylDSC4hkyewG3UqVg1EFRYJkZazYXO0=", + "lastModified": 1742397293, + "narHash": "sha256-WVREToubLhIlogCoNJzo+HdatLKkEushwStDU1uyRnc=", "owner": "hyprwm", "repo": "hypridle", - "rev": "9d97c2288316f7ed474c0d8cd248516d8fb72037", + "rev": "71e875e49e583c7b8b1364b55dfe494375c4e3ea", "type": "github" }, "original": { @@ -788,11 +788,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1741396322, - "narHash": "sha256-nD6EvpTNQ97C0Uk60JcyNUM4u4OFxIiwHPSExay+Y3E=", + "lastModified": 1742584793, + "narHash": "sha256-Zhau0ocCNRDg/+MTIutjPkN1+pYjYzgyW3P7eqL/LkQ=", "owner": "hyprwm", "repo": "hyprland", - "rev": "b80b64cd6c913f8c8ac820a1e4ca615a62ff958f", + "rev": "ccbdba7ee2ccb835306de89a6023134fa6b8006f", "type": "github" }, "original": { @@ -809,11 +809,11 @@ ] }, "locked": { - "lastModified": 1741279209, - "narHash": "sha256-inSG4OUSdCHXSJZhLNcCUA1s0Ebomr5+v4x3FE/XQ3M=", + "lastModified": 1742213523, + "narHash": "sha256-I8JVdQRu8eWvY5W8XWYZkdd5pojDHkxeqQV7mMIsbhs=", "owner": "hyprwm", "repo": "contrib", - "rev": "0e40ccfc2d6772f9b7d5e1b50c56fb5e468a18fb", + "rev": "bd81329944be53b0ffb99e05864804b95f1d7c65", "type": "github" }, "original": { @@ -991,11 +991,11 @@ ] }, "locked": { - "lastModified": 1741427341, - "narHash": "sha256-B5bnCDUMQMCNaoEg6W385zEmCh0OwhM7LAjH59/WhaM=", + "lastModified": 1742460722, + "narHash": "sha256-u23NzXN2yez0nO2zEtEaChE/4jhtC8WvpM8OpwUsls8=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "a13b6f0d1a4eadc66a259a061680a813c5107a87", + "rev": "f883e669d147ac189b64ce403300a5a3e4de2c66", "type": "github" }, "original": { @@ -1029,11 +1029,11 @@ ] }, "locked": { - "lastModified": 1740765362, - "narHash": "sha256-QmF+wyFzudTB3Dq2i9acY/nhc8uRiD+p7iG+V1Q5neE=", + "lastModified": 1742482360, + "narHash": "sha256-B1CsQ7DameEzwdl3mQN0D6E3LA8eJ2XPj4BWufoKjP8=", "owner": "hyprwm", "repo": "hyprpaper", - "rev": "6f4ba431638e44478417b9f524fb1771e5eda83c", + "rev": "05337a4595aa03eedec33f48004e46092917a5ca", "type": "github" }, "original": { @@ -1054,11 +1054,11 @@ ] }, "locked": { - "lastModified": 1741123584, - "narHash": "sha256-mprerMlucqtirmbx6L3VoFnF2bGYc2WSUCj7tuc6xTQ=", + "lastModified": 1741534688, + "narHash": "sha256-EV3945SnjOCuRVbGRghsWx/9D89FyshnSO1Q6/TuQ14=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "6b0154b183f9539097f13af9b5da78ca24da6df2", + "rev": "dd1f720cbc2dbb3c71167c9598045dd3261d27b3", "type": "github" }, "original": { @@ -1176,11 +1176,11 @@ ] }, "locked": { - "lastModified": 1741338475, - "narHash": "sha256-+vAXiFRQ6ykBX7iFI20rV+xMyOVNtULbFWy6BHKPP+0=", + "lastModified": 1742465245, + "narHash": "sha256-gpjtkoeq5Ye9J8GoR+rWg3NL4bbEtcLvvF4nN6MtxdU=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "1821e6ae980ff6175d28065ad6d0c87560d2b8ea", + "rev": "a95606cae5c9e1f5b84debe7865ef171d4deb287", "type": "github" }, "original": { @@ -1199,11 +1199,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1741382166, - "narHash": "sha256-FaOgKL/TLJTnYrA2Twb1Y7nOPCDoytLZBnKwMexSP8E=", + "lastModified": 1741442524, + "narHash": "sha256-tVcxLDLLho8dWcO81Xj/3/ANLdVs0bGyCPyKjp70JWk=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "21fc8d7035cb99e1c4b2988f3bf3fff6236bc086", + "rev": "d8099586d9a84308ffedac07880e7f07a0180ff4", "type": "github" }, "original": { @@ -1249,11 +1249,11 @@ }, "mnw": { "locked": { - "lastModified": 1738852285, - "narHash": "sha256-8Y1uyE6gGHxdU0Vcx2CMg/dAmDSxJw19aAl3TKbbo54=", + "lastModified": 1742255973, + "narHash": "sha256-XfEGVKatTgEMMOVb4SNp1LYLQOSzzrFTDMVDTZFyMVE=", "owner": "Gerg-L", "repo": "mnw", - "rev": "6ae73dc9cb72cea17bcc2e3d4670825f483e80e8", + "rev": "b982dbd5e6d55d4438832b3567c09bc2a129649d", "type": "github" }, "original": { @@ -1275,11 +1275,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1732053863, - "narHash": "sha256-DCIVdlb81Fct2uwzbtnawLBC/U03U2hqx8trqTJB7WA=", + "lastModified": 1741118843, + "narHash": "sha256-ggXU3RHv6NgWw+vc+HO4/9n0GPufhTIUjVuLci8Za8c=", "owner": "oxalica", "repo": "nil", - "rev": "2e24c9834e3bb5aa2a3701d3713b43a6fb106362", + "rev": "577d160da311cc7f5042038456a0713e9863d09e", "type": "github" }, "original": { @@ -1298,11 +1298,11 @@ ] }, "locked": { - "lastModified": 1741311896, - "narHash": "sha256-M/ppn20it9Ru2hoYoWIYzEWyTfBVxQiAQ7SvRws+luY=", + "lastModified": 1742607855, + "narHash": "sha256-lUF/tpSON29qNIqhECX/Ue4qVmI3FOvMaW4iUnK49C4=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "0e78e723bdf5a13dc45f3a6b994715b871c3f650", + "rev": "9818734e2117dac703767585d48b805fad3e7a5e", "type": "github" }, "original": { @@ -1352,23 +1352,26 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1738452942, - "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" + "lastModified": 1740877520, + "narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "147dee35aab2193b174e4c0868bd80ead5ce755c", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1738255539, - "narHash": "sha256-hP2eOqhIO/OILW+3moNWO4GtdJFYCqAe9yJZgvlCoDQ=", + "lastModified": 1741992157, + "narHash": "sha256-nlIfTsTrMSksEJc1f7YexXiPVuzD1gOfeN1ggwZyUoc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c3511a3b53b482aa7547c9d1626fd7310c1de1c5", + "rev": "da4b122f63095ca1199bd4d526f9e26426697689", "type": "github" }, "original": { @@ -1380,11 +1383,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1738136902, - "narHash": "sha256-pUvLijVGARw4u793APze3j6mU1Zwdtz7hGkGGkD87qw=", + "lastModified": 1741865919, + "narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9a5db3142ce450045840cc8d832b13b8a2018e0c", + "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a", "type": "github" }, "original": { @@ -1396,11 +1399,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1740303746, - "narHash": "sha256-XcdiWLEhjJkMxDLKQJ0CCivmYYCvA5MDxu9pMybM5kM=", + "lastModified": 1741865919, + "narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2d068ae5c6516b2d04562de50a58c682540de9bf", + "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a", "type": "github" }, "original": { @@ -1444,11 +1447,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1741246872, - "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=", + "lastModified": 1742422364, + "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "10069ef4cf863633f57238f179a0297de84bd8d3", + "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", "type": "github" }, "original": { @@ -1476,11 +1479,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1741246872, - "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=", + "lastModified": 1742069588, + "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "10069ef4cf863633f57238f179a0297de84bd8d3", + "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", "type": "github" }, "original": { @@ -1523,11 +1526,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1741246872, - "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=", + "lastModified": 1742422364, + "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "10069ef4cf863633f57238f179a0297de84bd8d3", + "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", "type": "github" }, "original": { @@ -1564,11 +1567,11 @@ "systems": "systems_7" }, "locked": { - "lastModified": 1741377568, - "narHash": "sha256-Q7g3yb5HATghOo4ilQgXEs2IZifTj4y0INHQUf7nnXo=", + "lastModified": 1742471089, + "narHash": "sha256-wiGkhJcDdg2/wy4QxaudNsU98y7CzzZpB6pnjUrNNDQ=", "owner": "notashelf", "repo": "nvf", - "rev": "c3b9c979eec7db96a6d4a7f4e84e7492928610cd", + "rev": "3a28d05684f7f4e314eb4e56a5af624b648ab278", "type": "github" }, "original": { @@ -1587,11 +1590,11 @@ ] }, "locked": { - "lastModified": 1741379162, - "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", + "lastModified": 1742058297, + "narHash": "sha256-b4SZc6TkKw8WQQssbN5O2DaCEzmFfvSTPYHlx/SFW9Y=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", + "rev": "59f17850021620cd348ad2e9c0c64f4e6325ce2a", "type": "github" }, "original": { @@ -1657,11 +1660,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1741011961, - "narHash": "sha256-bssSxw3Z9CUNB9+f3EHAX/2urT15e12Jy6YU8tHyWkk=", + "lastModified": 1742296961, + "narHash": "sha256-gCpvEQOrugHWLimD1wTFOJHagnSEP6VYBDspq96Idu0=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "02862f5d52c30b476a5dca909a17aa4386d1fdc5", + "rev": "15d87419f1a123d8f888d608129c3ce3ff8f13d4", "type": "github" }, "original": { @@ -1674,11 +1677,11 @@ "rust-analyzer-src_2": { "flake": false, "locked": { - "lastModified": 1741331214, - "narHash": "sha256-aihwm+NBN7CX162yFh8e4hekqVWs7GYmmYwhdkHUg4k=", + "lastModified": 1742296961, + "narHash": "sha256-gCpvEQOrugHWLimD1wTFOJHagnSEP6VYBDspq96Idu0=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "62dea277cc13031e01483a9400a3d20c888f586d", + "rev": "15d87419f1a123d8f888d608129c3ce3ff8f13d4", "type": "github" }, "original": { @@ -1739,11 +1742,11 @@ ] }, "locked": { - "lastModified": 1731983527, - "narHash": "sha256-JECaBgC0pQ91Hq3W4unH6K9to8s2Zl2sPNu7bLOv4ek=", + "lastModified": 1741055476, + "narHash": "sha256-52vwEV0oS2lCnx3c/alOFGglujZTLmObit7K8VblnS8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "71287228d96e9568e1e70c6bbfa3f992d145947b", + "rev": "aefb7017d710f150970299685e8d8b549d653649", "type": "github" }, "original": { @@ -1959,11 +1962,11 @@ }, "locked": { "dir": "nix", - "lastModified": 1741378123, - "narHash": "sha256-mz+OvVKJM7gwrSfv/DkYwH2eSB1Wsb/6UYXaJq3/I0U=", + "lastModified": 1742480467, + "narHash": "sha256-y4iRZ3bUpN8prKIbVQw++4yM4LtXLED7/D/9HJjGjJI=", "owner": "wez", "repo": "wezterm", - "rev": "622e404be29f861589067d109bd16b643acee2c8", + "rev": "a87358516004a652ad840bc1661bdf65ffc89b43", "type": "github" }, "original": { @@ -2002,11 +2005,11 @@ ] }, "locked": { - "lastModified": 1737634991, - "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=", + "lastModified": 1741934139, + "narHash": "sha256-ZhTcTH9FoeAtbPfWGrhkH7RjLJZ7GeF18nygLAMR+WE=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a", + "rev": "150b0b6f52bb422a1b232a53698606fe0320dde0", "type": "github" }, "original": { @@ -2022,11 +2025,11 @@ ] }, "locked": { - "lastModified": 1740560716, - "narHash": "sha256-/8r6Q1eHM2WIIQfzFmdi4m77EYEFtHHWwUK+1GaG7P0=", + "lastModified": 1742602442, + "narHash": "sha256-jwOKx/hQZONnlRvCRmV0KUj/98S8okScWRgWNGsV3yQ=", "ref": "refs/heads/main", - "rev": "f4259577d16bfc506d746198223ccba1047b6c6f", - "revCount": 77, + "rev": "1d0b9424a10f78d2bcf056f36ad21cd11a01ed3e", + "revCount": 81, "type": "git", "url": "https://git.sr.ht/~canasta/zen-browser-flake" }, @@ -2050,11 +2053,11 @@ ] }, "locked": { - "lastModified": 1738239110, - "narHash": "sha256-Y5i9mQ++dyIQr+zEPNy+KIbc5wjPmfllBrag3cHZgcE=", + "lastModified": 1741825901, + "narHash": "sha256-aeopo+aXg5I2IksOPFN79usw7AeimH1+tjfuMzJHFdk=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "1a8fb6f3a04724519436355564b95fce5e272504", + "rev": "0b14285e283f5a747f372fb2931835dd937c4383", "type": "github" }, "original": { @@ -2063,32 +2066,6 @@ "type": "github" } }, - "zig2nix": { - "inputs": { - "flake-utils": [ - "ghostty", - "flake-utils" - ], - "nixpkgs": [ - "ghostty", - "nixpkgs-stable" - ] - }, - "locked": { - "lastModified": 1741368279, - "narHash": "sha256-WTaC8HmnIq6O71iK0g9as404BbmS+YyEP5qS85m2JBY=", - "owner": "jcollie", - "repo": "zig2nix", - "rev": "672971b5b6911de21446ad4fc76dee677922eda0", - "type": "github" - }, - "original": { - "owner": "jcollie", - "repo": "zig2nix", - "rev": "672971b5b6911de21446ad4fc76dee677922eda0", - "type": "github" - } - }, "zlib": { "flake": false, "locked": { @@ -2105,6 +2082,32 @@ "repo": "zlib", "type": "github" } + }, + "zon2nix": { + "inputs": { + "flake-utils": [ + "ghostty", + "flake-utils" + ], + "nixpkgs": [ + "ghostty", + "nixpkgs-unstable" + ] + }, + "locked": { + "lastModified": 1742104771, + "narHash": "sha256-LhidlyEA9MP8jGe1rEnyjGFCzLLgCdDpYeWggibayr0=", + "owner": "jcollie", + "repo": "zon2nix", + "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613", + "type": "github" + }, + "original": { + "owner": "jcollie", + "repo": "zon2nix", + "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613", + "type": "github" + } } }, "root": "root", diff --git a/hosts/cnix/default.nix b/hosts/cnixlab/default.nix similarity index 100% rename from hosts/cnix/default.nix rename to hosts/cnixlab/default.nix diff --git a/hosts/cnix/hardware-configuration.nix b/hosts/cnixlab/hardware-configuration.nix similarity index 100% rename from hosts/cnix/hardware-configuration.nix rename to hosts/cnixlab/hardware-configuration.nix diff --git a/hosts/cnix/modules.nix b/hosts/cnixlab/modules.nix similarity index 100% rename from hosts/cnix/modules.nix rename to hosts/cnixlab/modules.nix diff --git a/hosts/cnixtop/default.nix b/hosts/cnixtop/default.nix new file mode 100644 index 00000000..ac7b1859 --- /dev/null +++ b/hosts/cnixtop/default.nix @@ -0,0 +1,51 @@ +{ + lib, + config, + pkgs, + ... +}: let + ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups; +in { + users.users.cnst = { + isNormalUser = true; + shell = pkgs.fish; + extraGroups = ifTheyExist [ + "wheel" + "networkmanager" + "audio" + "video" + "git" + "mysql" + "docker" + "libvirtd" + "qemu-libvirtd" + "kvm" + "network" + "gamemode" + "adbusers" + "rtkit" + "users" + "plocate" + "fuse" + ]; + }; + + imports = [ + ./hardware-configuration.nix + ./modules.nix + ]; + + networking.hostName = "cnixtop"; + + environment.variables.FLAKE = "/home/cnst/.nix-config"; + + programs.hyprland.settings = { + monitor = [ + "DP-3,2560x1440@240,0x0,1,transform,0,bitdepth,10" + "DP-4,1920x1080@60,auto,1,transform,3" + ]; + }; + + # # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion + system.stateVersion = lib.mkDefault "23.11"; +} diff --git a/hosts/cnixtop/hardware-configuration.nix b/hosts/cnixtop/hardware-configuration.nix new file mode 100644 index 00000000..70b9af80 --- /dev/null +++ b/hosts/cnixtop/hardware-configuration.nix @@ -0,0 +1,71 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-amd"]; + boot.extraModulePackages = []; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/90eafb57-0f89-4c2a-b417-4e0f2fba5f47"; + fsType = "btrfs"; + options = ["subvol=root"]; + }; + + boot.initrd.luks.devices."enc".device = "/dev/disk/by-uuid/36144799-13f2-4166-9bfe-b29c3df435ab"; + + fileSystems."/home" = { + device = "/dev/disk/by-uuid/90eafb57-0f89-4c2a-b417-4e0f2fba5f47"; + fsType = "btrfs"; + options = ["subvol=home"]; + }; + + fileSystems."/nix" = { + device = "/dev/disk/by-uuid/90eafb57-0f89-4c2a-b417-4e0f2fba5f47"; + fsType = "btrfs"; + options = ["subvol=nix"]; + }; + + fileSystems."/persist" = { + device = "/dev/disk/by-uuid/90eafb57-0f89-4c2a-b417-4e0f2fba5f47"; + fsType = "btrfs"; + options = ["subvol=persist"]; + }; + + fileSystems."/var/log" = { + device = "/dev/disk/by-uuid/90eafb57-0f89-4c2a-b417-4e0f2fba5f47"; + fsType = "btrfs"; + options = ["subvol=log"]; + neededForBoot = true; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/1D4A-3121"; + fsType = "vfat"; + options = ["fmask=0022" "dmask=0022"]; + }; + + swapDevices = [{device = "/dev/disk/by-uuid/91e16a5f-6a1c-4c7d-aa61-5823068fdaf0";}]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.eno1.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp11s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/hosts/cnixtop/modules.nix b/hosts/cnixtop/modules.nix new file mode 100644 index 00000000..1e8f4e4d --- /dev/null +++ b/hosts/cnixtop/modules.nix @@ -0,0 +1,224 @@ +{ + nixos = { + boot = { + kernel = { + extraBlacklistedModules = []; + extraKernelParams = []; + hardware = "amd"; + variant = "latest"; + }; + loader = { + default = { + enable = false; + }; + lanzaboote = { + enable = true; + }; + }; + }; + hardware = { + bluetooth = { + enable = true; + }; + graphics = { + amd = { + enable = true; + packageSet = "standard"; + }; + nvidia = { + enable = false; + }; + }; + logitech = { + enable = true; + }; + network = { + enable = true; + interfaces = { + "eno1" = { + allowedTCPPorts = [22 80 443]; + }; + }; + }; + }; + programs = { + android = { + enable = true; + }; + anyrun = { + enable = false; + }; + beekeeper = { + enable = false; + }; + blender = { + enable = false; + hip = { + enable = false; + }; + }; + corectrl = { + enable = false; + }; + fish = { + enable = true; + }; + gamemode = { + enable = true; + optimizeGpu = { + enable = true; + }; + }; + gamescope = { + enable = true; + }; + gimp = { + enable = false; + }; + gnome = { + enable = false; + }; + hyprland = { + enable = true; + }; + inkscape = { + enable = false; + }; + lutris = { + enable = true; + }; + microfetch = { + enable = true; + }; + pkgs = { + enable = true; + desktop = { + enable = true; + }; + laptop = { + enable = false; + }; + dev = { + enable = true; + }; + }; + mysql-workbench = { + enable = false; + }; + nh = { + enable = true; + clean = { + enable = true; + extraArgs = "--keep 3 --keep-since 21d"; + }; + }; + npm = { + enable = false; + }; + obsidian = { + enable = true; + }; + steam = { + enable = true; + }; + thunar = { + enable = true; + }; + yubikey = { + enable = true; + }; + zsh = { + enable = false; + }; + }; + services = { + agenix = { + enable = true; + cnixtop = { + enable = true; + }; + }; + blueman = { + enable = true; + }; + dbus = { + enable = true; + }; + dconf = { + enable = true; + }; + flatpak = { + enable = true; + }; + fwupd = { + enable = true; + }; + gnome-keyring = { + enable = true; + }; + greetd = { + enable = true; + user = "cnst"; + }; + gvfs = { + enable = true; + }; + kanata = { + enable = true; + }; + locate = { + enable = true; + }; + mullvad = { + enable = true; + }; + nix-ld = { + enable = false; + }; + openssh = { + enable = true; + }; + pcscd = { + enable = true; + }; + pipewire = { + enable = true; + }; + polkit = { + enable = true; + }; + powerd = { + enable = false; + }; + samba = { + enable = false; + }; + scx = { + enable = true; + scheduler = "scx_lavd"; + flags = "--performance"; + }; + udisks = { + enable = true; + }; + zram = { + enable = true; + }; + }; + system = { + fonts = { + enable = true; + }; + locale = { + enable = true; + defaultLocale = "en_US.UTF-8"; + extraLocale = "sv_SE.UTF-8"; + timeZone = "Europe/Stockholm"; + }; + xdg = { + enable = true; + xdgOpenUsePortal = true; + }; + }; + }; +} diff --git a/hosts/default.nix b/hosts/default.nix index 3fc2778d..152786cd 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -23,15 +23,15 @@ # get these into the module system specialArgs = {inherit inputs self userConfig systemConfig hostConfig cnstConfig toothpickConfig umodPath smodPath;}; in { - cnix = nixosSystem { + cnixtop = nixosSystem { inherit specialArgs; modules = [ - ./cnix + ./cnixtop "${self}/nix" { home-manager = { - users.cnst.imports = homeImports."cnst@cnix"; + users.cnst.imports = homeImports."cnst@cnixtop"; extraSpecialArgs = specialArgs; }; } @@ -41,22 +41,6 @@ inputs.agenix.nixosModules.default ]; }; - toothpc = nixosSystem { - inherit specialArgs; - modules = [ - ./toothpc - "${self}/nix" - { - home-manager = { - users.toothpick.imports = homeImports."toothpick@toothpc"; - extraSpecialArgs = specialArgs; - }; - } - self.nixosModules.nixos - inputs.chaotic.nixosModules.default - inputs.agenix.nixosModules.default - ]; - }; cnixpad = nixosSystem { inherit specialArgs; modules = [ @@ -73,5 +57,37 @@ inputs.agenix.nixosModules.default ]; }; + cnixlab = nixosSystem { + inherit specialArgs; + modules = [ + ./cnixlab + "${self}/nix" + { + home-manager = { + users.cnst.imports = homeImports."adamin@cnixlab"; + extraSpecialArgs = specialArgs; + }; + } + self.nixosModules.nixos + inputs.chaotic.nixosModules.default + inputs.agenix.nixosModules.default + ]; + }; + toothpc = nixosSystem { + inherit specialArgs; + modules = [ + ./toothpc + "${self}/nix" + { + home-manager = { + users.toothpick.imports = homeImports."toothpick@toothpc"; + extraSpecialArgs = specialArgs; + }; + } + self.nixosModules.nixos + inputs.chaotic.nixosModules.default + inputs.agenix.nixosModules.default + ]; + }; }; } diff --git a/modules/home/programs/firefox/default.nix b/modules/home/programs/firefox/default.nix index c6f6d279..ae06edf1 100644 --- a/modules/home/programs/firefox/default.nix +++ b/modules/home/programs/firefox/default.nix @@ -22,9 +22,9 @@ in { default = { search = { force = true; - default = "DuckDuckGo"; - privateDefault = "DuckDuckGo"; - order = ["DuckDuckGo" "Google"]; + default = "ddg"; + privateDefault = "ddg"; + order = ["ddg" "google"]; }; bookmarks = {}; # extensions = with config.nur.repos.rycee.firefox-addons; [ diff --git a/modules/home/programs/fuzzel/default.nix b/modules/home/programs/fuzzel/default.nix index be438efe..8fbd3ad2 100644 --- a/modules/home/programs/fuzzel/default.nix +++ b/modules/home/programs/fuzzel/default.nix @@ -44,7 +44,7 @@ in { }; }; } - (mkIf (host == "cnix") { + (mkIf (host == "cnixtop") { programs.fuzzel.settings.main.terminal = "${inputs.ghostty.packages.x86_64-linux.default}/bin/ghostty"; }) (mkIf (host == "cnixpad") { diff --git a/modules/home/programs/ghostty/default.nix b/modules/home/programs/ghostty/default.nix index 88b7739d..58060c6e 100644 --- a/modules/home/programs/ghostty/default.nix +++ b/modules/home/programs/ghostty/default.nix @@ -35,7 +35,7 @@ in { }; }; } - (mkIf (host == "cnix") { + (mkIf (host == "cnixtop") { programs.ghostty.settings.command = "${getExe config.programs.fish.package}"; }) (mkIf (host == "cnixpad") { diff --git a/modules/home/services/hypridle/default.nix b/modules/home/services/hypridle/default.nix index aadfb4ae..607e30b3 100644 --- a/modules/home/services/hypridle/default.nix +++ b/modules/home/services/hypridle/default.nix @@ -38,6 +38,5 @@ in { ]; }; }; - systemd.user.services.hypridle.Unit.After = lib.mkForce "graphical-session.target"; }; } diff --git a/modules/home/services/hyprpaper/default.nix b/modules/home/services/hyprpaper/default.nix index 463e5510..6ed2edf0 100644 --- a/modules/home/services/hyprpaper/default.nix +++ b/modules/home/services/hyprpaper/default.nix @@ -41,7 +41,7 @@ in { ]; wallpaper = [ - # cnix + # cnixtop "DP-3,${config.theme.background.desktop}" "DP-4,${config.theme.background.desktop}" # cnixpad @@ -51,6 +51,5 @@ in { ]; }; }; - systemd.user.services.hyprpaper.Unit.After = lib.mkForce "graphical-session.target"; }; } diff --git a/modules/home/services/xdg/default.nix b/modules/home/services/xdg/default.nix index 085d5b02..365b4cad 100644 --- a/modules/home/services/xdg/default.nix +++ b/modules/home/services/xdg/default.nix @@ -6,7 +6,7 @@ }: let inherit (lib) mkIf mkEnableOption mkForce elem; browser = - if elem osConfig.networking.hostName ["cnix" "cnixpad"] + if elem osConfig.networking.hostName ["cnixtop" "cnixpad"] then "zen.desktop" else "firefox.desktop"; cfg = config.home.services.xdg; diff --git a/modules/nixos/programs/hyprland/inputs.nix b/modules/nixos/programs/hyprland/inputs.nix index 0b8e7ef9..71fa3afa 100644 --- a/modules/nixos/programs/hyprland/inputs.nix +++ b/modules/nixos/programs/hyprland/inputs.nix @@ -60,7 +60,7 @@ in { }; } - (mkIf (host == "cnix") { + (mkIf (host == "cnixtop") { programs.hyprland.settings = { render = { explicit_sync = 2; diff --git a/modules/nixos/programs/hyprland/keybinds.nix b/modules/nixos/programs/hyprland/keybinds.nix index 26756789..5c4e17c7 100644 --- a/modules/nixos/programs/hyprland/keybinds.nix +++ b/modules/nixos/programs/hyprland/keybinds.nix @@ -90,7 +90,7 @@ in { }; } - (mkIf (host == "cnix") { + (mkIf (host == "cnixtop") { programs.hyprland.settings = { "$terminal" = "ghostty"; "$browser" = "zen"; diff --git a/modules/nixos/programs/hyprland/rules.nix b/modules/nixos/programs/hyprland/rules.nix index aae36590..5db98f9e 100644 --- a/modules/nixos/programs/hyprland/rules.nix +++ b/modules/nixos/programs/hyprland/rules.nix @@ -81,7 +81,7 @@ in { ]; }; } - (mkIf (host == "cnix") { + (mkIf (host == "cnixtop") { programs.hyprland.settings.workspace = [ "name:1,monitor:DP-3" "name:2,monitor:DP-3" diff --git a/modules/nixos/programs/hyprland/startup.nix b/modules/nixos/programs/hyprland/startup.nix index a4de5079..8d2c38b9 100644 --- a/modules/nixos/programs/hyprland/startup.nix +++ b/modules/nixos/programs/hyprland/startup.nix @@ -21,7 +21,7 @@ in { }; } - (mkIf (host == "cnix") { + (mkIf (host == "cnixtop") { programs.hyprland.settings.exec-once = [ "uwsm app -- mullvad-vpn" "uwsm app -- blueman-applet" diff --git a/modules/nixos/services/agenix/default.nix b/modules/nixos/services/agenix/default.nix index fc37090e..d0200ba0 100644 --- a/modules/nixos/services/agenix/default.nix +++ b/modules/nixos/services/agenix/default.nix @@ -12,7 +12,7 @@ in { options = { nixos.services.agenix = { enable = mkEnableOption "Enables agenix system environment"; - cnix.enable = mkOption { + cnixtop.enable = mkOption { type = lib.types.bool; default = false; description = "Apply cnix agenix settings"; @@ -32,7 +32,7 @@ in { config = mkIf cfg.enable { age = mkMerge [ - (mkIf cfg.cnix.enable { + (mkIf cfg.cnixtop.enable { secrets = { cnstssh.file = "${self}/secrets/cnstssh.age"; cnixssh.file = "${self}/secrets/cnixssh.age"; diff --git a/users/cnstlab/default.nix b/users/cnstlab/default.nix new file mode 100644 index 00000000..54521694 --- /dev/null +++ b/users/cnstlab/default.nix @@ -0,0 +1,49 @@ +{ + pkgs, + lib, + config, + # osConfig, + ... +}: +# let +# isCnixpad = osConfig.networking.hostName == "cnixpad"; +# in +{ + imports = [ + ./modules + ./git.nix + ]; + # ++ lib.optionals isCnixpad [./cpmodules.nix]; + + home = { + username = "cnst"; + homeDirectory = "/home/cnst"; + stateVersion = "23.11"; + extraOutputsToInstall = ["doc" "devdoc"]; + packages = with pkgs; [ + # misc.system + bun + ]; + + sessionVariables = { + BROWSER = "zen"; + EDITOR = "hx"; + TERM = "xterm-256color"; + + # VK_ICD_FILENAMES = "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json"; + # STEAM_EXTRA_COMPAT_TOOLS_PATHS = "/home/cnst/.steam/root/compatibilitytools.d"; + # QT_QPA_PLATFORM = "wayland"; + # XDG_SESSION_TYPE = "wayland"; + }; + }; + + manual = { + html.enable = false; + json.enable = false; + manpages.enable = false; + }; + + programs.home-manager.enable = true; + + # systemd.user.targets.tray.Unit.Requires = lib.mkForce ["graphical-session.target"]; +} diff --git a/users/cnstlab/git.nix b/users/cnstlab/git.nix new file mode 100644 index 00000000..c11c89d2 --- /dev/null +++ b/users/cnstlab/git.nix @@ -0,0 +1,62 @@ +{ + config, + pkgs, + osConfig, + lib, + ... +}: let + email = config.programs.git.userEmail; + isCnixpad = osConfig.networking.hostName == "cnixpad"; + isCnixlab = osConfig.networking.hostName == "cnixlab"; + sshKey = + if isCnixpad + then "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIXCjkKouZrsMoswMIeueO8X/c3kuY3Gb0E9emvkqwUv cnst@cnixpad" + else if isCnixlab + then "placeholder text" + else "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEUub8vbzUn2f39ILhAJ2QeH8xxLSjiyUuo8xvHGx/VB adam@cnst.dev"; +in { + home.packages = [pkgs.gh]; + programs.git = { + enable = true; + userName = "cnst"; + userEmail = "adam@cnst.dev"; + delta = { + enable = true; + options.dark = true; + }; + extraConfig = { + # user.signingkey = "${config.home.homeDirectory}/.ssh/id_ed25519.pub"; + user.signingkey = "${config.home.homeDirectory}/.config/git/allowed_signers"; + signing = { + format = lib.mkDefault "ssh"; + key = "${config.home.homeDirectory}/.ssh/id_ed25519"; + signByDefault = true; + }; + gpg = { + # format = lib.mkDefault "ssh"; + ssh.allowedSignersFile = config.home.homeDirectory + "/" + config.xdg.configFile."git/allowed_signers".target; + }; + commit = { + verbose = true; + gpgSign = false; + }; + init.defaultBranch = "main"; + merge.conflictStyle = "diff3"; + diff.algorithm = "histogram"; + log.date = "iso"; + column.ui = "auto"; + branch.sort = "committerdate"; + push.autoSetupRemote = true; + rerere.enabled = true; + }; + lfs.enable = true; + ignores = [ + ".direnv" + "result" + ".jj" + ]; + }; + xdg.configFile."git/allowed_signers".text = '' + ${email} namespaces="git" ${sshKey} + ''; +} diff --git a/users/cnstlab/modules/default.nix b/users/cnstlab/modules/default.nix new file mode 100644 index 00000000..93ae831c --- /dev/null +++ b/users/cnstlab/modules/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./home.nix + ./options.nix + ]; +} diff --git a/users/cnstlab/modules/home.nix b/users/cnstlab/modules/home.nix new file mode 100644 index 00000000..4037d8e5 --- /dev/null +++ b/users/cnstlab/modules/home.nix @@ -0,0 +1,160 @@ +{ + home = { + programs = { + aerc = { + enable = false; + }; + alacritty = { + enable = false; + }; + anyrun = { + enable = false; + }; + bash = { + enable = true; + }; + chromium = { + enable = false; + }; + discord = { + enable = false; + }; + eza = { + enable = true; + }; + floorp = { + enable = false; + }; + firefox = { + enable = false; + }; + fish = { + enable = true; + }; + foot = { + enable = false; + }; + fuzzel = { + enable = false; + }; + ghostty = { + enable = false; + }; + helix = { + enable = true; + }; + hyprland = { + enable = false; + }; + hyprlock = { + enable = false; + }; + jujutsu = { + enable = false; + }; + kitty = { + enable = false; + }; + misc = { + enable = false; + }; + mpv = { + enable = false; + }; + neovim = { + enable = false; + }; + nvf = { + enable = false; + }; + nwg-bar = { + enable = false; + }; + rofi = { + enable = false; + }; + ssh = { + enable = true; + }; + tuirun = { + enable = false; + }; + vscode = { + enable = false; + }; + waybar = { + enable = false; + }; + wezterm = { + enable = false; + }; + yazi = { + enable = false; + }; + zathura = { + enable = false; + }; + zed-editor = { + enable = false; + }; + zellij = { + enable = false; + }; + zen = { + enable = false; + }; + zsh = { + enable = false; + }; + }; + services = { + blueman-applet = { + enable = false; + }; + copyq = { + enable = false; + }; + dconf = { + settings = { + color-scheme = "prefer-dark"; + }; + }; + dunst = { + enable = false; + }; + gpg = { + enable = true; + }; + gtk = { + enable = false; + }; + hypridle = { + enable = false; + }; + hyprpaper = { + enable = false; + }; + mako = { + enable = false; + }; + nix-index = { + enable = true; + }; + protonmail-bridge = { + enable = false; + }; + swaync = { + enable = false; + }; + syncthing = { + enable = true; + }; + udiskie = { + enable = false; + }; + xdg = { + enable = false; + }; + }; + }; +} diff --git a/users/cnstlab/modules/options.nix b/users/cnstlab/modules/options.nix new file mode 100644 index 00000000..7e5f07b9 --- /dev/null +++ b/users/cnstlab/modules/options.nix @@ -0,0 +1,43 @@ +{ + accounts = { + username = "cnst"; + hostname = "cnixlab"; + }; + monitors = [ + { + name = "DP-3"; + width = 2560; + height = 1440; + refreshRate = 240; + position = "0x0"; + transform = 0; + bitDepth = 10; + workspace = "1"; + primary = true; + } + { + name = "DP-4"; + width = 1920; + height = 1080; + refreshRate = 60; + position = "2560x0"; + transform = 3; + workspace = "5"; + primary = false; + } + { + name = "eDP-1"; + width = 1920; + height = 1200; + refreshRate = 60; + workspace = "1"; + primary = false; + } + ]; + theme = { + background = { + lockscreen = "wallpaper_2"; + desktop = "wallpaper_1"; + }; + }; +} diff --git a/users/default.nix b/users/default.nix index 0611c005..a21bf7b3 100644 --- a/users/default.nix +++ b/users/default.nix @@ -14,7 +14,7 @@ ]; homeImports = { - "cnst@cnix" = + "cnst@cnixtop" = sharedImports ++ [ ./cnst @@ -24,6 +24,11 @@ ++ [ ./cnst ]; + "cnst@cnixlab" = + sharedImports + ++ [ + ./cnstlab + ]; "toothpick@toothpc" = sharedImports ++ [