Merge remote-tracking branch 'refs/remotes/origin/main'

This commit is contained in:
muon 2025-01-12 17:37:37 +00:00
commit 7ac72649cd
6 changed files with 41 additions and 18 deletions

View file

@ -85,18 +85,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

@ -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

@ -11,6 +11,7 @@
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ ]; boot.kernelModules = [ ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
boot.supportedFilesystems = [ "ntfs" "btrfs" ];
fileSystems."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/29b32abb-ea5d-4cca-b506-3485d8df430c"; device = "/dev/disk/by-uuid/29b32abb-ea5d-4cca-b506-3485d8df430c";

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

@ -21,13 +21,17 @@
bitwarden-desktop bitwarden-desktop
# file management # file management
krusader breeze-icons
libsForQt5.qt5ct
dolphin
# documents # documents
# texliveFull # texliveFull
# texstudio # texstudio
]; ];
qt.platformTheme = "qt5ct";
home.sessionVariables.BROWSER = "librewolf"; home.sessionVariables.BROWSER = "librewolf";
programs.zsh.sessionVariables.BROWSER = "librewolf"; programs.zsh.sessionVariables.BROWSER = "librewolf";

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