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

This commit is contained in:
muon 2025-01-13 12:45:55 +00:00
commit 8d18ee6d3e
5 changed files with 45 additions and 18 deletions

View file

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

View file

@ -1,5 +1,11 @@
{ config, lib, pkgs, inputs, system, ... }: { 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 { in {
# Hardware # Hardware
imports = [ ./hardware-configuration.nix ../ports.nix ]; imports = [ ./hardware-configuration.nix ../ports.nix ];
@ -35,6 +41,9 @@ in {
services.xserver.windowManager.i3.enable = false; services.xserver.windowManager.i3.enable = false;
users.users.muon.openssh.authorizedKeys.keys = keys;
users.users.root.openssh.authorizedKeys.keys = keys;
# Proprietary </3 # Proprietary </3
mods.unfree.steam.enable = false; mods.unfree.steam.enable = false;
mods.unfree.nvidia.enable = false; mods.unfree.nvidia.enable = false;

View file

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

View file

@ -48,11 +48,23 @@ in {
root = "/var/www"; root = "/var/www";
configuration = { general = { directory-listing = true; }; }; configuration = { general = { directory-listing = true; }; };
}; };
services.nginx.virtualHosts."muon.host" = { services.nginx.virtualHosts = {
enableACME = true; "muon.host" = {
forceSSL = true; enableACME = true;
default = true; forceSSL = true;
locations."/" = { proxyPass = "http://localhost:8008"; }; 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. # Enable the OpenSSH daemon.

View file

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