diff --git a/flake.nix b/flake.nix index 6742e8d..073d510 100644 --- a/flake.nix +++ b/flake.nix @@ -97,7 +97,11 @@ ./users/kopatz.nix ./modules/graphical/plasma.nix ./modules/graphical/shared.nix + ./modules/hardware/nvidia.nix ./modules/hardware/ssd.nix + ./modules/hardware/firmware.nix + # use latest kernel + ./modules/kernel.nix ./modules/nix/settings.nix ./modules/nix/index.nix ./modules/nix/ld.nix @@ -107,6 +111,7 @@ ./modules/noise-supression.nix ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; }) ./modules/wooting.nix + ./modules/wireshark.nix ./modules/tmpfs.nix ./modules/support/ntfs.nix ./systems/pc/configuration.nix diff --git a/modules/adguard.nix b/modules/adguard.nix index 870871b..a20d753 100644 --- a/modules/adguard.nix +++ b/modules/adguard.nix @@ -42,6 +42,10 @@ in "domain" = "server.local"; "answer" = ip; } + { + "domain" = "activitytracker.site"; + "answer" = ip; + } { "domain" = "adguard.local"; "answer" = ip; diff --git a/modules/graphical/shared.nix b/modules/graphical/shared.nix index f926d6e..68b5bbd 100644 --- a/modules/graphical/shared.nix +++ b/modules/graphical/shared.nix @@ -20,7 +20,7 @@ in programs.kdeconnect.enable = true; fonts.fontDir.enable = true; - fonts.fonts = with pkgs; [ + fonts.packages = with pkgs; [ nerdfonts ]; @@ -79,6 +79,8 @@ in unstable.libreoffice-fresh mangohud screenshot + glxinfo + vulkan-tools ]; environment.sessionVariables = { diff --git a/modules/hardware/firmware.nix b/modules/hardware/firmware.nix new file mode 100644 index 0000000..a62f709 --- /dev/null +++ b/modules/hardware/firmware.nix @@ -0,0 +1,3 @@ +{ + services.fwupd.enable = true; +} diff --git a/modules/hardware/nvidia.nix b/modules/hardware/nvidia.nix new file mode 100644 index 0000000..ce5757f --- /dev/null +++ b/modules/hardware/nvidia.nix @@ -0,0 +1,33 @@ +{config, pkgs, ...}: +{ + # Enable OpenGL + hardware.opengl = { + enable = true; + driSupport = true; + driSupport32Bit = true; + }; + + services.xserver.videoDrivers = ["nvidia"]; + hardware.nvidia = { + # 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; + # Optionally, you may need to select the appropriate driver version for your specific GPU. + package = config.boot.kernelPackages.nvidiaPackages.stable; + }; +} diff --git a/modules/kernel.nix b/modules/kernel.nix new file mode 100644 index 0000000..91314b1 --- /dev/null +++ b/modules/kernel.nix @@ -0,0 +1,4 @@ +{pkgs, ...}: +{ + boot.kernelPackages = pkgs.linuxPackages_latest; +} diff --git a/register_matrix_user.md b/register_matrix_user.md new file mode 100644 index 0000000..37074f1 --- /dev/null +++ b/register_matrix_user.md @@ -0,0 +1,7 @@ +$ nix-shell -p matrix-synapse +$ register_new_matrix_user -k your-registration-shared-secret http://localhost:8008 +New user localpart: your-username +Password: +Confirm password: +Make admin [no]: +Success! diff --git a/systems/pc/configuration.nix b/systems/pc/configuration.nix index ee4aa54..bb91845 100644 --- a/systems/pc/configuration.nix +++ b/systems/pc/configuration.nix @@ -14,36 +14,6 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - # Enable OpenGL - hardware.opengl = { - enable = true; - driSupport = true; - driSupport32Bit = true; - }; - - services.xserver.videoDrivers = ["nvidia"]; - hardware.nvidia = { - # 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; - # Optionally, you may need to select the appropriate driver version for your specific GPU. - package = config.boot.kernelPackages.nvidiaPackages.stable; - }; networking.hostName = "kop-pc"; # Define your hostname. # Enable networking diff --git a/users/kopatz.nix b/users/kopatz.nix index aa23b93..ac8a7f9 100644 --- a/users/kopatz.nix +++ b/users/kopatz.nix @@ -52,7 +52,6 @@ in packages = with pkgs; [ (discord.override { withVencord = true; }) librewolf - ungoogled-chromium brave ]; openssh.authorizedKeys.keys = [