Merge branch 'master' of ssh://myrmexia.xyz:/srv/git/.flake

7 files changed, 71 insertions, 2 deletions

diff --git a/flake.lock b/flake.lock
index f51c963..8c16eb0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -987,6 +987,7 @@
         "openterface": "openterface",
         "sops-nix": "sops-nix",
         "unf": "unf",
+        "valheim-server": "valheim-server",
         "wallpapers": "wallpapers"
       }
     },
@@ -1026,6 +1027,27 @@
         "url": "https://spectrum-os.org/git/spectrum"
       }
     },
+    "steam-fetcher": {
+      "inputs": {
+        "nixpkgs": [
+          "valheim-server",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1714795926,
+        "narHash": "sha256-PkgC9jqoN6cJ8XYzTA2PlrWs7aPJkM3BGiTxNqax0cA=",
+        "owner": "nix-community",
+        "repo": "steam-fetcher",
+        "rev": "12f66eafb7862d91b3e30c14035f96a21941bd9c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "steam-fetcher",
+        "type": "github"
+      }
+    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
@@ -1106,6 +1128,27 @@
         "url": "https://git.atagen.co/atagen/unf"
       }
     },
+    "valheim-server": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "steam-fetcher": "steam-fetcher"
+      },
+      "locked": {
+        "lastModified": 1789926680,
+        "narHash": "sha256-9qmmYBCF9pIB50ktJ1XfcQ6nj9EVb5ZJ842wcwn51AA=",
+        "ref": "refs/heads/main",
+        "rev": "ea40a8d6b32f182a062e65ab6370163e66317291",
+        "revCount": 167,
+        "type": "git",
+        "url": "https://codeberg.org/Valdus/valheim-server-flake"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://codeberg.org/Valdus/valheim-server-flake"
+      }
+    },
     "wallpapers": {
       "flake": false,
       "locked": {
diff --git a/flake.nix b/flake.nix
index 67556ac..047790f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -63,6 +63,7 @@
       inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
 
+
     nix-colors.url = "github:misterio77/nix-colors";
 
     #community wayland nixpkgs
@@ -82,6 +83,11 @@
     modded-minecraft-servers.url = "github:mkaito/nixos-modded-minecraft-servers";
     nix-minecraft.url = "github:Infinidoge/nix-minecraft";
 
+    valheim-server = {
+      url = "git+https://codeberg.org/Valdus/valheim-server-flake";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     #secrets management, lock with git commit at 20xx/x/xx
     #.........
 
@@ -276,6 +282,9 @@
             nixMinecraftOpts = mkOpts "x86_64-linux" [
               inputs.nix-minecraft.nixosModules.minecraft-servers
             ] {};
+            valheimServerOpts = mkOpts "x86_64-linux" [
+              inputs.valheim-server.nixosModules.valheim
+            ] {};
             # moddedMinecraftOpts = mkOpts "x86_64-linux" [
             #   inputs.modded-minecraft-servers.module
             # ] {};
@@ -296,6 +305,12 @@
               inputs.microvm.nixosModules.microvm
               inputs.microvm.nixosModules.host
             ] {};
+            nixMinecraftOpts = mkOpts "x86_64-linux" [
+              inputs.nix-minecraft.nixosModules.minecraft-servers
+            ] {};
+            valheimServerOpts = mkOpts "x86_64-linux" [
+              inputs.valheim-server.nixosModules.default
+            ] {};
             # moddedMinecraftOpts = mkOpts "x86_64-linux" [
             #   inputs.modded-minecraft-servers.module
             # ] {};
diff --git a/home-manager/home.nix b/home-manager/home.nix
index f263917..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
@@ -145,6 +145,7 @@ in {
             microvm = "${args.microvmOpts}";
             # modded-micecraft = "${args.moddedMinecraftOpts}";
             nix-minecraft = "${args.nixMinecraftOpts}";
+            valheim = "${args.valheimServerOpts}";
           };
         };
       };
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;