summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.nix7
-rw-r--r--machines/x1-pincer.nix2
-rw-r--r--modules/backup-server.nix28
-rw-r--r--modules/development.nix1
-rw-r--r--modules/users.nix1
5 files changed, 18 insertions, 21 deletions
diff --git a/flake.nix b/flake.nix
index 6b3338f..3f03ed5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -65,7 +65,6 @@
inherit system;
modules = (lib.attrValues self.nixosModules) ++ [
- pkgs-module
registry-module
module
nixpkgs.nixosModules.notDetected
@@ -89,9 +88,9 @@
{ hostName = "dragon"; }
{ hostName = "firelink"; }
{ hostName = "tiny1"; }
- {
- hostName = "minideck";
- }
+ # {
+ # hostName = "minideck";
+ # }
# { hostName = "testvm"; module = {
# users.users.orbekk.initialHashedPassword = "";
# }; }
diff --git a/machines/x1-pincer.nix b/machines/x1-pincer.nix
index b626ed3..fca4bab 100644
--- a/machines/x1-pincer.nix
+++ b/machines/x1-pincer.nix
@@ -16,7 +16,7 @@ let ports = {
orbekk.vpn.enable = true;
- system.autoUpgrade.enable = false;
+ system.autoUpgrade.enable = lib.mkForce false;
services.printing.enable = true;
services.printing.drivers = with pkgs; [ gutenprint brlaser ];
services.openssh.enable = true;
diff --git a/modules/backup-server.nix b/modules/backup-server.nix
index 4d9005d..de0f772 100644
--- a/modules/backup-server.nix
+++ b/modules/backup-server.nix
@@ -69,20 +69,20 @@ in {
};
services.borgbackup.repos = lib.mkIf cfg.enableServer {
- dragon = {
- authorizedKeys =
- [ (builtins.readFile ../secrets/dragon-borg-ssh-key.pub) ];
- path = [ "/var/lib/dragon" ];
- };
- breakds = {
- authorizedKeys = [ (builtins.readFile ../data/breakds.pub) ];
- path = [ "/var/lib/borg/breakds" ];
- };
- pincer = {
- authorizedKeys =
- [ (builtins.readFile ../secrets/pincer-borg-ssh-key.pub) ];
- path = [ "/var/lib/borg-pincer" ];
- };
+ # dragon = {
+ # authorizedKeys =
+ # [ (builtins.readFile ../secrets/dragon-borg-ssh-key.pub) ];
+ # path = [ "/var/lib/dragon" ];
+ # };
+ # breakds = {
+ # authorizedKeys = [ (builtins.readFile ../data/breakds.pub) ];
+ # path = [ "/var/lib/borg/breakds" ];
+ # };
+ # pincer = {
+ # authorizedKeys =
+ # [ (builtins.readFile ../secrets/pincer-borg-ssh-key.pub) ];
+ # path = [ "/var/lib/borg-pincer" ];
+ # };
};
services.borgbackup.jobs = lib.mkIf cfg.enableClient backupJobs;
diff --git a/modules/development.nix b/modules/development.nix
index 6b380db..f3ee2d1 100644
--- a/modules/development.nix
+++ b/modules/development.nix
@@ -12,7 +12,6 @@ in {
podman = {
enable = true;
dockerCompat = true;
- defaultNetwork.dnsname.enable = true;
};
};
};
diff --git a/modules/users.nix b/modules/users.nix
index ec78433..8520fdb 100644
--- a/modules/users.nix
+++ b/modules/users.nix
@@ -89,7 +89,6 @@ in {
uid = 506;
useDefaultShell = true;
home = "/storage";
- isNormalUser = true;
openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKhRj4eYL01OAboBynL05+YRrYeglZoagbqkGzgX2uJq kagee"
];