ringofstorms/dotfiles
ringofstorms/dotfiles
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://git.joshuabell.xyz/ringofstorms/dotfiles

Browse source
This commit is contained in:
RingOfStorms (Joshua Bell) 2026-01-04 22:33:52 -06:00
commit 3543e998a4
8 changed files with 176 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

6
flakes/beszel/flake.lock generated
View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"beszel-nixpkgs": { "beszel-nixpkgs": {
"locked": { "locked": {
"lastModified": 1765472234, "lastModified": 1767379071,
"narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", "rev": "fb7944c166a3b630f177938e478f0378e64ce108",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
flakes/common/hm_modules/ssh.nix
View file

@ -33,6 +33,7 @@ in
controlMaster = "no"; controlMaster = "no";
controlPath = "~/.ssh/master-%r@%n:%p"; controlPath = "~/.ssh/master-%r@%n:%p";
controlPersist = "no"; controlPersist = "no";
StrictHostKeyChecking = "accept-new";
}; };
# EXTERNAL # EXTERNAL
@ -54,6 +55,11 @@ in
"lio" = lib.mkIf (hasSecret "nix2lio") { "lio" = lib.mkIf (hasSecret "nix2lio") {
identityFile = age.secrets.nix2lio.path; identityFile = age.secrets.nix2lio.path;
user = "josh"; user = "josh";
extraOptions = {
"PubkeyAcceptedKeyTypes" = "ssh-ed25519";
"ServerAliveInterval" = "60";
"IPQoS" = "throughput";
};
}; };
"lio_" = lib.mkIf (hasSecret "nix2lio") { "lio_" = lib.mkIf (hasSecret "nix2lio") {
identityFile = age.secrets.nix2lio.path; identityFile = age.secrets.nix2lio.path;

13
flakes/common/nix_modules/remote_lio_builds.nix
View file

@ -12,20 +12,11 @@ let
secrets ? ${secret} && secrets.${secret} != null; secrets ? ${secret} && secrets.${secret} != null;
in in
{ {
# Remote build off home lio computer
programs.ssh.extraConfig = lib.mkIf (hasSecret "nix2lio") ''
Host lio_
PubkeyAcceptedKeyTypes ssh-ed25519
ServerAliveInterval 60
IPQoS throughput
IdentityFile ${config.age.secrets.nix2lio.path}
'';
nix = lib.mkIf (hasSecret "nix2lio") { nix = lib.mkIf (hasSecret "nix2lio") {
distributedBuilds = true; distributedBuilds = true;
buildMachines = [ buildMachines = [
{ {
# TODO require hostname in ssh config? hostName = "lio";
hostName = "lio_";
system = "x86_64-linux"; system = "x86_64-linux";
protocol = "ssh-ng"; protocol = "ssh-ng";
maxJobs = 32; maxJobs = 32;
@ -36,8 +27,10 @@ in
"big-parallel" "big-parallel"
"kvm" "kvm"
"uid-range" # Often helpful "uid-range" # Often helpful
"recursive-nix"
]; ];
mandatoryFeatures = [ ]; mandatoryFeatures = [ ];
sshKey = config.age.secrets.nix2lio.path;
} }
]; ];
}; };

12
flakes/opencode/flake.lock generated
View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1767026758, "lastModified": 1767364772,
"narHash": "sha256-7fsac/f7nh/VaKJ/qm3I338+wAJa/3J57cOGpXi0Sbg=", "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "346dd96ad74dc4457a9db9de4f4f57dab2e5731d", "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -21,11 +21,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1767126722, "lastModified": 1767556352,
"narHash": "sha256-bXBpPQ9altAzsuFKhIS83LKwuLIxKJ4gWMAG5xzk+fM=", "narHash": "sha256-iYP/fa9guprb2hn8ONJrJe6U076zbeKHdqyyL0gvH8s=",
"owner": "sst", "owner": "sst",
"repo": "opencode", "repo": "opencode",
"rev": "3fe5d91372fdf859e09ed5a2aefe359e0648ed10", "rev": "c545fa2a289518fda35be66d1c81936a54962702",
"type": "github" "type": "github"
}, },
"original": { "original": {

86
hosts/juni/flake.lock generated
View file

@ -6,11 +6,11 @@
}, },
"locked": { "locked": {
"dir": "flakes/beszel", "dir": "flakes/beszel",
"lastModified": 1767294731, "lastModified": 1767575724,
"narHash": "sha256-hwTTYLO7nfPA98w3r6zXP2zj66yWBjHAf90gWGcX4Yw=", "narHash": "sha256-L+3hoO4t3RCXkp9RXyXpJlCkzj6AdTOsstUv7RphEBM=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "d923e49c193ef38127ca6680013eec31c55c8809", "rev": "f86b8085c2ad39986c194b28d51260f8f402572a",
"revCount": 1032, "revCount": 1041,
"type": "git", "type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
}, },
@ -22,11 +22,11 @@
}, },
"beszel-nixpkgs": { "beszel-nixpkgs": {
"locked": { "locked": {
"lastModified": 1765472234, "lastModified": 1767379071,
"narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", "rev": "fb7944c166a3b630f177938e478f0378e64ce108",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -39,11 +39,11 @@
"common": { "common": {
"locked": { "locked": {
"dir": "flakes/common", "dir": "flakes/common",
"lastModified": 1767294731, "lastModified": 1767575724,
"narHash": "sha256-hwTTYLO7nfPA98w3r6zXP2zj66yWBjHAf90gWGcX4Yw=", "narHash": "sha256-L+3hoO4t3RCXkp9RXyXpJlCkzj6AdTOsstUv7RphEBM=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "d923e49c193ef38127ca6680013eec31c55c8809", "rev": "f86b8085c2ad39986c194b28d51260f8f402572a",
"revCount": 1032, "revCount": 1041,
"type": "git", "type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
}, },
@ -59,11 +59,11 @@
}, },
"locked": { "locked": {
"dir": "flakes/de_plasma", "dir": "flakes/de_plasma",
"lastModified": 1767294731, "lastModified": 1767575724,
"narHash": "sha256-hwTTYLO7nfPA98w3r6zXP2zj66yWBjHAf90gWGcX4Yw=", "narHash": "sha256-L+3hoO4t3RCXkp9RXyXpJlCkzj6AdTOsstUv7RphEBM=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "d923e49c193ef38127ca6680013eec31c55c8809", "rev": "f86b8085c2ad39986c194b28d51260f8f402572a",
"revCount": 1032, "revCount": 1041,
"type": "git", "type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
}, },
@ -79,11 +79,11 @@
}, },
"locked": { "locked": {
"dir": "flakes/flatpaks", "dir": "flakes/flatpaks",
"lastModified": 1767294731, "lastModified": 1767575724,
"narHash": "sha256-hwTTYLO7nfPA98w3r6zXP2zj66yWBjHAf90gWGcX4Yw=", "narHash": "sha256-L+3hoO4t3RCXkp9RXyXpJlCkzj6AdTOsstUv7RphEBM=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "d923e49c193ef38127ca6680013eec31c55c8809", "rev": "f86b8085c2ad39986c194b28d51260f8f402572a",
"revCount": 1032, "revCount": 1041,
"type": "git", "type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
}, },
@ -120,11 +120,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1767280655, "lastModified": 1767514898,
"narHash": "sha256-YmaYMduV5ko8zURUT1VLGDbVC1L/bxHS0NsiPoZ6bBM=", "narHash": "sha256-ONYqnKrPzfKEEPChoJ9qPcfvBqW9ZgieDKD7UezWPg4=",
"owner": "rycee", "owner": "rycee",
"repo": "home-manager", "repo": "home-manager",
"rev": "d49d2543f02dbd789ed032188c84570d929223cb", "rev": "7a06e8a2f844e128d3b210a000a62716b6040b7f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -199,11 +199,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1767116409, "lastModified": 1767379071,
"narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=", "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cad22e7d996aea55ecab064e84834289143e44a0", "rev": "fb7944c166a3b630f177938e478f0378e64ce108",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -215,11 +215,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1767047869, "lastModified": 1767325753,
"narHash": "sha256-tzYsEzXEVa7op1LTnrLSiPGrcCY6948iD0EcNLWcmzo=", "narHash": "sha256-yA/CuWyqm+AQo2ivGy6PlYrjZBQm7jfbe461+4HF2fo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "89dbf01df72eb5ebe3b24a86334b12c27d68016a", "rev": "64049ca74d63e971b627b5f3178d95642e61cedd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -231,11 +231,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1767047869, "lastModified": 1767480499,
"narHash": "sha256-tzYsEzXEVa7op1LTnrLSiPGrcCY6948iD0EcNLWcmzo=", "narHash": "sha256-8IQQUorUGiSmFaPnLSo2+T+rjHtiNWc+OAzeHck7N48=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "89dbf01df72eb5ebe3b24a86334b12c27d68016a", "rev": "30a3c519afcf3f99e2c6df3b359aec5692054d92",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -247,11 +247,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1767026758, "lastModified": 1767364772,
"narHash": "sha256-7fsac/f7nh/VaKJ/qm3I338+wAJa/3J57cOGpXi0Sbg=", "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "346dd96ad74dc4457a9db9de4f4f57dab2e5731d", "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1147,11 +1147,11 @@
}, },
"locked": { "locked": {
"dir": "flakes/opencode", "dir": "flakes/opencode",
"lastModified": 1767294731, "lastModified": 1767575724,
"narHash": "sha256-hwTTYLO7nfPA98w3r6zXP2zj66yWBjHAf90gWGcX4Yw=", "narHash": "sha256-L+3hoO4t3RCXkp9RXyXpJlCkzj6AdTOsstUv7RphEBM=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "d923e49c193ef38127ca6680013eec31c55c8809", "rev": "f86b8085c2ad39986c194b28d51260f8f402572a",
"revCount": 1032, "revCount": 1041,
"type": "git", "type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
}, },
@ -1166,11 +1166,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1767126722, "lastModified": 1767556352,
"narHash": "sha256-bXBpPQ9altAzsuFKhIS83LKwuLIxKJ4gWMAG5xzk+fM=", "narHash": "sha256-iYP/fa9guprb2hn8ONJrJe6U076zbeKHdqyyL0gvH8s=",
"owner": "sst", "owner": "sst",
"repo": "opencode", "repo": "opencode",
"rev": "3fe5d91372fdf859e09ed5a2aefe359e0648ed10", "rev": "c545fa2a289518fda35be66d1c81936a54962702",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1310,8 +1310,8 @@
}, },
"secrets-bao": { "secrets-bao": {
"locked": { "locked": {
"lastModified": 1767294735, "lastModified": 1767587118,
"narHash": "sha256-AF5iJYVdgmXuNBblVymhS8jAniZerX/CyfBbcM0Hh5g=", "narHash": "sha256-O6QCLO/csAiO8e5ejB43m7PQc7+EePWkX39Z2CZdqZ4=",
"path": "/home/josh/.config/nixos-config/flakes/secrets-bao", "path": "/home/josh/.config/nixos-config/flakes/secrets-bao",
"type": "path" "type": "path"
}, },

1
hosts/lio/configuration.nix
View file

@ -34,6 +34,7 @@
users.users.root.openssh.authorizedKeys.keys = [ users.users.root.openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJN2nsLmAlF6zj5dEBkNSJaqcCya+aB6I0imY8Q5Ew0S nix2lio" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJN2nsLmAlF6zj5dEBkNSJaqcCya+aB6I0imY8Q5Ew0S nix2lio"
]; ];
nix.distributedBuilds = true;
# Allow emulation of aarch64-linux binaries for cross compiling # Allow emulation of aarch64-linux binaries for cross compiling
boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; boot.binfmt.emulatedSystems = [ "aarch64-linux" ];

207
hosts/oren/flake.lock generated
View file

@ -31,11 +31,11 @@
}, },
"locked": { "locked": {
"dir": "flakes/beszel", "dir": "flakes/beszel",
"lastModified": 1766426360, "lastModified": 1767572382,
"narHash": "sha256-QcCko39bjdoSLezpfj4+/HGCyC/XDaomt17Rb8/cG1E=", "narHash": "sha256-oDoVrmMpww4uY3Ez1XzrHsxJTZmBMiOO/mNrU2njiWQ=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "286f8a1687dd1b2b8c383942a8ee25d8350de892", "rev": "165f87ebc19a48b56008738d01c5e2e5bebbbdfd",
"revCount": 967, "revCount": 1038,
"type": "git", "type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
}, },
@ -47,11 +47,11 @@
}, },
"beszel-nixpkgs": { "beszel-nixpkgs": {
"locked": { "locked": {
"lastModified": 1765472234, "lastModified": 1767379071,
"narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", "rev": "fb7944c166a3b630f177938e478f0378e64ce108",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -64,11 +64,11 @@
"common": { "common": {
"locked": { "locked": {
"dir": "flakes/common", "dir": "flakes/common",
"lastModified": 1767105946, "lastModified": 1767572382,
"narHash": "sha256-IRgl+mna4n7jDyVw0hPSwE2VnbXj0wnuyDaUwmhE/YU=", "narHash": "sha256-oDoVrmMpww4uY3Ez1XzrHsxJTZmBMiOO/mNrU2njiWQ=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "f25a2e5dc61a7b10f7c26d491eed3a53a5b47854", "rev": "165f87ebc19a48b56008738d01c5e2e5bebbbdfd",
"revCount": 1002, "revCount": 1038,
"type": "git", "type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
}, },
@ -123,11 +123,11 @@
}, },
"locked": { "locked": {
"dir": "flakes/de_plasma", "dir": "flakes/de_plasma",
"lastModified": 1766426360, "lastModified": 1767572382,
"narHash": "sha256-QcCko39bjdoSLezpfj4+/HGCyC/XDaomt17Rb8/cG1E=", "narHash": "sha256-oDoVrmMpww4uY3Ez1XzrHsxJTZmBMiOO/mNrU2njiWQ=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "286f8a1687dd1b2b8c383942a8ee25d8350de892", "rev": "165f87ebc19a48b56008738d01c5e2e5bebbbdfd",
"revCount": 967, "revCount": 1038,
"type": "git", "type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
}, },
@ -161,11 +161,11 @@
}, },
"locked": { "locked": {
"dir": "flakes/flatpaks", "dir": "flakes/flatpaks",
"lastModified": 1766426360, "lastModified": 1767572382,
"narHash": "sha256-QcCko39bjdoSLezpfj4+/HGCyC/XDaomt17Rb8/cG1E=", "narHash": "sha256-oDoVrmMpww4uY3Ez1XzrHsxJTZmBMiOO/mNrU2njiWQ=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "286f8a1687dd1b2b8c383942a8ee25d8350de892", "rev": "165f87ebc19a48b56008738d01c5e2e5bebbbdfd",
"revCount": 967, "revCount": 1038,
"type": "git", "type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
}, },
@ -202,11 +202,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1766292113, "lastModified": 1767514898,
"narHash": "sha256-sWTtmkQujRpjWYCnZc8LWdDiCzrRlSBPrGovkZpLkBI=", "narHash": "sha256-ONYqnKrPzfKEEPChoJ9qPcfvBqW9ZgieDKD7UezWPg4=",
"owner": "rycee", "owner": "rycee",
"repo": "home-manager", "repo": "home-manager",
"rev": "fdec8815a86db36f42fc9c8cb2931cd8485f5aed", "rev": "7a06e8a2f844e128d3b210a000a62716b6040b7f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -273,11 +273,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1765779637, "lastModified": 1767379071,
"narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", "rev": "fb7944c166a3b630f177938e478f0378e64ce108",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -289,11 +289,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1766201043, "lastModified": 1767325753,
"narHash": "sha256-eplAP+rorKKd0gNjV3rA6+0WMzb1X1i16F5m5pASnjA=", "narHash": "sha256-yA/CuWyqm+AQo2ivGy6PlYrjZBQm7jfbe461+4HF2fo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b3aad468604d3e488d627c0b43984eb60e75e782", "rev": "64049ca74d63e971b627b5f3178d95642e61cedd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -305,11 +305,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1766201043, "lastModified": 1767480499,
"narHash": "sha256-eplAP+rorKKd0gNjV3rA6+0WMzb1X1i16F5m5pASnjA=", "narHash": "sha256-8IQQUorUGiSmFaPnLSo2+T+rjHtiNWc+OAzeHck7N48=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b3aad468604d3e488d627c0b43984eb60e75e782", "rev": "30a3c519afcf3f99e2c6df3b359aec5692054d92",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -321,11 +321,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1766125104, "lastModified": 1767364772,
"narHash": "sha256-l/YGrEpLromL4viUo5GmFH3K5M1j0Mb9O+LiaeCPWEM=", "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7d853e518814cca2a657b72eeba67ae20ebf7059", "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -337,15 +337,16 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1764776358, "lastModified": 1766309749,
"narHash": "sha256-MxXSCRiV7DI5U3Ra1UxVJTTUyKsONAE8+8QdSXsGIhA=", "narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0b8cec1eb2241336971009cdd4af641b930d0d97", "rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -385,11 +386,11 @@
"nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": { "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1763599441, "lastModified": 1766398838,
"narHash": "sha256-RwCQQfgQIQITVSJSX+QOSIOChT7E2AXdIwfU07S9GaU=", "narHash": "sha256-pO+bnwywDmhEpmU3Zw2VCAT8uLEgRlpHcAfW9NwqWis=",
"owner": "CopilotC-Nvim", "owner": "CopilotC-Nvim",
"repo": "CopilotChat.nvim", "repo": "CopilotChat.nvim",
"rev": "df5376c132382dd47e3e552612940cbf25b3580c", "rev": "ed94e56ee8292f5df351e17709ff4b178ca84200",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -433,11 +434,11 @@
"nvim_plugin-MeanderingProgrammer/render-markdown.nvim": { "nvim_plugin-MeanderingProgrammer/render-markdown.nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1764732647, "lastModified": 1765914395,
"narHash": "sha256-jya61X22LbcT4hpeio3qE/oOI/lvqKpf09oGEHHvQdA=", "narHash": "sha256-A7pm8sBQWsZl3Kc7JBh3gBUyKb6GfJ5J0zfn3mSGjKs=",
"owner": "MeanderingProgrammer", "owner": "MeanderingProgrammer",
"repo": "render-markdown.nvim", "repo": "render-markdown.nvim",
"rev": "b2b135347e299ffbf7f4123fb7811899b0c9f4b8", "rev": "07d088bf8bdadd159eb807b90eaee86a4778383f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -513,11 +514,11 @@
"nvim_plugin-b0o/schemastore.nvim": { "nvim_plugin-b0o/schemastore.nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1764655248, "lastModified": 1766167236,
"narHash": "sha256-9nUBzwbMkzLySMW/Y0EkFpvFgHeW5YDQ3J3moVQarjQ=", "narHash": "sha256-+Z1foMyKMxyMmYqmyu1KWiyL4Fc0Zm2SYV7RoZ9Ut2I=",
"owner": "b0o", "owner": "b0o",
"repo": "schemastore.nvim", "repo": "schemastore.nvim",
"rev": "e9c00ea7813006dfa29f35c174f83f0184d45a93", "rev": "8b92ea89835b8e5dbc779a675ebb0e5fcb9a1993",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -529,11 +530,11 @@
"nvim_plugin-catppuccin/nvim": { "nvim_plugin-catppuccin/nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1764084803, "lastModified": 1765701669,
"narHash": "sha256-ds+Rm9H00s++RC1dH4OQpCg1FXSm4HuwDGzr4ah0YBU=", "narHash": "sha256-8GKpGGdeBwxuMrheojyl162CzUntRcq9AktQVmKbpuI=",
"owner": "catppuccin", "owner": "catppuccin",
"repo": "nvim", "repo": "nvim",
"rev": "ce4a8e0d5267e67056f9f4dcf6cb1d0933c8ca00", "rev": "ce8d176faa4643e026e597ae3c31db59b63cef09",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -545,11 +546,11 @@
"nvim_plugin-chrisgrieser/nvim-early-retirement": { "nvim_plugin-chrisgrieser/nvim-early-retirement": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1764104935, "lastModified": 1766186911,
"narHash": "sha256-mvs0uIoxidy3jfC6oymwhaZVRbJrW+/kuMcIpR8TI6M=", "narHash": "sha256-COYpFOZTMGpZVfSJFMix/6TM5Eeemngcx1iukMa2nDE=",
"owner": "chrisgrieser", "owner": "chrisgrieser",
"repo": "nvim-early-retirement", "repo": "nvim-early-retirement",
"rev": "cd29cf40af7473530a8598245ba1d348fd5e1fa0", "rev": "86edd80026e4eea2cef7d1e5dadcf34432e6098d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -577,11 +578,11 @@
"nvim_plugin-folke/lazy.nvim": { "nvim_plugin-folke/lazy.nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1762421181, "lastModified": 1765971162,
"narHash": "sha256-h5404njTAfqMJFQ3MAr2PWSbV81eS4aIs0cxAXkT0EM=", "narHash": "sha256-5A4kducPwKb5fKX4oSUFvo898P0dqfsqqLxFaXBsbQY=",
"owner": "folke", "owner": "folke",
"repo": "lazy.nvim", "repo": "lazy.nvim",
"rev": "85c7ff3711b730b4030d03144f6db6375044ae82", "rev": "306a05526ada86a7b30af95c5cc81ffba93fef97",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -689,11 +690,11 @@
"nvim_plugin-j-hui/fidget.nvim": { "nvim_plugin-j-hui/fidget.nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1761243883, "lastModified": 1766143069,
"narHash": "sha256-XXTeJweQRIsC/WFhFxFbepOETV8e5Wfmh513su2Wve0=", "narHash": "sha256-uy2Z6vn9UYDN7Dr7iuiTrualRQdmUT0dwHP/eZXA/uA=",
"owner": "j-hui", "owner": "j-hui",
"repo": "fidget.nvim", "repo": "fidget.nvim",
"rev": "e32b672d8fd343f9d6a76944fedb8c61d7d8111a", "rev": "64463022a1f2ff1318ab22a2ea4125ed9313a483",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -801,11 +802,11 @@
"nvim_plugin-mfussenegger/nvim-lint": { "nvim_plugin-mfussenegger/nvim-lint": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1763729870, "lastModified": 1766127989,
"narHash": "sha256-9fIZPUZhnQEHJtvboCs+A2QXo4UMTFejuHNagDkfkRk=", "narHash": "sha256-ysIoJ8uMAHu/OCemQ3yUYMhKIVnSDLQCvJH0SaGIOK4=",
"owner": "mfussenegger", "owner": "mfussenegger",
"repo": "nvim-lint", "repo": "nvim-lint",
"rev": "d1118791070d090777398792a73032a0ca5c79ff", "rev": "7a64f4067065c16a355d40d0d599b8ca6b25de6d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -817,11 +818,11 @@
"nvim_plugin-mrcjkb/rustaceanvim": { "nvim_plugin-mrcjkb/rustaceanvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1764542305, "lastModified": 1766276825,
"narHash": "sha256-t7xAQ9sczLyA1zODmD+nEuWuLnhrfSOoPu/4G/YTGdU=", "narHash": "sha256-dcXnh5SYPh1VRctTuCnuVPKFQuAI4XEvQasolCOv+Xw=",
"owner": "mrcjkb", "owner": "mrcjkb",
"repo": "rustaceanvim", "repo": "rustaceanvim",
"rev": "6c3785d6a230bec63f70c98bf8e2842bed924245", "rev": "0fa0462a2d6c9629e0bd03d1902e6a1472ceac3e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -833,11 +834,11 @@
"nvim_plugin-neovim/nvim-lspconfig": { "nvim_plugin-neovim/nvim-lspconfig": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1764477618, "lastModified": 1766443238,
"narHash": "sha256-IpVDEOr//Jy+r3Z5Qo8nxDa3fNO+BTBKzAmbqvxtCQE=", "narHash": "sha256-P95gPOwJ+rRofLb8iV5UOnh26to1I3sFrWGlGxHyz1M=",
"owner": "neovim", "owner": "neovim",
"repo": "nvim-lspconfig", "repo": "nvim-lspconfig",
"rev": "effe4bf2e1afb881ea67291c648b68dd3dfc927a", "rev": "b34c08e0ea22bac67798f00238318fd16bd99b7c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -945,11 +946,11 @@
"nvim_plugin-nvim-telescope/telescope.nvim": { "nvim_plugin-nvim-telescope/telescope.nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1764418954, "lastModified": 1766268405,
"narHash": "sha256-e6XSJRv4KB0z+nzGWmlV/YZNwWsyrrpQTloePRKWmw4=", "narHash": "sha256-O1rUiVKpDSvKMkZMFaEd8/ACcSgO/lfa1+Hc8uHbFOI=",
"owner": "nvim-telescope", "owner": "nvim-telescope",
"repo": "telescope.nvim", "repo": "telescope.nvim",
"rev": "e69b434b968a33815e2f02a5c7bd7b8dd4c7d4b2", "rev": "e709d31454ee6e6157f0537f861f797bd44c0bad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -961,11 +962,11 @@
"nvim_plugin-nvim-tree/nvim-tree.lua": { "nvim_plugin-nvim-tree/nvim-tree.lua": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1764713359, "lastModified": 1766192360,
"narHash": "sha256-dSaO5esPKj1y4vNyLb3AK9egmFJsmWxkGOT+etJsbRA=", "narHash": "sha256-Br+r9f/2o0AkewnGm7kFNfl3uYm1Akkklof0Sm5AL2M=",
"owner": "nvim-tree", "owner": "nvim-tree",
"repo": "nvim-tree.lua", "repo": "nvim-tree.lua",
"rev": "59088b96a32ea47caf4976e164dbd88b86447fb7", "rev": "b8b44b6a2494d086a9177251a119f9daec6cace8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -977,11 +978,11 @@
"nvim_plugin-nvim-tree/nvim-web-devicons": { "nvim_plugin-nvim-tree/nvim-web-devicons": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1761440007, "lastModified": 1766287594,
"narHash": "sha256-klBjUtj0AvarN5a6O8Hh2t5BuOTe/m3ps2cHnlxVJvE=", "narHash": "sha256-ZdFRd0//C0Lle4cYIoAHBdz/yvQqmeylLNwvSifaWm4=",
"owner": "nvim-tree", "owner": "nvim-tree",
"repo": "nvim-web-devicons", "repo": "nvim-web-devicons",
"rev": "8dcb311b0c92d460fac00eac706abd43d94d68af", "rev": "6788013bb9cb784e606ada44206b0e755e4323d7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -993,11 +994,11 @@
"nvim_plugin-nvim-treesitter/nvim-treesitter-context": { "nvim_plugin-nvim-treesitter/nvim-treesitter-context": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1762769683, "lastModified": 1765030629,
"narHash": "sha256-ICwAUXKngSPsJ6VV+84KUPqtAwlGPrm4FIf9ioisiz8=", "narHash": "sha256-3NtwOA9d2ezLoo7qnzKAr6gwEdcpUqLc7ou4QI+9rDY=",
"owner": "nvim-treesitter", "owner": "nvim-treesitter",
"repo": "nvim-treesitter-context", "repo": "nvim-treesitter-context",
"rev": "660861b1849256398f70450afdf93908d28dc945", "rev": "64dd4cf3f6fd0ab17622c5ce15c91fc539c3f24a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1105,11 +1106,11 @@
"nvim_plugin-stevearc/conform.nvim": { "nvim_plugin-stevearc/conform.nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1764743081, "lastModified": 1766346125,
"narHash": "sha256-qCjrMt3fsRbLr/iM7nFHG7oKtyTTGcse4/cJbm3odJE=", "narHash": "sha256-Pp4bGTlZEqxHoHqVCEekDdg2jvNayxAuBReK4HJ6yGg=",
"owner": "stevearc", "owner": "stevearc",
"repo": "conform.nvim", "repo": "conform.nvim",
"rev": "ffe26e8df8115c9665d24231f8a49fadb2d611ce", "rev": "5420c4b5ea0aeb99c09cfbd4fd0b70d257b44f25",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1217,11 +1218,11 @@
"nvim_plugin-zbirenbaum/copilot.lua": { "nvim_plugin-zbirenbaum/copilot.lua": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1764638966, "lastModified": 1766207702,
"narHash": "sha256-wQ6SfAunVMd5tNeM7RMvrfPC2ELRibyEQboVQlU/fBs=", "narHash": "sha256-879050VUJpWBrHxUA3hRpcYbn3KgBGpVpKLdSVOwbIA=",
"owner": "zbirenbaum", "owner": "zbirenbaum",
"repo": "copilot.lua", "repo": "copilot.lua",
"rev": "881f99b827d65b41f522eecc21b112cf518028ac", "rev": "e78d1ffebdf6ccb6fd8be4e6898030c1cf5f9b64",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1236,11 +1237,11 @@
}, },
"locked": { "locked": {
"dir": "flakes/opencode", "dir": "flakes/opencode",
"lastModified": 1766426360, "lastModified": 1767572382,
"narHash": "sha256-QcCko39bjdoSLezpfj4+/HGCyC/XDaomt17Rb8/cG1E=", "narHash": "sha256-oDoVrmMpww4uY3Ez1XzrHsxJTZmBMiOO/mNrU2njiWQ=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "286f8a1687dd1b2b8c383942a8ee25d8350de892", "rev": "165f87ebc19a48b56008738d01c5e2e5bebbbdfd",
"revCount": 967, "revCount": 1038,
"type": "git", "type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
}, },
@ -1255,11 +1256,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1766426038, "lastModified": 1767556352,
"narHash": "sha256-3TxsJjL5M83q9nOa4ls6rWfbECYUE6llzBAgqCYQml8=", "narHash": "sha256-iYP/fa9guprb2hn8ONJrJe6U076zbeKHdqyyL0gvH8s=",
"owner": "sst", "owner": "sst",
"repo": "opencode", "repo": "opencode",
"rev": "6baee0791f48bcf32eef1e199d0cadca57772b9b", "rev": "c545fa2a289518fda35be66d1c81936a54962702",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1383,11 +1384,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1765641080, "lastModified": 1767195473,
"narHash": "sha256-AyPi7rZVfjTjQrhPHP+ugpVY8tcUzF3Lw1RjACuxAms=", "narHash": "sha256-xL3DZSWiNSvW58LsJwFIpQ9i3Vs5uaYUjbL60rpFxPk=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "224ad4e3ecd9421c7469c4f06ff5faf7f6e8bedb", "rev": "88e86b5a7d40697ade905f534dcd5372a67b8102",
"revCount": 325, "revCount": 328,
"type": "git", "type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/nvim" "url": "https://git.joshuabell.xyz/ringofstorms/nvim"
}, },
@ -1404,11 +1405,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1764729618, "lastModified": 1766457837,
"narHash": "sha256-z4RA80HCWv2los1KD346c+PwNPzMl79qgl7bCVgz8X0=", "narHash": "sha256-aeBbkQ0HPFNOIsUeEsXmZHXbYq4bG8ipT9JRlCcKHgU=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "52764074a85145d5001bf0aa30cb71936e9ad5b8", "rev": "2c7510a559416d07242621d036847152d970612b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1445,11 +1446,11 @@
}, },
"locked": { "locked": {
"dir": "flakes/secrets", "dir": "flakes/secrets",
"lastModified": 1766426360, "lastModified": 1767572382,
"narHash": "sha256-QcCko39bjdoSLezpfj4+/HGCyC/XDaomt17Rb8/cG1E=", "narHash": "sha256-oDoVrmMpww4uY3Ez1XzrHsxJTZmBMiOO/mNrU2njiWQ=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "286f8a1687dd1b2b8c383942a8ee25d8350de892", "rev": "165f87ebc19a48b56008738d01c5e2e5bebbbdfd",
"revCount": 967, "revCount": 1038,
"type": "git", "type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
}, },

10
hosts/oren/flake.nix
View file

@ -69,11 +69,9 @@
secrets.nixosModules.default secrets.nixosModules.default
ros_neovim.nixosModules.default ros_neovim.nixosModules.default
( ({
{
ringofstorms-nvim.includeAllRuntimeDependencies = true; ringofstorms-nvim.includeAllRuntimeDependencies = true;
} })
)
inputs.opencode.nixosModules.default inputs.opencode.nixosModules.default
flatpaks.nixosModules.default flatpaks.nixosModules.default
@ -92,6 +90,7 @@
common.nixosModules.tty_caps_esc common.nixosModules.tty_caps_esc
common.nixosModules.zsh common.nixosModules.zsh
common.nixosModules.more_filesystems common.nixosModules.more_filesystems
common.nixosModules.remote_lio_builds
beszel.nixosModules.agent beszel.nixosModules.agent
({ ({
@ -99,8 +98,7 @@
listen = "${overlayIp}:45876"; listen = "${overlayIp}:45876";
token = "f8a54c41-486b-487a-a78d-a087385c317b"; token = "f8a54c41-486b-487a-a78d-a087385c317b";
}; };
} })
)
./configuration.nix ./configuration.nix
./hardware-configuration.nix ./hardware-configuration.nix