diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index 837a514..2043c90 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -189,19 +189,6 @@ in { "electron-19.1.9" ]; - # # Configure nixpkgs - # nixpkgs = { - # config = { - # # Enable non free - # allowUnfree = true; - - # permittedInsecurePackages = [ - # # allow insecure electron for etcher - # "electron-19.1.9" - # ]; - # }; - # }; - # Define a user account. Don't forget to set a password with ‘passwd’. users.users."${user}" = { isNormalUser = true; diff --git a/hosts/nas/configuration.nix b/hosts/nas/configuration.nix index 29b6ce2..252d647 100644 --- a/hosts/nas/configuration.nix +++ b/hosts/nas/configuration.nix @@ -8,6 +8,7 @@ let password = "$y$j9T$EkPXmsmIMFFZ.WRrBYCxS1$P0kwo6e4.WM5DsqUcEqWC3MrZp5KfCjxffraMFZWu06"; hostname = "jallen-nas"; + allowedPorts = [ 2342 61208 ]; in { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix @@ -134,7 +135,7 @@ in { loader = { systemd-boot = { enable = true; - configurationLimit = 2; + configurationLimit = 5; }; efi = { @@ -157,53 +158,12 @@ in { zfs.requestEncryptionCredentials = false; }; - # # Hardware configs - # hardware = { - # # Nvidia - # nvidia = { - # package = config.boot.kernelPackages.nvidiaPackages.beta; - - # # Modesetting is required. - # modesetting.enable = true; - - # # Nvidia power management. Experimental, and can cause sleep/suspend to fail. - # powerManagement.enable = false; - - # # Fine-grained power management. Turns off GPU when not in use. - # # Experimental and only works on modern Nvidia GPUs (Turing or newer). - # powerManagement.finegrained = false; - - # # Use the NVidia open source kernel module (not to be confused with the - # # independent third-party "nouveau" open source driver). - # # Support is limited to the Turing and later architectures. Full list of - # # supported GPUs is at: - # # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus - # # Only available from driver 515.43.04+ - # # Currently alpha-quality/buggy, so false is currently the recommended setting. - # open = false; - - # # Enable the Nvidia settings menu, - # # accessible via `nvidia-settings`. - # nvidiaSettings = true; - # }; - - # # Enable OpenGL - # opengl = { - # enable = true; - # driSupport = true; - # driSupport32Bit = true; - # }; - # }; - # Services configs services = { # Enable the X11 windowing system. xserver = { enable = true; - - # # Load nvidia driver for Xorg and Wayland - # videoDrivers = ["nvidia"]; - + # Enable the Plasma 6 Desktop Environment. displayManager = { sddm.enable = true; @@ -291,8 +251,8 @@ in { allowPing = true; extraCommands = "iptables -t raw -A OUTPUT -p udp -m udp --dport 137 -j CT --helper netbios-ns"; # TODO is this needed? - allowedTCPPorts = [ 2342 61208 ]; - allowedUDPPorts = [ 2342 61208 ]; + allowedTCPPorts = [ allowedPorts ]; + allowedUDPPorts = [ allowedPorts ]; }; };