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

Compare commits

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

4 commits
77fbd66707 ... 0556eb3672

Author SHA1 Message Date
Erwin Boskma
0556eb3672
k3s-test: Deploy over Tailscale 2024-04-30 10:25:47 +02:00
Erwin Boskma
00b019ed04
deploy-rs currently does not work over Tailscale 
Neither does nixos-rebuild by the way
 2024-04-30 10:25:45 +02:00
Erwin Boskma
74836abda9
flake.lock: Update 
Flake lock file updates:

• Updated input 'atuin':
    'github:atuinsh/atuin/36ddd98b6ef86af9b00d93d28476900b07be34ac?narHash=sha256-o3MQNItFgGrpAoBpDwJIeHkIxTPQT9QR6AcGTeeIkK4%3D' (2024-04-26)
  → 'github:atuinsh/atuin/cea48a1545250429b78235b2ad00b8243923e2b2?narHash=sha256-x3t7p0zXyd6NNKHi3XckhdoMuRUe%2BMxG97JhuS5RLVE%3D' (2024-04-29)
• Updated input 'disko':
    'github:nix-community/disko/285e26465a0bae510897ca04da26ce6307c652b4?narHash=sha256-kcBiIrmqzt3bNTr2GMBfAyA%2Bon8BEKO1iKzzDFQZkjI%3D' (2024-04-26)
  → 'github:nix-community/disko/5eaf747af38dd272e1ab28a8ec4bd972424b07cf?narHash=sha256-h3pOvHCXkSdp1KOZqtkQmHgkR7VaOJXDhqhumk7sZLY%3D' (2024-04-29)
• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/175801574b4bafe2ce03d6d0ae0e69b47e3ac805?narHash=sha256-XV%2Bai9ezP2d%2BUa3p%2BNF5ulYBZuv3i9KZCHr9Y2mh1lc%3D' (2024-04-29)
  → 'github:nix-community/emacs-overlay/2bdab12a3077f6f25be03d93569a06a177425c47?narHash=sha256-g4rDy84zObNUXmDyhXn66ro9fhpVnHg4lVQl0eZUKyY%3D' (2024-04-30)
• Updated input 'home-manager':
    'github:nix-community/home-manager/9fe79591c1005ce6f93084ae7f7dab0a2891440d?narHash=sha256-OzD1P0o46uD3Ix4ZI/g9z3YAeg%2B4g%2BW3qctB6bNOReo%3D' (2024-04-28)
  → 'github:nix-community/home-manager/f8e6694edabe4aaa7a85aac47b43ea5d978b116d?narHash=sha256-SSJQ/KOy8uISnoZgqDoRha7g7PFLSFP/BtMWm0wUz8Q%3D' (2024-04-29)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/d9b44509b4064f0a3fc9c7c92a603861f52fbedc?narHash=sha256-W6Mss7AG6bnFT1BqRApHXvLXBrFOu7V0%2BEUe9iML30s%3D' (2024-04-29)
  → 'github:oxalica/rust-overlay/ce35c36f58f82cee6ec959e0d44c587d64281b6f?narHash=sha256-lKTA3XqRo4aVgkyTSCtpcALpGXdmkilHTtN00eRg0QU%3D' (2024-04-30)
 2024-04-30 09:23:12 +02:00
Erwin Boskma
d596078372
flake.lock: Update 
Flake lock file updates:

• Updated input 'atuin':
    'github:atuinsh/atuin/fc5522f45ef0735fb3b492329f95770203d21a7f?narHash=sha256-QfWxEMZwwzXtOic6eiUQI4fuUiuXP9dsSWrCf8r0/x8%3D' (2024-04-25)
  → 'github:atuinsh/atuin/36ddd98b6ef86af9b00d93d28476900b07be34ac?narHash=sha256-o3MQNItFgGrpAoBpDwJIeHkIxTPQT9QR6AcGTeeIkK4%3D' (2024-04-26)
• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/40463aaa81fc44a2908716ca79d29c16c5fef81b?narHash=sha256-mXwE5H5JJxi1c2c8nwjiyMRGy9UYgNPSJ2caJDxbGgk%3D' (2024-04-26)
  → 'github:nix-community/emacs-overlay/175801574b4bafe2ce03d6d0ae0e69b47e3ac805?narHash=sha256-XV%2Bai9ezP2d%2BUa3p%2BNF5ulYBZuv3i9KZCHr9Y2mh1lc%3D' (2024-04-29)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/dd37924974b9202f8226ed5d74a252a9785aedf8?narHash=sha256-fFE3M0vCoiSwCX02z8VF58jXFRj9enYUSTqjyHAjrds%3D' (2024-04-24)
  → 'github:NixOS/nixpkgs/12430e43bd9b81a6b4e79e64f87c624ade701eaf?narHash=sha256-3/ghIWCve93ngkx5eNPdHIKJP/pMzSr5Wc4rNKE1wOc%3D' (2024-04-28)
• Updated input 'home-manager':
    'github:nix-community/home-manager/0c5704eceefcb7bb238a958f532a86e3b59d76db?narHash=sha256-4AItZA3EQIiSNAxliuYEJumw/LaVfrMv84gYyrs0r3U%3D' (2024-04-25)
  → 'github:nix-community/home-manager/9fe79591c1005ce6f93084ae7f7dab0a2891440d?narHash=sha256-OzD1P0o46uD3Ix4ZI/g9z3YAeg%2B4g%2BW3qctB6bNOReo%3D' (2024-04-28)
• Updated input 'nix-ld-rs':
    'github:nix-community/nix-ld-rs/c4f56b515ed0bf8c2cd4d6a13224067017a6dc39?narHash=sha256-8LBvfDbnuPMrF43bmejUZwD9TuP081iuG1nLl8m0jM4%3D' (2024-04-20)
  → 'github:nix-community/nix-ld-rs/d5939e6da59ea8a55b47ea48ce212f602a4fa59b?narHash=sha256-%2B9BSaBDbz3N65KgFhyJLXsIazYmpA4CUVcL4u29BIC0%3D' (2024-04-27)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/797f8d8082c7cc3259cba7275c699d4991b09ecc?narHash=sha256-/BPDMJEkrsFAFOsQWhwm31wezlgshPFlLBn34KEUdVA%3D' (2024-04-23)
  → 'github:NixOS/nixos-hardware/53db5e1070d07e750030bf65f1b9963df8f0c678?narHash=sha256-nk0W4rH7xYdDeS7k1SqqNtBaNrcgIBYNmOVc8P2puEY%3D' (2024-04-27)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856?narHash=sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY%3D' (2024-04-25)
  → 'github:nixos/nixpkgs/58a1abdbae3217ca6b702f03d3b35125d88a2994?narHash=sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc%3D' (2024-04-27)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/2a42c742ab04b61d9b2f1edf392842cf9f27ebfd?narHash=sha256-044xbpBszupqN3nl/CGOCJtTQ4O6Aca81mJpX45i8/I%3D' (2024-04-26)
  → 'github:oxalica/rust-overlay/d9b44509b4064f0a3fc9c7c92a603861f52fbedc?narHash=sha256-W6Mss7AG6bnFT1BqRApHXvLXBrFOu7V0%2BEUe9iML30s%3D' (2024-04-29)
 2024-04-29 08:30:16 +02:00
3 changed files with 35 additions and 98 deletions
Show stats Expand all files Collapse all files

107
flake.lock
View file

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

23
flake.nix
View file

@ -106,12 +106,6 @@
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 = {
@ -203,22 +197,6 @@
}) (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 = {
@ -315,7 +293,6 @@
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,7 +50,8 @@ 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" ];
}; };