mthomson/nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Michael Thomson 2025-03-07 08:26:21 -05:00
parent f48cbf893e
commit 73d9c04d3e
10 changed files with 308 additions and 277 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

310
flake.lock generated
View File

@ -20,11 +20,11 @@
]
},
"locked": {
"lastModified": 1737636397,
"narHash": "sha256-F5MbBj3QVorycVSFE9qjuOTLtIQBqt2VWbXa0uwzm98=",
"lastModified": 1739298463,
"narHash": "sha256-oAFv9jKwwA7d7384d2LeywDSgwhvb3ZnrwbfoWPhXsI=",
"owner": "hyprwm",
"repo": "aquamarine",
"rev": "7fe006981fae53e931f513026fc754e322f13145",
"rev": "f239e5aadd6d23c48e085c2de3397e2058e54d16",
"type": "github"
},
"original": {
@ -57,11 +57,11 @@
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"lastModified": 1733328505,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"type": "github"
},
"original": {
@ -140,11 +140,11 @@
]
},
"locked": {
"lastModified": 1736143030,
"narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
"lastModified": 1738453229,
"narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
"rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
"type": "github"
},
"original": {
@ -162,11 +162,11 @@
]
},
"locked": {
"lastModified": 1736143030,
"narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
"lastModified": 1738453229,
"narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
"rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
"type": "github"
},
"original": {
@ -182,11 +182,11 @@
]
},
"locked": {
"lastModified": 1736143030,
"narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
"lastModified": 1738453229,
"narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
"rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
"type": "github"
},
"original": {
@ -200,11 +200,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
@ -234,16 +234,18 @@
"ghostty": {
"inputs": {
"flake-compat": "flake-compat",
"flake-utils": "flake-utils",
"nixpkgs-stable": "nixpkgs-stable",
"nixpkgs-unstable": "nixpkgs-unstable",
"zig": "zig"
"zig": "zig",
"zig2nix": "zig2nix"
},
"locked": {
"lastModified": 1737779447,
"narHash": "sha256-+iVqQXAUJshUYgxOHfke54Ux4f/aggl1yub86KNx2tE=",
"lastModified": 1740509669,
"narHash": "sha256-TyAkm8Q9lJF7Q33RMbLQiedKJ5xZ62dhvIfQy6YOus8=",
"owner": "ghostty-org",
"repo": "ghostty",
"rev": "71e62f96fa4d286eda835048428d5be96e9f87c1",
"rev": "9972eeb673a8871b97c22a7d7ae81d1ffef5a8f5",
"type": "github"
},
"original": {
@ -376,11 +378,11 @@
]
},
"locked": {
"lastModified": 1736917206,
"narHash": "sha256-JTBWmyGf8K1Rwb+gviHIUzRJk/sITtT+72HXFkTZUjo=",
"lastModified": 1739595404,
"narHash": "sha256-0CjCfbq0yHWexOrpO06e2WU1r5JAqR6ffy1zgM3NksI=",
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
"rev": "afd0a42e8c61ebb56899315ee4084a8b2e4ff425",
"rev": "06519cec8fb32d219006da6eacd255504a9996af",
"type": "github"
},
"original": {
@ -396,11 +398,11 @@
]
},
"locked": {
"lastModified": 1737762889,
"narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=",
"lastModified": 1740494361,
"narHash": "sha256-Dd/GhJ9qKmUwuhgt/PAROG8J6YdU2ZjtJI9SQX5sVQI=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "daf04c5950b676f47a794300657f1d3d14c1a120",
"rev": "74f0a8546e3f2458c870cf90fc4b38ac1f498b17",
"type": "github"
},
"original": {
@ -417,11 +419,11 @@
]
},
"locked": {
"lastModified": 1737762889,
"narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=",
"lastModified": 1738878603,
"narHash": "sha256-fmhq8B3MvQLawLbMO+LWLcdC2ftLMmwSk+P29icJ3tE=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "daf04c5950b676f47a794300657f1d3d14c1a120",
"rev": "433799271274c9f2ab520a49527ebfe2992dcfbd",
"type": "github"
},
"original": {
@ -446,11 +448,11 @@
]
},
"locked": {
"lastModified": 1737634937,
"narHash": "sha256-Ffw4ujFpi++6pPHe+gCBOfDgAoNlzVPZN6MReC1beu8=",
"lastModified": 1738664950,
"narHash": "sha256-xIeGNM+iivwVHkv9tHwOqoUP5dDrtees34bbFKKMZYs=",
"owner": "hyprwm",
"repo": "hyprcursor",
"rev": "9c5dd1f7c825ee47f72727ad0a4e16ca46a2688e",
"rev": "7c6d165e1eb9045a996551eb9f121b6d1b30adc3",
"type": "github"
},
"original": {
@ -475,11 +477,11 @@
]
},
"locked": {
"lastModified": 1737634889,
"narHash": "sha256-9JZE3KxcXOqZH9zs3UeadngDiK/yIACTiAR8HSA/TNI=",
"lastModified": 1739049071,
"narHash": "sha256-3+7TpXMrbsUXSwgr5VAKAnmkzMb6JO+Rvc9XRb5NMg4=",
"owner": "hyprwm",
"repo": "hyprgraphics",
"rev": "0d77b4895ad5f1bb3b0ee43103a5246c58b65591",
"rev": "175c6b29b6ff82100539e7c4363a35a02c74dd73",
"type": "github"
},
"original": {
@ -495,8 +497,8 @@
"hyprgraphics": "hyprgraphics",
"hyprland-protocols": "hyprland-protocols",
"hyprland-qtutils": "hyprland-qtutils",
"hyprlang": "hyprlang_2",
"hyprutils": "hyprutils_2",
"hyprlang": "hyprlang",
"hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": "nixpkgs",
"pre-commit-hooks": "pre-commit-hooks",
@ -504,11 +506,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1737907229,
"narHash": "sha256-0onbAHBZQhdnIEl1lOxjp4VKNy69GR1K5K6hvxww4rs=",
"lastModified": 1740492189,
"narHash": "sha256-duXEZlnz4Vd+4B4/tLUH5rRu3JQe/8qDvW+VHMO/yO4=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "bb5b09def0645838456eb7eb1f52b471441acba1",
"rev": "f0850905f0275922340035f62b6d808c2980ceda",
"type": "github"
},
"original": {
@ -529,11 +531,11 @@
]
},
"locked": {
"lastModified": 1737556638,
"narHash": "sha256-laKgI3mr2qz6tas/q3tuGPxMdsGhBi/w+HO+hO2f1AY=",
"lastModified": 1738422629,
"narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "4c75dd5c015c8a0e5a34c6d02a018a650f57feb5",
"rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed",
"type": "github"
},
"original": {
@ -544,7 +546,11 @@
},
"hyprland-qt-support": {
"inputs": {
"hyprlang": "hyprlang",
"hyprlang": [
"hyprland",
"hyprland-qtutils",
"hyprlang"
],
"nixpkgs": [
"hyprland",
"hyprland-qtutils",
@ -573,8 +579,14 @@
"hyprland-qtutils": {
"inputs": {
"hyprland-qt-support": "hyprland-qt-support",
"hyprlang": [
"hyprland",
"hyprlang"
],
"hyprutils": [
"hyprland",
"hyprland-qtutils",
"hyprlang",
"hyprutils"
],
"nixpkgs": [
@ -587,11 +599,11 @@
]
},
"locked": {
"lastModified": 1737811848,
"narHash": "sha256-WZ7LeiKHk5Y94MU5gHIWn0r8asWxYOvie4LqfCjVIZU=",
"lastModified": 1739048983,
"narHash": "sha256-REhTcXq4qs3B3cCDtLlYDz0GZvmsBSh947Ub6pQWGTQ=",
"owner": "hyprwm",
"repo": "hyprland-qtutils",
"rev": "9c0831ff98856c0f312fcb8b57553fbe3dd34d5b",
"rev": "3504a293c8f8db4127cb0f7cfc1a318ffb4316f8",
"type": "github"
},
"original": {
@ -601,36 +613,6 @@
}
},
"hyprlang": {
"inputs": {
"hyprutils": "hyprutils",
"nixpkgs": [
"hyprland",
"hyprland-qtutils",
"hyprland-qt-support",
"nixpkgs"
],
"systems": [
"hyprland",
"hyprland-qtutils",
"hyprland-qt-support",
"systems"
]
},
"locked": {
"lastModified": 1737634606,
"narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "f41271d35cc0f370d300413d756c2677f386af9d",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprlang",
"type": "github"
}
},
"hyprlang_2": {
"inputs": {
"hyprutils": [
"hyprland",
@ -646,11 +628,11 @@
]
},
"locked": {
"lastModified": 1737634606,
"narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=",
"lastModified": 1739048914,
"narHash": "sha256-vd5rJBTmp2w7SDgfv23Zcd84ktI5eDA7e5UBzx+pKrU=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "f41271d35cc0f370d300413d756c2677f386af9d",
"rev": "a7334904d591f38757c46fbe2ab68651877d9099",
"type": "github"
},
"original": {
@ -660,37 +642,6 @@
}
},
"hyprutils": {
"inputs": {
"nixpkgs": [
"hyprland",
"hyprland-qtutils",
"hyprland-qt-support",
"hyprlang",
"nixpkgs"
],
"systems": [
"hyprland",
"hyprland-qtutils",
"hyprland-qt-support",
"hyprlang",
"systems"
]
},
"locked": {
"lastModified": 1737632363,
"narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "006620eb29d54ea9086538891404c78563d1bae1",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprutils",
"type": "github"
}
},
"hyprutils_2": {
"inputs": {
"nixpkgs": [
"hyprland",
@ -702,11 +653,11 @@
]
},
"locked": {
"lastModified": 1737725508,
"narHash": "sha256-jGmcPc6y/prg/4A8KGYqJ27nSPaProCMiFadaxNAKvA=",
"lastModified": 1739891528,
"narHash": "sha256-h8HOCZ/rw2Buzku+GKF77VXxrGjCSOQkLhptiEKMYg0=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "fb0c2d1de3d1ef7396d19c18ac09e12bd956929e",
"rev": "61a5382f4b1ab578064d470b1b3d3f0df396b8ba",
"type": "github"
},
"original": {
@ -727,11 +678,11 @@
]
},
"locked": {
"lastModified": 1735493474,
"narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=",
"lastModified": 1739049028,
"narHash": "sha256-RleJp7LYbr6s+M1xgbmhtBs+fYa3ZdIiF7+QalJ4D1g=",
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b",
"rev": "04146df74a8d5ec0b579657307be01f1e241125f",
"type": "github"
},
"original": {
@ -779,11 +730,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1737899779,
"narHash": "sha256-WM5sSMwECm3Q88yj79dIk8KfiXuwq1Q3GHO1DPGFIyE=",
"lastModified": 1740500764,
"narHash": "sha256-AQF6DKdiKeTe5VWs5faEVmvVKtMBe5Tmjy6+Ak9lD8c=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"rev": "76c58ab72d04df8ba83357c2df3c2842371c8356",
"rev": "9709774a9967bad9f7ddd1d4eaa4d6e0399bd6d0",
"type": "github"
},
"original": {
@ -795,11 +746,11 @@
"neovim-src": {
"flake": false,
"locked": {
"lastModified": 1737845778,
"narHash": "sha256-HQQ9g1jbh2KcVXiubxBpTS8P+KgTMVFbGPgGnXYtTSI=",
"lastModified": 1740432889,
"narHash": "sha256-0cWyvDni1m5pgYF6pSNRoCSezaxpb95kvt5jYCdZmfk=",
"owner": "neovim",
"repo": "neovim",
"rev": "b8e947ed4ed04f9aeef471f579451bbf2bb2993d",
"rev": "614c9322d50052c76fb3e6e1be7536a972ff0902",
"type": "github"
},
"original": {
@ -815,11 +766,11 @@
]
},
"locked": {
"lastModified": 1737504076,
"narHash": "sha256-/B4XJnzYU/6K1ZZOBIgsa3K4pqDJrnC2579c44c+4rI=",
"lastModified": 1740452771,
"narHash": "sha256-/tI1vFJ7/dXJqUmI+s0EV1F0DPe6dZvT444mrLUkrlU=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "65cc1fa8e36ceff067daf6cfb142331f02f524d3",
"rev": "42be12b510253d750138ec90c66decc282298b44",
"type": "github"
},
"original": {
@ -836,11 +787,11 @@
]
},
"locked": {
"lastModified": 1737504076,
"narHash": "sha256-/B4XJnzYU/6K1ZZOBIgsa3K4pqDJrnC2579c44c+4rI=",
"lastModified": 1738743987,
"narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "65cc1fa8e36ceff067daf6cfb142331f02f524d3",
"rev": "ae406c04577ff9a64087018c79b4fdc02468c87c",
"type": "github"
},
"original": {
@ -902,11 +853,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1737751639,
"narHash": "sha256-ZEbOJ9iT72iwqXsiEMbEa8wWjyFvRA9Ugx8utmYbpz4=",
"lastModified": 1740387674,
"narHash": "sha256-pGk/aA0EBvI6o4DeuZsr05Ig/r4uMlSaf5EWUZEWM10=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "dfad538f751a5aa5d4436d9781ab27a6128ec9d4",
"rev": "d58f642ddb23320965b27beb0beba7236e9117b5",
"type": "github"
},
"original": {
@ -918,11 +869,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1737632463,
"narHash": "sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ+NH28=",
"lastModified": 1739020877,
"narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0aa475546ed21629c4f5bbf90e38c846a99ec9e9",
"rev": "a79cfe0ebd24952b580b1cf08cd906354996d547",
"type": "github"
},
"original": {
@ -966,11 +917,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1733423277,
"narHash": "sha256-TxabjxEgkNbCGFRHgM/b9yZWlBj60gUOUnRT/wbVQR8=",
"lastModified": 1738255539,
"narHash": "sha256-hP2eOqhIO/OILW+3moNWO4GtdJFYCqAe9yJZgvlCoDQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "e36963a147267afc055f7cf65225958633e536bf",
"rev": "c3511a3b53b482aa7547c9d1626fd7310c1de1c5",
"type": "github"
},
"original": {
@ -982,11 +933,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1733229606,
"narHash": "sha256-FLYY5M0rpa5C2QAE3CKLYAM6TwbKicdRK6qNrSHlNrE=",
"lastModified": 1738136902,
"narHash": "sha256-pUvLijVGARw4u793APze3j6mU1Zwdtz7hGkGGkD87qw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "566e53c2ad750c84f6d31f9ccb9d00f823165550",
"rev": "9a5db3142ce450045840cc8d832b13b8a2018e0c",
"type": "github"
},
"original": {
@ -998,11 +949,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1737717945,
"narHash": "sha256-ET91TMkab3PmOZnqiJQYOtSGvSTvGeHoegAv4zcTefM=",
"lastModified": 1740303746,
"narHash": "sha256-XcdiWLEhjJkMxDLKQJ0CCivmYYCvA5MDxu9pMybM5kM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ecd26a469ac56357fd333946a99086e992452b6a",
"rev": "2d068ae5c6516b2d04562de50a58c682540de9bf",
"type": "github"
},
"original": {
@ -1014,11 +965,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1737746512,
"narHash": "sha256-nU6AezEX4EuahTO1YopzueAXfjFfmCHylYEFCagduHU=",
"lastModified": 1740367490,
"narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "825479c345a7f806485b7f00dbe3abb50641b083",
"rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
"type": "github"
},
"original": {
@ -1043,11 +994,11 @@
"treefmt-nix": "treefmt-nix_2"
},
"locked": {
"lastModified": 1737914312,
"narHash": "sha256-PBF4R+yQt5Sls7CsA9Miwx28XtOP/yqaqejZ3RKSes0=",
"lastModified": 1739121491,
"narHash": "sha256-BEmyAozR3Pc2qwPtC4rgUglzi3cw4nv4fXEY23NxOrQ=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "8e5422bf3e76f410b97d2da640d0829e87657de9",
"rev": "13341a4c1238b7974e7bad9c7a6d5c51ca3cf81a",
"type": "github"
},
"original": {
@ -1120,11 +1071,11 @@
]
},
"locked": {
"lastModified": 1737823349,
"narHash": "sha256-LAppb+sftyvJbPdrBG1uN9GYWHz6q7bUpkpDjljcSRo=",
"lastModified": 1738508923,
"narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=",
"owner": "NuschtOS",
"repo": "search",
"rev": "f91a0ac0f4ecf0ad1d1d88140f66520dae6ce4bd",
"rev": "86e2038290859006e05ca7201425ea5b5de4aecb",
"type": "github"
},
"original": {
@ -1238,11 +1189,11 @@
]
},
"locked": {
"lastModified": 1737483750,
"narHash": "sha256-5An1wq5U8sNycOBBg3nsDDgpwBmR9liOpDGlhliA6Xo=",
"lastModified": 1739829690,
"narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "f2cc121df15418d028a59c9737d38e3a90fbaf8f",
"rev": "3d0579f5cc93436052d94b73925b48973a104204",
"type": "github"
},
"original": {
@ -1259,11 +1210,11 @@
]
},
"locked": {
"lastModified": 1737483750,
"narHash": "sha256-5An1wq5U8sNycOBBg3nsDDgpwBmR9liOpDGlhliA6Xo=",
"lastModified": 1738680491,
"narHash": "sha256-8X7tR3kFGkE7WEF5EXVkt4apgaN85oHZdoTGutCFs6I=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "f2cc121df15418d028a59c9737d38e3a90fbaf8f",
"rev": "64dbb922d51a42c0ced6a7668ca008dded61c483",
"type": "github"
},
"original": {
@ -1318,18 +1269,21 @@
"flake-compat": [
"ghostty"
],
"flake-utils": "flake-utils",
"flake-utils": [
"ghostty",
"flake-utils"
],
"nixpkgs": [
"ghostty",
"nixpkgs-stable"
]
},
"locked": {
"lastModified": 1717848532,
"narHash": "sha256-d+xIUvSTreHl8pAmU1fnmkfDTGQYCn2Rb/zOwByxS2M=",
"lastModified": 1738239110,
"narHash": "sha256-Y5i9mQ++dyIQr+zEPNy+KIbc5wjPmfllBrag3cHZgcE=",
"owner": "mitchellh",
"repo": "zig-overlay",
"rev": "02fc5cc555fc14fda40c42d7c3250efa43812b43",
"rev": "1a8fb6f3a04724519436355564b95fce5e272504",
"type": "github"
},
"original": {
@ -1337,6 +1291,32 @@
"repo": "zig-overlay",
"type": "github"
}
},
"zig2nix": {
"inputs": {
"flake-utils": [
"ghostty",
"flake-utils"
],
"nixpkgs": [
"ghostty",
"nixpkgs-stable"
]
},
"locked": {
"lastModified": 1738263917,
"narHash": "sha256-j/3fwe2pEOquHabP/puljOKwAZFjIE9gXZqA91sC48M=",
"owner": "jcollie",
"repo": "zig2nix",
"rev": "c311d8e77a6ee0d995f40a6e10a89a3a4ab04f9a",
"type": "github"
},
"original": {
"owner": "jcollie",
"ref": "c311d8e77a6ee0d995f40a6e10a89a3a4ab04f9a",
"repo": "zig2nix",
"type": "github"
}
}
},
"root": "root",

19
hosts/macbook/configuration.nix
View File

@ -7,7 +7,8 @@
imports = [
inputs.home-manager.darwinModules.default
../../modules/nix-darwin/system.nix
#../../modules/nix-darwin/aerospace.nix
#../../modules/nixos/postgres.nix
../../modules/nix-darwin/aerospace.nix
];
nixpkgs.hostPlatform = "aarch64-darwin";
@ -47,12 +48,12 @@
];
services = {
skhd = {
enable = true;
skhdConfig = ''
cmd - return : kitty
'';
};
# skhd = {
# enable = true;
# skhdConfig = ''
# cmd - return : kitty
# '';
# };
};
home-manager = {
@ -67,7 +68,7 @@
system.stateVersion = 5;
# Auto upgrade nix package and the daemon service.
services.nix-daemon.enable = true;
# fix for this: https://github.com/LnL7/nix-darwin/issues/1346
ids.gids.nixbld = 30000;
nix.package = pkgs.nix;
}

27
hosts/macbook/home.nix
View File

@ -13,6 +13,7 @@
../../modules/home-manager/email
../../modules/home-manager/password-store
../../modules/home-manager/taskwarrior
#../../modules/home-manager/sketchybar
../../modules/home-manager/kubernetes.nix
../../modules/home-manager/nix-index.nix
../../modules/home-manager/bitwarden.nix
@ -39,16 +40,6 @@
notebook = {
dir = "~/zk";
};
group = {
daily = {
paths = ["journal/daily"];
note = {
filename = "{{format-date now '%Y-%m-%d'}}";
extension = "md";
template = "daily.md";
};
};
};
};
};
jq = {
@ -71,19 +62,27 @@
enable = true;
settings = {};
};
spotify-player = {
enable = true;
};
};
home.packages = with pkgs; [
slides
graph-easy
obsidian
nodejs
taskwarrior-tui
sbcl
hidden-bar
weechat
android-tools
nchat
nethack
(pkgs.python3.withPackages (python-pkgs: with python-pkgs; [
keyring
click
tldextract
]))
bitwarden-cli
nodejs
ladybird
];
programs.home-manager.enable = true;

11
modules/home-manager/email/default.nix
View File

@ -60,6 +60,13 @@
khard = {
enable = true;
};
neomutt = {
enable = true;
vimKeys = true;
sidebar = {
enable = true;
};
};
};
accounts = {
@ -73,6 +80,9 @@
aerc = {
enable = true;
};
neomutt = {
enable = true;
};
mbsync = {
enable = true;
create = "both";
@ -96,6 +106,7 @@
};
notmuch = {
enable = true;
neomutt.enable = true;
};
};
};

48
modules/home-manager/git/default.nix
View File

@ -10,6 +10,54 @@
diff-so-fancy = {
enable = true;
};
extraConfig = {
column = {
ui = "auto";
};
branch = {
sort = "-committerdate";
};
tag = {
sort = "version:refname";
};
diff = {
algorithm = "histogram";
colorMoved = "plain";
mnemonicPrefix = "true";
renames = "true";
};
push = {
default = "simple";
autoSetupRemote = "true";
followTags = "true";
};
fetch = {
prune = "true";
pruneTags = "true";
all = "true";
};
help = {
autocorrect = "prompt";
};
commit = {
verbose = "true";
};
rerere = {
enabled = "true";
autoupdate = "true";
};
rebase = {
autoSquash = "true";
autoStash = "true";
autoRefs = "true";
};
merge = {
conflictstyle = "zdiff3";
};
pull = {
rebase = "true";
};
};
includes = [
{
condition = "gitdir:~/dev/work/";

8
modules/home-manager/kitty/default.nix
View File

@ -6,10 +6,14 @@
programs.kitty = {
enable = true;
font = {
name = "JetBrainsMono Nerd Font Mono";
name = "PragmataPro Mono Liga";
size = 12;
package = pkgs.nerd-fonts.jetbrains-mono;
};
# font = {
# name = "JetBrainsMono Nerd Font Mono";
# size = 12;
# package = pkgs.nerd-fonts.jetbrains-mono;
# };
shellIntegration = {
enableZshIntegration = true;
};

77
modules/home-manager/nixvim/default.nix
View File

@ -38,6 +38,11 @@ lib,
laststatus = 3;
swapfile = false;
tabstop = 4;
softtabstop = 0;
shiftwidth = 4;
expandtab = true;
breakindent = true;
undofile = true;
ignorecase = true;
@ -464,25 +469,25 @@ lib,
lsp = {
enable = true;
servers = {
nixd = {
enable = true;
settings = {
nixpkgs = {
expr = "(builtins.getFlake (\"git+file://\" + toString ./.)).inputs.nixpkgs { }";
};
formatting = {
command = ["alejandra"];
};
options = {
nixos = {
expr = "(builtins.getFlake (\"git+file://\" + toString ./.)).nixosConfigurations.desktop.options";
};
nix-darwin = {
expr = "(builtins.getFlake (\"git+file://\" + toString ./.)).darwinConfigurations.macbook.options";
};
};
};
};
# nixd = {
# enable = true;
# settings = {
# nixpkgs = {
# expr = "(builtins.getFlake (\"git+file://\" + toString ./.)).inputs.nixpkgs { }";
# };
# formatting = {
# command = ["alejandra"];
# };
# options = {
# nixos = {
# expr = "(builtins.getFlake (\"git+file://\" + toString ./.)).nixosConfigurations.desktop.options";
# };
# nix-darwin = {
# expr = "(builtins.getFlake (\"git+file://\" + toString ./.)).darwinConfigurations.macbook.options";
# };
# };
# };
# };
ts_ls = {
enable = true;
};
@ -495,9 +500,9 @@ lib,
cssls = {
enable = true;
};
stylelint_lsp = {
enable = true;
};
# stylelint_lsp = {
# enable = true;
# };
volar = {
enable = true;
tslsIntegration = true;
@ -508,6 +513,9 @@ lib,
gopls = {
enable = true;
};
golangci_lint_ls = {
enable = true;
};
bashls = {
enable = true;
};
@ -530,23 +538,26 @@ lib,
};
};
};
neotest = {
enable = true;
adapters = {
jest = {
enable = true;
};
go = {
enable = true;
};
};
};
# neotest = {
# enable = true;
# adapters = {
# jest = {
# enable = true;
# };
# go = {
# enable = true;
# };
# };
# };
nvim-jdtls = {
enable = true;
cmd = [
(lib.getExe pkgs.jdt-language-server)
];
};
markdown-preview = {
enable = true;
};
};
};
}

63
modules/nix-darwin/aerospace.nix
View File

@ -16,6 +16,18 @@
# Start AeroSpace at login
start-at-login = false;
# float certain windows
on-window-detected = [
{
"if" = {
app-id = "com.apple.finder";
};
run = [
"layout floating"
];
}
];
# Normalizations. See: https://nikitabobko.github.io/AeroSpace/guide#normalization
enable-normalization-flatten-containers = true;
enable-normalization-opposite-orientation-for-nested-containers = true;
@ -43,7 +55,7 @@
# You can effectively turn off macOS "Hide application" (cmd-h) feature by toggling this flag
# Useful if you don't use this macOS feature, but accidentally hit cmd-h or cmd-alt-h key
# Also see: https://nikitabobko.github.io/AeroSpace/goodies#disable-hide-app
automatically-unhide-macos-hidden-apps = false;
automatically-unhide-macos-hidden-apps = true;
key-mapping = {
# Possible values: (qwerty|dvorak)
@ -99,28 +111,6 @@
alt-7 = "workspace 7";
alt-8 = "workspace 8";
alt-9 = "workspace 9";
alt-a = "workspace A"; # In your config, you can drop workspace bindings that you don"t need
alt-b = "workspace B";
alt-c = "workspace C";
alt-d = "workspace D";
alt-e = "workspace E";
alt-f = "workspace F";
alt-g = "workspace G";
alt-i = "workspace I";
alt-m = "workspace M";
alt-n = "workspace N";
alt-o = "workspace O";
alt-p = "workspace P";
alt-q = "workspace Q";
alt-r = "workspace R";
alt-s = "workspace S";
alt-t = "workspace T";
alt-u = "workspace U";
alt-v = "workspace V";
alt-w = "workspace W";
alt-x = "workspace X";
alt-y = "workspace Y";
alt-z = "workspace Z";
# See: https://nikitabobko.github.io/AeroSpace/commands#move-node-to-workspace
alt-shift-1 = "move-node-to-workspace 1";
@ -132,28 +122,6 @@
alt-shift-7 = "move-node-to-workspace 7";
alt-shift-8 = "move-node-to-workspace 8";
alt-shift-9 = "move-node-to-workspace 9";
alt-shift-a = "move-node-to-workspace A";
alt-shift-b = "move-node-to-workspace B";
alt-shift-c = "move-node-to-workspace C";
alt-shift-d = "move-node-to-workspace D";
alt-shift-e = "move-node-to-workspace E";
alt-shift-f = "move-node-to-workspace F";
alt-shift-g = "move-node-to-workspace G";
alt-shift-i = "move-node-to-workspace I";
alt-shift-m = "move-node-to-workspace M";
alt-shift-n = "move-node-to-workspace N";
alt-shift-o = "move-node-to-workspace O";
alt-shift-p = "move-node-to-workspace P";
alt-shift-q = "move-node-to-workspace Q";
alt-shift-r = "move-node-to-workspace R";
alt-shift-s = "move-node-to-workspace S";
alt-shift-t = "move-node-to-workspace T";
alt-shift-u = "move-node-to-workspace U";
alt-shift-v = "move-node-to-workspace V";
alt-shift-w = "move-node-to-workspace W";
alt-shift-x = "move-node-to-workspace X";
alt-shift-y = "move-node-to-workspace Y";
alt-shift-z = "move-node-to-workspace Z";
# See: https://nikitabobko.github.io/AeroSpace/commands#workspace-back-and-forth
alt-tab = "workspace-back-and-forth";
@ -181,5 +149,10 @@
};
};
};
jankyborders = {
enable = true;
active_color = "0xffe1e3e4";
inactive_color = "0xff494d64";
};
};
}

4
modules/nix-darwin/system.nix
View File

@ -16,5 +16,9 @@
autohide = true;
autohide-delay = 0.0;
};
NSGlobalDomain = {
NSWindowShouldDragOnGesture = true;
NSAutomaticWindowAnimationsEnabled = true;
};
};
}

18
modules/nixos/postgres.nix
View File

@ -1,16 +1,16 @@
{pkgs, ...}: {
services.postgresql = {
enable = true;
ensureDatabases = ["mydatabase"];
ensureDatabases = ["todo"];
ensureUsers = [
{
name = "todo";
ensurePermissions = {
"DATABASE todo" = "ALL PRIVILEGES";
};
}
];
enableTCPIP = true;
port = 5432;
authentication = pkgs.lib.mkOverride 10 ''
#type database DBuser origin-address auth-method
local all all trust
# ipv4
host all all 127.0.0.1/32 trust
# ipv6
host all all ::1/128 trust
'';
};
}