diff options
| author | Devin Finlinson <devin.finlinson@pm.me> | 2026-09-23 13:37:50 -0600 |
|---|---|---|
| committer | Devin Finlinson <devin.finlinson@pm.me> | 2026-09-23 13:37:50 -0600 |
| commit | d4fa3a3658f08292b9ea59df47354ff6bc996e26 (patch) | |
| tree | a70892c1ed890546c838c1a5cf8a652951ee4de4 | |
| parent | aad428954749e0d2cce593a7807039dc508c2a94 (diff) | |
| parent | a4788434a1a9c8ec3afe89031f08540e36060a8c (diff) | |
Merge branch 'master' of ssh://bosco:/srv/git/.flake
| -rw-r--r-- | home-manager/home.nix | 2 | ||||
| -rw-r--r-- | modules/nixos/environment.nix | 1 | ||||
| -rw-r--r-- | modules/nixos/minecraft-server.nix | 8 | ||||
| -rw-r--r-- | modules/users/defin.nix | 2 | ||||
| -rw-r--r-- | modules/users/root.nix | 1 |
5 files changed, 12 insertions, 2 deletions
diff --git a/home-manager/home.nix b/home-manager/home.nix index fa8e425..77b16a0 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -74,7 +74,7 @@ in { # unstable.yt-dlp yt-dlp # telegram-desktop - obsidian + # obsidian zettlr signal-desktop # texlive-combined-full diff --git a/modules/nixos/environment.nix b/modules/nixos/environment.nix index 7733123..b37c468 100644 --- a/modules/nixos/environment.nix +++ b/modules/nixos/environment.nix @@ -7,6 +7,7 @@ sessionVariables = { NIXOS_OZONE_WL = "1"; NIXPKGS_ALLOW_INSECURE = "1"; + NIXPKGS_ALLOW_UNFREE = "1"; }; variables = { # PATH = "/home/defin/.local/share/gem/ruby/3.0.0/bin:"; diff --git a/modules/nixos/minecraft-server.nix b/modules/nixos/minecraft-server.nix index f069b63..a554f8d 100644 --- a/modules/nixos/minecraft-server.nix +++ b/modules/nixos/minecraft-server.nix @@ -43,12 +43,18 @@ in { imports = [ inputs.modded-minecraft-servers.module - # inputs.nix-minecraft.nixosModules.minecraft-servers + inputs.nix-minecraft.nixosModules.minecraft-servers ]; # services.minecraft-servers = { # enable = true; # eula = true; # openFirewall = true; + # servers.wizard-full-scale = { + # enable = true; + # serverProperties = defaults // { + # server-port = + # }; + # }; # servers.deceasedcraft-beta = { # enable = true; # package = pkgs.neoforgeServers.neoforge-1_20_1; diff --git a/modules/users/defin.nix b/modules/users/defin.nix index 44257b7..6f679e2 100644 --- a/modules/users/defin.nix +++ b/modules/users/defin.nix @@ -26,10 +26,12 @@ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILuW75N5K0/83bOgsB/yymgIHoQgaaAJjW9MMDG9s/2p defin@picast2" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPAIiqA0KTtC3QRKGc02o7mFT3S2npIcDs8Zz1Tqlsn+ defin@perkunas" # keys for remote build + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPLx3RgUgbE7THS7hRZypyudEKffj0ppwQfQuxIpPf8H root@zenbook" ]; }; }; + security.sudo.wheelNeedsPassword = false; # nix.settings.trusted-users = [ "@builders" ]; security.pam = { sshAgentAuth.enable = true; diff --git a/modules/users/root.nix b/modules/users/root.nix index f826b77..c1bbdac 100644 --- a/modules/users/root.nix +++ b/modules/users/root.nix @@ -4,6 +4,7 @@ users = { users.root = { hashedPassword = "$y$j9T$YtRkFL3JLAB/zfyr89aFp.$of1IUt84c2i26l6GQWHO2qX0dNiPDZgVGpaNPVyAs24"; + openssh.authorizedKeys.keys = config.users.users.defin.openssh.authorizedKeys.keys; }; }; services.openssh.settings.PasswordAuthentication = false; |