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/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"; diff --git a/hosts/muop/hardware-configuration.nix b/hosts/muop/hardware-configuration.nix index 14b7f9d..25b813e 100644 --- a/hosts/muop/hardware-configuration.nix +++ b/hosts/muop/hardware-configuration.nix @@ -11,6 +11,7 @@ boot.initrd.kernelModules = [ ]; boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; + boot.supportedFilesystems = [ "ntfs" "btrfs" ]; fileSystems."/" = { device = "/dev/disk/by-uuid/29b32abb-ea5d-4cca-b506-3485d8df430c"; 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. diff --git a/modules/home/desktop/productivity.nix b/modules/home/desktop/productivity.nix index d7ec59f..ade6f7f 100644 --- a/modules/home/desktop/productivity.nix +++ b/modules/home/desktop/productivity.nix @@ -21,13 +21,17 @@ bitwarden-desktop # file management - krusader + breeze-icons + libsForQt5.qt5ct + dolphin # documents # texliveFull # texstudio ]; + qt.platformTheme = "qt5ct"; + home.sessionVariables.BROWSER = "librewolf"; programs.zsh.sessionVariables.BROWSER = "librewolf"; 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