yep, more dotfiles

chore: use unixpkgs#helix instead of upstream, bump dependencies

wiro.world f18818c5 de30c27f

verified
Changed files
+106 -186
home-manager
fragments
modules
nixos
nixos
profiles
pkgs
+89 -164
flake.lock
···
{
"nodes": {
+
"actor-typeahead-src": {
+
"flake": false,
+
"locked": {
+
"lastModified": 1762835797,
+
"narHash": "sha256-heizoWUKDdar6ymfZTnj3ytcEv/L4d4fzSmtr0HlXsQ=",
+
"ref": "refs/heads/main",
+
"rev": "677fe7f743050a4e7f09d4a6f87bbf1325a06f6b",
+
"revCount": 6,
+
"type": "git",
+
"url": "https://tangled.org/@jakelazaroff.com/actor-typeahead"
+
},
+
"original": {
+
"type": "git",
+
"url": "https://tangled.org/@jakelazaroff.com/actor-typeahead"
+
}
+
},
"agenix": {
"inputs": {
"darwin": "darwin",
···
],
"nixpkgs": [
"nixpkgs"
-
],
-
"systems": "systems"
+
]
},
"locked": {
-
"lastModified": 1754433428,
-
"narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=",
+
"lastModified": 1703089996,
+
"narHash": "sha256-ipqShkBmHKC9ft1ZAsA6aeKps32k7+XZSPwfxeHLsAU=",
"owner": "ryantm",
"repo": "agenix",
-
"rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d",
+
"rev": "564595d0ad4be7277e07fa63b5a991b3c645655d",
"type": "github"
},
"original": {
"owner": "ryantm",
+
"ref": "0.15.0",
"repo": "agenix",
"type": "github"
}
···
},
"crane": {
"locked": {
-
"lastModified": 1731098351,
-
"narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=",
+
"lastModified": 1754269165,
+
"narHash": "sha256-0tcS8FHd4QjbCVoxN9jI+PjHgA4vc/IjkUSp+N3zy0U=",
"owner": "ipetkov",
"repo": "crane",
-
"rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28",
+
"rev": "444e81206df3f7d92780680e45858e31d2f07a08",
"type": "github"
},
"original": {
···
]
},
"locked": {
-
"lastModified": 1744478979,
-
"narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=",
+
"lastModified": 1673295039,
+
"narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=",
"owner": "lnl7",
"repo": "nix-darwin",
-
"rev": "43975d782b418ebf4969e9ccba82466728c2851b",
+
"rev": "87b9d090ad39b25b2400029c64825fc2a8868943",
"type": "github"
},
"original": {
···
]
},
"locked": {
-
"lastModified": 1758287904,
-
"narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=",
+
"lastModified": 1736864502,
+
"narHash": "sha256-ItkIZyebGvNH2dK9jVGzJHGPtb6BSWLN8Gmef16NeY0=",
"owner": "nix-community",
"repo": "disko",
-
"rev": "67ff9807dd148e704baadbd4fd783b54282ca627",
+
"rev": "0141aabed359f063de7413f80d906e1d98c0c123",
"type": "github"
},
"original": {
"owner": "nix-community",
+
"ref": "v1.11.0",
"repo": "disko",
"type": "github"
}
···
"flake-compat": {
"flake": false,
"locked": {
-
"lastModified": 1696426674,
-
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+
"lastModified": 1747046372,
+
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
"owner": "edolstra",
"repo": "flake-compat",
-
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
"type": "github"
},
"original": {
···
]
},
"locked": {
-
"lastModified": 1730504689,
-
"narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
+
"lastModified": 1754091436,
+
"narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=",
"owner": "hercules-ci",
"repo": "flake-parts",
-
"rev": "506278e768c2a08bec68eb62932193e341f55c90",
+
"rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd",
"type": "github"
},
"original": {
···
},
"flake-utils": {
"inputs": {
-
"systems": "systems_3"
+
"systems": "systems_2"
},
"locked": {
"lastModified": 1694529238,
···
"type": "github"
}
},
-
"helix": {
-
"inputs": {
-
"nixpkgs": [
-
"unixpkgs"
-
],
-
"rust-overlay": "rust-overlay_2"
-
},
-
"locked": {
-
"lastModified": 1759201995,
-
"narHash": "sha256-3STv6fITv8Ar/kl0H7vIA7VV0d2gyLh8UL0BOiVacXg=",
-
"owner": "helix-editor",
-
"repo": "helix",
-
"rev": "bfcbef10c513108c7b43317569416c2eefc4ed44",
-
"type": "github"
-
},
-
"original": {
-
"owner": "helix-editor",
-
"repo": "helix",
-
"type": "github"
-
}
-
},
"home-manager": {
"inputs": {
"nixpkgs": [
···
]
},
"locked": {
-
"lastModified": 1747556831,
-
"narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=",
+
"lastModified": 1758463745,
+
"narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
"owner": "nix-community",
"repo": "home-manager",
-
"rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33",
+
"rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
"type": "github"
},
"original": {
···
"type": "github"
}
},
-
"home-manager_2": {
-
"inputs": {
-
"nixpkgs": [
-
"zen-browser",
-
"nixpkgs"
-
]
-
},
-
"locked": {
-
"lastModified": 1752603129,
-
"narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=",
-
"owner": "nix-community",
-
"repo": "home-manager",
-
"rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b",
-
"type": "github"
-
},
-
"original": {
-
"owner": "nix-community",
-
"repo": "home-manager",
-
"type": "github"
-
}
-
},
"htmx-src": {
"flake": false,
"locked": {
···
"unixpkgs"
],
"pre-commit-hooks-nix": "pre-commit-hooks-nix",
-
"rust-overlay": "rust-overlay_3"
+
"rust-overlay": "rust-overlay_2"
},
"locked": {
-
"lastModified": 1737639419,
-
"narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=",
+
"lastModified": 1762205063,
+
"narHash": "sha256-If6vQ+KvtKs3ARBO9G3l+4wFSCYtRBrwX1z+I+B61wQ=",
"owner": "nix-community",
"repo": "lanzaboote",
-
"rev": "a65905a09e2c43ff63be8c0e86a93712361f871e",
+
"rev": "88b8a563ff5704f4e8d8e5118fb911fa2110ca05",
"type": "github"
},
"original": {
"owner": "nix-community",
-
"ref": "v0.4.2",
+
"ref": "v0.4.3",
"repo": "lanzaboote",
"type": "github"
}
···
]
},
"locked": {
-
"lastModified": 1748004251,
-
"narHash": "sha256-XodjkVWTth3A2JpBqGBkdLD9kkWn94rnv98l3xwKukg=",
+
"lastModified": 1762912391,
+
"narHash": "sha256-4hpBE7bGd24SfD28rzMdUGXsLsNEYxCCrTipFdoqoNM=",
"owner": "LnL7",
"repo": "nix-darwin",
-
"rev": "33220d4791784e4dd4739edd3f6c028020082f91",
+
"rev": "d76299b2cd01837c4c271a7b5186e3d5d8ebd126",
"type": "github"
},
"original": {
"owner": "LnL7",
+
"ref": "nix-darwin-25.05",
"repo": "nix-darwin",
"type": "github"
}
},
"nixos-hardware": {
"locked": {
-
"lastModified": 1758663926,
-
"narHash": "sha256-6CFdj7Xs616t1W4jLDH7IohAAvl5Dyib3qEv/Uqw1rk=",
+
"lastModified": 1762847253,
+
"narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=",
"owner": "nixos",
"repo": "nixos-hardware",
-
"rev": "170ff93c860b2a9868ed1e1102d4e52cb3d934e1",
+
"rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9",
"type": "github"
},
"original": {
···
},
"nixpkgs": {
"locked": {
-
"lastModified": 1747953325,
-
"narHash": "sha256-y2ZtlIlNTuVJUZCqzZAhIw5rrKP4DOSklev6c8PyCkQ=",
+
"lastModified": 1763049705,
+
"narHash": "sha256-A5LS0AJZ1yDPTa2fHxufZN++n8MCmtgrJDtxFxrH4S8=",
"owner": "nixos",
"repo": "nixpkgs",
-
"rev": "55d1f923c480dadce40f5231feb472e81b0bab48",
+
"rev": "3acb677ea67d4c6218f33de0db0955f116b7588c",
"type": "github"
},
"original": {
···
"type": "github"
}
},
-
"nixpkgs-stable": {
-
"locked": {
-
"lastModified": 1730741070,
-
"narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
-
"owner": "NixOS",
-
"repo": "nixpkgs",
-
"rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
-
"type": "github"
-
},
-
"original": {
-
"owner": "NixOS",
-
"ref": "nixos-24.05",
-
"repo": "nixpkgs",
-
"type": "github"
-
}
-
},
"nur": {
"inputs": {
"flake-parts": [
···
"nixpkgs": [
"lanzaboote",
"nixpkgs"
-
],
-
"nixpkgs-stable": "nixpkgs-stable"
+
]
},
"locked": {
-
"lastModified": 1731363552,
-
"narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
+
"lastModified": 1750779888,
+
"narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
-
"rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
+
"rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d",
"type": "github"
},
"original": {
···
"agenix": "agenix",
"disko": "disko",
"git-leave": "git-leave",
-
"helix": "helix",
"home-manager": "home-manager",
"lanzaboote": "lanzaboote",
"nix-darwin": "nix-darwin",
···
"rust-overlay_2": {
"inputs": {
"nixpkgs": [
-
"helix",
-
"nixpkgs"
-
]
-
},
-
"locked": {
-
"lastModified": 1740623427,
-
"narHash": "sha256-3SdPQrZoa4odlScFDUHd4CUPQ/R1gtH4Mq9u8CBiK8M=",
-
"owner": "oxalica",
-
"repo": "rust-overlay",
-
"rev": "d342e8b5fd88421ff982f383c853f0fc78a847ab",
-
"type": "github"
-
},
-
"original": {
-
"owner": "oxalica",
-
"repo": "rust-overlay",
-
"type": "github"
-
}
-
},
-
"rust-overlay_3": {
-
"inputs": {
-
"nixpkgs": [
"lanzaboote",
"nixpkgs"
]
},
"locked": {
-
"lastModified": 1731897198,
-
"narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=",
+
"lastModified": 1761791894,
+
"narHash": "sha256-myRIDh+PxaREz+z9LzbqBJF+SnTFJwkthKDX9zMyddY=",
"owner": "oxalica",
"repo": "rust-overlay",
-
"rev": "0be641045af6d8666c11c2c40e45ffc9667839b5",
+
"rev": "59c45eb69d9222a4362673141e00ff77842cd219",
"type": "github"
},
"original": {
···
"type": "github"
}
},
-
"rust-overlay_4": {
+
"rust-overlay_3": {
"inputs": {
"nixpkgs": [
"wakatime-ls",
···
]
},
"locked": {
-
"lastModified": 1759107752,
-
"narHash": "sha256-VEdL1J4rk+Z/5wHhLSsvj5QmXWKHHDeN1P8YLGLa1RM=",
+
"lastModified": 1762737305,
+
"narHash": "sha256-5zN6jJ6KKBGiJeK3Q4+afZfJU7VyyUgehOAA3zYegTc=",
"owner": "nix-community",
"repo": "srvos",
-
"rev": "97708379b1f3b64224632eb49a56e45fe6995e6f",
+
"rev": "c04379f95fca70b38cdd45a1a7affe6d4226912b",
"type": "github"
},
"original": {
···
"nixpkgs"
],
"nur": "nur",
-
"systems": "systems_2",
+
"systems": "systems",
"tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty",
"tinted-schemes": "tinted-schemes",
···
"tinted-zed": "tinted-zed"
},
"locked": {
-
"lastModified": 1760478648,
-
"narHash": "sha256-Y4l+Y3zUvqIDbyLrtOrzNvp1o50Fp9TYK+iwtwweFU4=",
+
"lastModified": 1762295027,
+
"narHash": "sha256-5z5cGrp9F8g8iyQrM8WkB6pAwP4AaicljKZ15gx+X9Y=",
"owner": "nix-community",
"repo": "stylix",
-
"rev": "1ec254101285777db13922303cc47ded06e10bb3",
+
"rev": "91b9a270523361268ba6a8772152fde31103869f",
"type": "github"
},
"original": {
···
"type": "github"
}
},
-
"systems_3": {
-
"locked": {
-
"lastModified": 1681028828,
-
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-
"owner": "nix-systems",
-
"repo": "default",
-
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-
"type": "github"
-
},
-
"original": {
-
"owner": "nix-systems",
-
"repo": "default",
-
"type": "github"
-
}
-
},
"tangled": {
"inputs": {
+
"actor-typeahead-src": "actor-typeahead-src",
"flake-compat": "flake-compat_2",
"gomod2nix": "gomod2nix",
"htmx-src": "htmx-src",
···
"sqlite-lib-src": "sqlite-lib-src"
},
"locked": {
-
"lastModified": 1759247161,
-
"narHash": "sha256-Th0+karP19f0BC4cYBI27adn+lGFYCWq5C+FfQFrHXA=",
+
"lastModified": 1763089726,
+
"narHash": "sha256-lRTZLRcqWpVf6CzJmvg+ggp/YWWasT4u2lFKIiIopoM=",
"ref": "refs/heads/master",
-
"rev": "5c9bf597da9a0f19635187a10f6711dd1917a9d7",
-
"revCount": 1467,
+
"rev": "3eb9cefd98d13ab9864abb2e394fc41f89ffd923",
+
"revCount": 1660,
"type": "git",
"url": "https://tangled.org/@tangled.org/core"
},
···
},
"unixpkgs": {
"locked": {
-
"lastModified": 1762363567,
-
"narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=",
+
"lastModified": 1762977756,
+
"narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
"owner": "nixos",
"repo": "nixpkgs",
-
"rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4",
+
"rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
"type": "github"
},
"original": {
···
"nixpkgs": [
"nixpkgs"
],
-
"rust-overlay": "rust-overlay_4"
+
"rust-overlay": "rust-overlay_3"
},
"locked": {
-
"lastModified": 1761744398,
-
"narHash": "sha256-3SigmxIycZgaW/BVDqf6hkC+octwNecBt5g0D69YrAU=",
+
"lastModified": 1761849542,
+
"narHash": "sha256-5fNSKIUG54TD5jq5hgsCmB4FB0mO8teiBE18fU81mfc=",
"owner": "mrnossiom",
"repo": "wakatime-ls",
-
"rev": "8598bc6f5e86522ee27605d4dee3ecf7a8a96dfa",
+
"rev": "89e4091ef5e4c1830dd9bd463f8b063f8335bfad",
"type": "github"
},
"original": {
···
},
"zen-browser": {
"inputs": {
-
"home-manager": "home-manager_2",
+
"home-manager": [
+
"home-manager"
+
],
"nixpkgs": [
"unixpkgs"
},
"locked": {
-
"lastModified": 1761535208,
-
"narHash": "sha256-E1PobJMiFmVUX2YdqYk/MpKb0LXavOYvlg8DCBBzlHc=",
+
"lastModified": 1763097615,
+
"narHash": "sha256-qxpsf2FVzXrN0WDWRgeBz7RJ5vjHNFDy8oLqbC6gU3Y=",
"owner": "0xc000022070",
"repo": "zen-browser-flake",
-
"rev": "79a94872a3e6993a051c4e22a2dcb02c1d088acf",
+
"rev": "479ca480bf531285e88006aa1c70fd3bb5529f3d",
"type": "github"
},
"original": {
+8 -11
flake.nix
···
home-manager.url = "github:nix-community/home-manager/release-25.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
+
nix-darwin.url = "github:LnL7/nix-darwin/nix-darwin-25.05";
+
nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
+
stylix.url = "github:nix-community/stylix/release-25.05";
stylix.inputs.nixpkgs.follows = "nixpkgs";
-
## Misc
-
-
nix-darwin.url = "github:LnL7/nix-darwin";
-
nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
+
## Miscellaneous
-
agenix.url = "github:ryantm/agenix";
+
agenix.url = "github:ryantm/agenix/0.15.0";
agenix.inputs.nixpkgs.follows = "nixpkgs";
agenix.inputs.home-manager.follows = "home-manager";
-
disko.url = "github:nix-community/disko";
+
disko.url = "github:nix-community/disko/v1.11.0";
disko.inputs.nixpkgs.follows = "nixpkgs";
nixos-hardware.url = "github:nixos/nixos-hardware";
-
lanzaboote.url = "github:nix-community/lanzaboote/v0.4.2";
+
lanzaboote.url = "github:nix-community/lanzaboote/v0.4.3";
lanzaboote.inputs.nixpkgs.follows = "unixpkgs";
srvos.url = "github:nix-community/srvos";
-
# srvos.inputs.nixpkgs.follows = "srvos/nixpkgs";
srvos.inputs.nixpkgs.follows = "nixpkgs";
## Packages
···
git-leave.url = "github:mrnossiom/git-leave";
git-leave.inputs.nixpkgs.follows = "nixpkgs";
-
helix.url = "github:helix-editor/helix";
-
helix.inputs.nixpkgs.follows = "unixpkgs";
-
tangled.url = "git+https://tangled.org/@tangled.org/core";
tangled.inputs.nixpkgs.follows = "unixpkgs";
···
zen-browser.url = "github:0xc000022070/zen-browser-flake";
zen-browser.inputs.nixpkgs.follows = "unixpkgs";
+
zen-browser.inputs.home-manager.follows = "home-manager";
};
outputs = { self, nixpkgs, ... }:
+1 -1
home-manager/fragments/helix.nix
···
programs.helix = {
enable = true;
-
package = if flags.onlyCached then upkgs.helix else lpkgs.helix;
+
package = upkgs.helix;
defaultEditor = true;
settings = {
+3 -3
modules/nixos/geoclue2.nix
···
# Target interface to manage the static file would be:
# static = {
# latitude = 48.8;
-
# logitude = 2.3;
+
# longitude = 2.3;
# };
#
# I spent way too much time getting this to work with a submodule.
···
# type = types.nullOr (types.attrsOf staticModule);
# default = null;
# description = ''
-
# Add a fallback location that will be overriden by other location services
+
# Add a fallback location that will be overridden by other location services
# '';
# };
···
type = types.nullOr (types.str);
default = null;
description = ''
-
Add a fallback location that will be overriden by other location services
+
Add a fallback location that will be overridden by other location services
'';
};
};
+4 -5
nixos/profiles/server.nix
···
}:
let
-
inherit (self.inputs) unixpkgs srvos agenix tangled;
+
inherit (self.inputs) unixpkgs srvos tangled;
json-format = pkgs.formats.json { };
···
srvos.nixosModules.server
srvos.nixosModules.hardware-hetzner-cloud
srvos.nixosModules.mixins-terminfo
-
-
agenix.nixosModules.default
self.nixosModules.headscale
···
];
};
-
services.tangled-knot = {
+
services.tangled.knot = {
enable = true;
openFirewall = true;
···
};
};
-
services.tangled-spindle = {
+
services.tangled.spindle = {
enable = true;
server = {
···
};
age.secrets.headscale-oidc-secret = { file = ../../secrets/headscale-oidc-secret.age; owner = config.services.headscale.user; };
+
# TODO: add dependency on authelia
services.headscale = {
enable = true;
package = upkgs.headscale;
+1 -2
pkgs/default.nix
···
{ self, system, ... }@pkgs:
let
-
inherit (self.inputs) agenix git-leave helix wakatime-ls;
+
inherit (self.inputs) agenix git-leave wakatime-ls;
in
{
asak = pkgs.callPackage ./asak.nix { };
···
# Import packages defined in foreign repositories
inherit (agenix.packages.${system}) agenix;
inherit (git-leave.packages.${system}) git-leave;
-
inherit (helix.packages.${system}) helix;
inherit (wakatime-ls.packages.${system}) wakatime-ls;
}