erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions

Compare commits

base: erwin:0556eb36727742f2bb15c258947d880275f2e0b6
Branches Tags
erwin:main
..
compare: erwin:77fbd667072d29bd5c7cc8036dbe5120853b8923
Branches Tags
erwin:main

No commits in common. "0556eb36727742f2bb15c258947d880275f2e0b6" and "77fbd667072d29bd5c7cc8036dbe5120853b8923" have entirely different histories.
0556eb3672 ... 77fbd66707

3 changed files with 98 additions and 35 deletions
Show stats Expand all files Collapse all files

107
flake.lock
View file

@ -54,11 +54,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714399199, "lastModified": 1714038124,
"narHash": "sha256-x3t7p0zXyd6NNKHi3XckhdoMuRUe+MxG97JhuS5RLVE=", "narHash": "sha256-QfWxEMZwwzXtOic6eiUQI4fuUiuXP9dsSWrCf8r0/x8=",
"owner": "atuinsh", "owner": "atuinsh",
"repo": "atuin", "repo": "atuin",
"rev": "cea48a1545250429b78235b2ad00b8243923e2b2", "rev": "fc5522f45ef0735fb3b492329f95770203d21a7f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -160,7 +160,7 @@
}, },
"crane_3": { "crane_3": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_5", "flake-compat": "flake-compat_6",
"flake-utils": [ "flake-utils": [
"ha-now-playing", "ha-now-playing",
"flake-utils" "flake-utils"
@ -188,6 +188,30 @@
"type": "github" "type": "github"
} }
}, },
"deploy-rs": {
"inputs": {
"flake-compat": "flake-compat_4",
"nixpkgs": [
"nixpkgs"
],
"utils": [
"flake-utils"
]
},
"locked": {
"lastModified": 1711973905,
"narHash": "sha256-UFKME/N1pbUtn+2Aqnk+agUt8CekbpuqwzljivfIme8=",
"owner": "serokell",
"repo": "deploy-rs",
"rev": "88b3059b020da69cbe16526b8d639bd5e0b51c8b",
"type": "github"
},
"original": {
"owner": "serokell",
"repo": "deploy-rs",
"type": "github"
}
},
"disko": { "disko": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -195,11 +219,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714405407, "lastModified": 1714103775,
"narHash": "sha256-h3pOvHCXkSdp1KOZqtkQmHgkR7VaOJXDhqhumk7sZLY=", "narHash": "sha256-kcBiIrmqzt3bNTr2GMBfAyA+on8BEKO1iKzzDFQZkjI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "5eaf747af38dd272e1ab28a8ec4bd972424b07cf", "rev": "285e26465a0bae510897ca04da26ce6307c652b4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -219,11 +243,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1714441624, "lastModified": 1714121587,
"narHash": "sha256-g4rDy84zObNUXmDyhXn66ro9fhpVnHg4lVQl0eZUKyY=", "narHash": "sha256-mXwE5H5JJxi1c2c8nwjiyMRGy9UYgNPSJ2caJDxbGgk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "2bdab12a3077f6f25be03d93569a06a177425c47", "rev": "40463aaa81fc44a2908716ca79d29c16c5fef81b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -234,7 +258,7 @@
}, },
"eww": { "eww": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_5",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
@ -321,6 +345,22 @@
} }
}, },
"flake-compat_5": { "flake-compat_5": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_6": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696267196, "lastModified": 1696267196,
@ -336,7 +376,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_6": { "flake-compat_7": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
@ -352,7 +392,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_7": { "flake-compat_8": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
@ -563,11 +603,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714430505, "lastModified": 1714042918,
"narHash": "sha256-SSJQ/KOy8uISnoZgqDoRha7g7PFLSFP/BtMWm0wUz8Q=", "narHash": "sha256-4AItZA3EQIiSNAxliuYEJumw/LaVfrMv84gYyrs0r3U=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f8e6694edabe4aaa7a85aac47b43ea5d978b116d", "rev": "0c5704eceefcb7bb238a958f532a86e3b59d76db",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -648,18 +688,18 @@
}, },
"nix-ld-rs": { "nix-ld-rs": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_6", "flake-compat": "flake-compat_7",
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_4",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1714253190, "lastModified": 1713589173,
"narHash": "sha256-+9BSaBDbz3N65KgFhyJLXsIazYmpA4CUVcL4u29BIC0=", "narHash": "sha256-8LBvfDbnuPMrF43bmejUZwD9TuP081iuG1nLl8m0jM4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-ld-rs", "repo": "nix-ld-rs",
"rev": "d5939e6da59ea8a55b47ea48ce212f602a4fa59b", "rev": "c4f56b515ed0bf8c2cd4d6a13224067017a6dc39",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -670,11 +710,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1714201532, "lastModified": 1713864415,
"narHash": "sha256-nk0W4rH7xYdDeS7k1SqqNtBaNrcgIBYNmOVc8P2puEY=", "narHash": "sha256-/BPDMJEkrsFAFOsQWhwm31wezlgshPFlLBn34KEUdVA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "53db5e1070d07e750030bf65f1b9963df8f0c678", "rev": "797f8d8082c7cc3259cba7275c699d4991b09ecc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -735,11 +775,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1714272655, "lastModified": 1713995372,
"narHash": "sha256-3/ghIWCve93ngkx5eNPdHIKJP/pMzSr5Wc4rNKE1wOc=", "narHash": "sha256-fFE3M0vCoiSwCX02z8VF58jXFRj9enYUSTqjyHAjrds=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "12430e43bd9b81a6b4e79e64f87c624ade701eaf", "rev": "dd37924974b9202f8226ed5d74a252a9785aedf8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -783,11 +823,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1714253743, "lastModified": 1714076141,
"narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -827,7 +867,7 @@
}, },
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_7", "flake-compat": "flake-compat_8",
"flake-utils": [ "flake-utils": [
"flake-utils" "flake-utils"
], ],
@ -858,6 +898,7 @@
"atuin": "atuin", "atuin": "atuin",
"caddy-with-plugins": "caddy-with-plugins", "caddy-with-plugins": "caddy-with-plugins",
"colmena": "colmena", "colmena": "colmena",
"deploy-rs": "deploy-rs",
"disko": "disko", "disko": "disko",
"emacs-overlay": "emacs-overlay", "emacs-overlay": "emacs-overlay",
"eww": "eww", "eww": "eww",
@ -914,11 +955,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714443211, "lastModified": 1714097613,
"narHash": "sha256-lKTA3XqRo4aVgkyTSCtpcALpGXdmkilHTtN00eRg0QU=", "narHash": "sha256-044xbpBszupqN3nl/CGOCJtTQ4O6Aca81mJpX45i8/I=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "ce35c36f58f82cee6ec959e0d44c587d64281b6f", "rev": "2a42c742ab04b61d9b2f1edf392842cf9f27ebfd",
"type": "github" "type": "github"
}, },
"original": { "original": {

23
flake.nix
View file

@ -106,6 +106,12 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
deploy-rs = {
url = "github:serokell/deploy-rs";
inputs.nixpkgs.follows = "nixpkgs";
inputs.utils.follows = "flake-utils";
};
atuin = { atuin = {
url = "github:atuinsh/atuin"; url = "github:atuinsh/atuin";
inputs = { inputs = {
@ -197,6 +203,22 @@
}) (builtins.attrNames machines) }) (builtins.attrNames machines)
); );
deploy = {
nodes = {
neo = {
hostname = "10.0.0.213";
profiles = {
system = {
path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.neo;
};
};
};
};
sshUser = "erwin";
user = "root";
sshOpts = [ "-t" ];
};
colmena = colmena =
{ {
meta = { meta = {
@ -293,6 +315,7 @@
packages = [ packages = [
age age
config.packages.git-repo-go config.packages.git-repo-go
inputs'.deploy-rs.packages.deploy-rs
inputs'.colmena.packages.colmena inputs'.colmena.packages.colmena
just just
lswt lswt

3
machines/default.nix
View file

@ -50,8 +50,7 @@ inputs: {
config = import ./k3s-test/configuration.nix inputs; config = import ./k3s-test/configuration.nix inputs;
deploy = { deploy = {
# host = "10.0.0.167"; # host = "10.0.0.167";
# host = "10.0.0.208"; host = "10.0.0.208";
host = "k3s-test.barn-beaver.ts.net";
targetUser = "erwin"; targetUser = "erwin";
tags = [ "container" ]; tags = [ "container" ];
}; };