Merge branch 'main' of codeberg.org:muon/home

flake.nix

@@ -82,18 +82,18 @@
           ];
         };
 
-        "muho" = { name, nodes, ... }: {
-          deployment.targetHost = "muho"; # SSH IP
-          deployment.targetUser = "muon"; # SSH username
+        # "muho" = { name, nodes, ... }: {
+        #   deployment.targetHost = "muho"; # SSH IP
+        #   deployment.targetUser = "muon"; # SSH username
 
-          # modules
-          imports = [
-            ./hosts/muho/configuration.nix
-            ./modules/nixos
-            inputs.home-manager.nixosModules.default
-            inputs.stylix.nixosModules.stylix
-          ];
-        };
+        #   # modules
+        #   imports = [
+        #     ./hosts/muho/configuration.nix
+        #     ./modules/nixos
+        #     inputs.home-manager.nixosModules.default
+        #     inputs.stylix.nixosModules.stylix
+        #   ];
+        # };
       };
     };
 }

hosts/muho/configuration.nix

@@ -1,5 +1,11 @@
 { config, lib, pkgs, inputs, system, ... }:
-let cfg = config.mods;
+let
+  cfg = config.mods;
+  keys = [
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKEio+Y5wBVD1wILaH2R3wV10FvVjiqy/4gGBWHOITTB muon@muon"
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKevYmkH7xvYoquBjnYZ7PJiVqf+GOh9fxAJBN6wZGBB gin4@hi.is"
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILmAOd9VbhyJeibt6Vrb101MNTk5W8+rh94Djv/C+pyu muon@muho"
+  ];
 in {
   # Hardware
   imports = [ ./hardware-configuration.nix ../ports.nix ];
@@ -35,6 +41,9 @@ in {
 
   services.xserver.windowManager.i3.enable = false;
 
+  users.users.muon.openssh.authorizedKeys.keys = keys;
+  users.users.root.openssh.authorizedKeys.keys = keys;
+
   # Proprietary </3
   mods.unfree.steam.enable = false;
   mods.unfree.nvidia.enable = false;

hosts/muop/configuration.nix

@@ -43,7 +43,6 @@ in {
   mods.unfree.minecraft.enable = false;
 
   # Hardware preferences
-
   boot = {
     tmp.cleanOnBoot = true;
     bootspec.enable = true;
@@ -61,6 +60,11 @@ in {
     };
   };
 
+  # Turn off screen-saver
+  environment.extraInit = ''
+    xset s off -dpms
+  '';
+
   environment.variables = {
     WINIT_HIDPI_FACTOR = "1";
     WINIT_X11_SCALE_FACTOR = "1";

hosts/mups/configuration.nix

@@ -48,12 +48,24 @@ in {
     root = "/var/www";
     configuration = { general = { directory-listing = true; }; };
   };
-  services.nginx.virtualHosts."muon.host" = {
+  services.nginx.virtualHosts = {
+    "muon.host" = {
       enableACME = true;
       forceSSL = true;
       default = true;
       locations."/" = { proxyPass = "http://localhost:8008"; };
     };
+    "tetterodesportcomplex.nl" = {
+      enableACME = true;
+      forceSSL = true;
+      locations."/" = { proxyPass = "http://10.0.0.3:5001"; };
+    };
+    "www.tetterodesportcomplex.nl" = {
+      enableACME = true;
+      forceSSL = true;
+      locations."/" = { proxyPass = "http://10.0.0.3:5001"; };
+    };
+  };
 
   # Enable the OpenSSH daemon.
   services.openssh.enable = true;

modules/home/terminal/tools.nix

@@ -29,6 +29,7 @@ in with lib; {
       "ripgrep"
       "bottom"
       "htop"
+      "vifm"
     ]);
 
     home.packages = with pkgs; [
@@ -40,6 +41,7 @@ in with lib; {
       trash-cli
       dua
       fdupes
+      vifm
 
       # programs
       fend