aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2024-12-31 11:02:46 +0100
committerKarel Kočí <cynerd@email.cz>2024-12-31 11:02:46 +0100
commit08b01b7ff77a60c11cc7df44d564091e873c7abd (patch)
treef1d5ac456da2e1764a6fff5c3ace3c97d89482bb
parent3fa889d41893ae35abb9801ccc1b60701459cc15 (diff)
downloadnixos-personal-08b01b7ff77a60c11cc7df44d564091e873c7abd.tar.gz
nixos-personal-08b01b7ff77a60c11cc7df44d564091e873c7abd.tar.bz2
nixos-personal-08b01b7ff77a60c11cc7df44d564091e873c7abd.zip
nixos: remove albert and old openvpn
I am now using only wireguard and Albert is effectively dead as I am no longer using that laptop.
-rw-r--r--flake.lock8
-rw-r--r--nixos/configurations/albert.nix41
-rw-r--r--nixos/configurations/lipwig.nix1
-rw-r--r--nixos/modules/openvpn.nix8
4 files changed, 4 insertions, 54 deletions
diff --git a/flake.lock b/flake.lock
index 6a03b70..eaca5a2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -348,11 +348,11 @@
},
"personal-secret": {
"locked": {
- "lastModified": 1727966952,
- "narHash": "sha256-G/ofZSjuUtuTl9TYtcZHl6OyFQ6GOTx1RfiHHM5t4VY=",
+ "lastModified": 1735639306,
+ "narHash": "sha256-uGuPL2TImNjtkrGnWR0P6gLYHf8DrxSm+I/2773c2fw=",
"ref": "refs/heads/master",
- "rev": "23f6ddcf4248390fc7af9424efcef9fc6dc4257d",
- "revCount": 118,
+ "rev": "8589154e62e67b7c0c09eff0c02adab7cd18c8a9",
+ "revCount": 120,
"type": "git",
"url": "ssh://git@cynerd.cz/nixos-personal-secret"
},
diff --git a/nixos/configurations/albert.nix b/nixos/configurations/albert.nix
deleted file mode 100644
index a6a4ee1..0000000
--- a/nixos/configurations/albert.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{
- nixpkgs.hostPlatform.system = "x86_64-linux";
-
- cynerd = {
- desktop = {
- enable = true;
- laptop = true;
- };
- wifiClient = true;
- openvpn = {
- oldpersonal = true;
- };
- };
-
- boot.initrd.availableKernelModules = ["xhci_pci" "usb_storage" "sd_mod"];
-
- hardware.cpu.intel.updateMicrocode = true;
-
- fileSystems = {
- "/" = {
- device = "/dev/disk/by-uuid/1c9bafac-fcf8-41c4-b394-bca5917ca82d";
- fsType = "btrfs";
- options = ["compress=lzo" "subvol=@nix"];
- };
- "/home" = {
- device = "/dev/disk/by-uuid/1c9bafac-fcf8-41c4-b394-bca5917ca82d";
- fsType = "btrfs";
- options = ["compress=lzo" "subvol=@home"];
- };
- "/boot" = {
- device = "/dev/disk/by-uuid/E403-124B";
- fsType = "vfat";
- };
-
- "/home2" = {
- device = "/dev/disk/by-uuid/55e177a1-215e-475b-ba9c-771b5fa3f8f0";
- fsType = "btrfs";
- options = ["compress=lzo" "subvol=@home"];
- };
- };
-}
diff --git a/nixos/configurations/lipwig.nix b/nixos/configurations/lipwig.nix
index 5eadbd5..6001cc6 100644
--- a/nixos/configurations/lipwig.nix
+++ b/nixos/configurations/lipwig.nix
@@ -24,7 +24,6 @@
baseDir = "/nas";
};
wireguard = true;
- openvpn.oldpersonal = true;
borgjobs = {
postgresql.dumpCommand = pkgs.writeScript "postgreqsl-backup.sh" ''
/run/wrappers/bin/sudo -u postgres /run/current-system/sw/bin/pg_dumpall
diff --git a/nixos/modules/openvpn.nix b/nixos/modules/openvpn.nix
index 6a21721..da29dd7 100644
--- a/nixos/modules/openvpn.nix
+++ b/nixos/modules/openvpn.nix
@@ -9,11 +9,6 @@
in {
options = {
cynerd.openvpn = {
- oldpersonal = mkOption {
- type = types.bool;
- default = false;
- description = "My personal old OpenVPN";
- };
elektroline = mkOption {
type = types.bool;
default = false;
@@ -24,9 +19,6 @@ in {
config = {
services.openvpn.servers = {
- oldpersonal = mkIf cnf.oldpersonal {
- config = "config /run/secrets/old.ovpn";
- };
elektroline = mkIf cnf.elektroline {
config = "config /run/secrets/elektroline.ovpn";
up = ''