From 8cd67b9c46b5701321711797ee1b52afe07a2e71 Mon Sep 17 00:00:00 2001 From: muon Date: Thu, 9 Jan 2025 21:50:25 +0000 Subject: [PATCH 1/4] Add hosts --- flake.nix | 22 +++++++++++----------- hosts/mups/configuration.nix | 22 +++++++++++++++++----- 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/flake.nix b/flake.nix index 9c0a88f..7aa9a8f 100644 --- a/flake.nix +++ b/flake.nix @@ -85,18 +85,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 + # ]; + # }; }; }; } diff --git a/hosts/mups/configuration.nix b/hosts/mups/configuration.nix index 4011e83..7ae30c3 100644 --- a/hosts/mups/configuration.nix +++ b/hosts/mups/configuration.nix @@ -48,11 +48,23 @@ in { root = "/var/www"; configuration = { general = { directory-listing = true; }; }; }; - services.nginx.virtualHosts."muon.host" = { - enableACME = true; - forceSSL = true; - default = true; - locations."/" = { proxyPass = "http://localhost:8008"; }; + 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. From bfcb73c937363500c2203339b916dec3253adee4 Mon Sep 17 00:00:00 2001 From: muon Date: Sun, 12 Jan 2025 17:36:00 +0000 Subject: [PATCH 2/4] Add vifm --- modules/home/terminal/tools.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/home/terminal/tools.nix b/modules/home/terminal/tools.nix index c58a051..2f21239 100644 --- a/modules/home/terminal/tools.nix +++ b/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 From f6c298b008378c276fed55329855d70f4ef5c922 Mon Sep 17 00:00:00 2001 From: muon Date: Sun, 12 Jan 2025 17:36:15 +0000 Subject: [PATCH 3/4] Turn off screen saver muop --- hosts/muop/configuration.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hosts/muop/configuration.nix b/hosts/muop/configuration.nix index 4337098..8a21dd5 100644 --- a/hosts/muop/configuration.nix +++ b/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"; From 85905d6fc7e2939af7454e40681505731e0fe706 Mon Sep 17 00:00:00 2001 From: muon Date: Sun, 12 Jan 2025 17:37:14 +0000 Subject: [PATCH 4/4] Add trusted keys muho --- hosts/muho/configuration.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/hosts/muho/configuration.nix b/hosts/muho/configuration.nix index 735e33b..6181c8c 100644 --- a/hosts/muho/configuration.nix +++ b/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