From 55af1f0e06a6da2f5decd522aea15b68447fd471 Mon Sep 17 00:00:00 2001 From: pazpi Date: Tue, 27 Aug 2024 11:23:24 +0200 Subject: [PATCH] format code --- hosts/arr/default.nix | 42 ++++++-------------------------- modules/default.nix | 3 --- modules/desktop/desktop-user.nix | 6 +---- modules/systems/default.nix | 6 +---- modules/utils/default.nix | 1 + 5 files changed, 10 insertions(+), 48 deletions(-) diff --git a/hosts/arr/default.nix b/hosts/arr/default.nix index eccc9ca..9a28b57 100644 --- a/hosts/arr/default.nix +++ b/hosts/arr/default.nix @@ -12,7 +12,7 @@ let defaultLocale = "en_US.UTF-8"; in { - + commons.enable = true; proxmox.enable = true; @@ -63,43 +63,15 @@ in services = { openssh.enable = true; - # tailscale = { - # enable = false; - # useRoutingFeatures = "both"; - # extraUpFlags = [ "--exit-node=${parameters.tailscaleExitNodeIP}" ]; - # authKeyFile = builtins.toFile "authKey" ''${parameters.tailscaleAuthKey}''; - # }; + }; + + tailscale = { + enable = false; + exitNode = "vps"; + # authKeyFile = builtins.toFile "authKey" ''${parameters.tailscaleAuthKey}''; }; time.timeZone = timeZone; - users = { - - # If set to false, the contents of the user and group files will simply - # be replaced on system activation. - # This also holds for the user passwords. - # All changed passwords will be reset according - # to the `users.users` configuration on activation. - mutableUsers = false; - - users.root = { - hashedPassword = "!"; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDhiGLc/whCY3lCmDiRlYnMJOLiO/gvcRj/sKVEFVAhQ pazpi@deadbeef" - ]; - }; - - users.pazpi = { - isNormalUser = true; - hashedPassword = "$y$j9T$oWLCV1hnGPyOGabMfAS3p1$/iwouRZGwQXcv6IHnLuT3I9.pmeXNpcHxq.b8xfitr1"; - shell = pkgs.bash; - extraGroups = [ "wheel" ]; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDhiGLc/whCY3lCmDiRlYnMJOLiO/gvcRj/sKVEFVAhQ pazpi@deadbeef" - ]; - }; - - }; - system.stateVersion = "24.05"; } diff --git a/modules/default.nix b/modules/default.nix index 328d40d..b0b86ed 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -7,8 +7,5 @@ ./systems ./utils ./virtualisation - - # Files - ./btrfs-autoscrub.nix ]; } diff --git a/modules/desktop/desktop-user.nix b/modules/desktop/desktop-user.nix index e784d4e..b1e4102 100644 --- a/modules/desktop/desktop-user.nix +++ b/modules/desktop/desktop-user.nix @@ -52,11 +52,7 @@ in shell = pkgs.zsh; uid = 1000; - packages = - with pkgs; - lib.mkIf cfg.flatpak [ - flatpak - ]; + packages = with pkgs; lib.mkIf cfg.flatpak [ flatpak ]; }; console.keyMap = "it"; diff --git a/modules/systems/default.nix b/modules/systems/default.nix index e1ef8b6..f88c8a6 100644 --- a/modules/systems/default.nix +++ b/modules/systems/default.nix @@ -1,5 +1 @@ -{ - imports = [ - ./btrfs-autoscrub.nix - ] -} \ No newline at end of file +{ imports = [ ./btrfs-autoscrub.nix ]; } diff --git a/modules/utils/default.nix b/modules/utils/default.nix index cc507b8..feae744 100644 --- a/modules/utils/default.nix +++ b/modules/utils/default.nix @@ -1,5 +1,6 @@ { imports = [ ./commons.nix + ./server-node-users.nix ]; }