From 46c1118819534348379507b188686238977a8da2 Mon Sep 17 00:00:00 2001 From: materus Date: Fri, 9 Jun 2023 21:16:14 +0200 Subject: [PATCH] host: add flamaster --- configurations/host/default.nix | 25 +++ .../host/flamaster/configuration.nix | 183 ++++++++++++++++++ configurations/host/flamaster/default.nix | 11 ++ configurations/host/flamaster/extraHome.nix | 21 ++ .../host/flamaster/hardware-configuration.nix | 54 ++++++ configurations/host/materusPC/scripts.nix | 27 +++ configurations/host/materusPC/tmp.nix | 7 +- .../host/valkyrie/hardware-configuration.nix | 1 + 8 files changed, 323 insertions(+), 6 deletions(-) create mode 100644 configurations/host/flamaster/configuration.nix create mode 100644 configurations/host/flamaster/default.nix create mode 100644 configurations/host/flamaster/extraHome.nix create mode 100644 configurations/host/flamaster/hardware-configuration.nix diff --git a/configurations/host/default.nix b/configurations/host/default.nix index 9fa26bb..a24fb51 100644 --- a/configurations/host/default.nix +++ b/configurations/host/default.nix @@ -29,6 +29,31 @@ in } ]; }; + flamaster = inputs.nixpkgs.lib.nixosSystem rec { + specialArgs = { inherit inputs; inherit materusFlake; }; + system = "x86_64-linux"; + modules = [ + ./flamaster + inputs.private.systemModule + profiles.osProfile + + inputs.home-manager.nixosModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.materus = { config ,... }: { + imports = [ + ../home/materus + flamaster/extraHome.nix + profiles.homeProfile + inputs.private.homeModule + ]; + materus.profile.nixpkgs.enable = false; + }; + home-manager.extraSpecialArgs = { inherit inputs; inherit materusFlake; }; + } + ]; + }; valkyrie = inputs.nixpkgs.lib.nixosSystem rec { specialArgs = { inherit inputs; inherit materusFlake; }; system = "x86_64-linux"; diff --git a/configurations/host/flamaster/configuration.nix b/configurations/host/flamaster/configuration.nix new file mode 100644 index 0000000..1806bdf --- /dev/null +++ b/configurations/host/flamaster/configuration.nix @@ -0,0 +1,183 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). + +{ config, lib, pkgs, materusFlake, materusPkgs, ... }: + +{ + imports = + [ + # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; + + networking.wireless.iwd.enable = true; + services.logind.lidSwitch = "ignore"; + services.logind.lidSwitchExternalPower = "ignore"; + programs.steam = { + enable = true; + remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play + dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server + }; + + programs.tmux = { + enable = true; + clock24 = true; + }; + # Bootloader. + boot.loader.grub = { + enable = true; + efiSupport = true; + device = "nodev"; + useOSProber = true; + gfxmodeEfi = pkgs.lib.mkDefault "1920x1080"; + gfxmodeBios = pkgs.lib.mkDefault "1920x1080"; + #efiInstallAsRemovable = true; + }; + boot.loader.efi.canTouchEfiVariables = true; + boot.loader.efi.efiSysMountPoint = "/boot/efi"; + + networking.hostName = "flamaster"; # Define your hostname. + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + # Enable networking + networking.networkmanager.enable = true; + networking.networkmanager.wifi.backend = "iwd"; + # Set your time zone. + time.timeZone = "Europe/Warsaw"; + + # Select internationalisation properties. + i18n.defaultLocale = "pl_PL.utf8"; + + # Enable the X11 windowing system. + services.xserver.enable = true; + + services.xserver.videoDrivers = [ "nvidia" ]; + hardware.opengl.enable = true; + hardware.nvidia.prime = { + offload.enable = true; + + # Bus ID of the Intel GPU. You can find it using lspci, either under 3D or VGA + intelBusId = "PCI:0:2:0"; + + # Bus ID of the NVIDIA GPU. You can find it using lspci, either under 3D or VGA + nvidiaBusId = "PCI:1:0:0"; + }; + + + # Enable the KDE Plasma Desktop Environment. + services.xserver.displayManager.sddm.enable = true; + services.xserver.desktopManager.plasma5.enable = true; + + # Configure keymap in X11 + services.xserver = { + layout = "pl"; + xkbVariant = ""; + }; + + # Configure console keymap + console.keyMap = "pl2"; + + # Enable CUPS to print documents. + services.printing.enable = true; + + # Enable sound with pipewire. + sound.enable = true; + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + # If you want to use JACK applications, uncomment this + jack.enable = true; + + # use the example session manager (no others are packaged yet so this is enabled by default, + # no need to redefine it in your config for now) + #media-session.enable = true; + }; + + # Enable touchpad support (enabled default in most desktopManager). + # services.xserver.libinput.enable = true; + + # Define a user account. Don't forget to set a password with ‘passwd’. + users.users.materus = { + isNormalUser = true; + description = "Mateusz Słodkowicz"; + extraGroups = [ "networkmanager" "wheel" ]; + openssh.authorizedKeys.keyFiles = [ (materusFlake.path + /extraFiles/keys/ssh/materus.pub) ]; + packages = with pkgs; [ + kate + ]; + }; + + # Allow unfree packages + nixpkgs.config.allowUnfree = true; + + # List packages installed in system profile. To search, run: + # $ nix search wget + environment.systemPackages = with pkgs; [ + # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + wget + util-linux + killall + pciutils + lshw + steamcmd + jdk + distrobox + config.materus.profile.packages.firefox + + ]; + + # Some programs need SUID wrappers, can be configured further or are + # started in user sessions. + # programs.mtr.enable = true; + # programs.gnupg.agent = { + # enable = true; + # enableSSHSupport = true; + # }; + + # List services that you want to enable: + + # Enable the OpenSSH daemon. + services.openssh.enable = true; + + # Open ports in the firewall. + networking.firewall.allowedTCPPorts = [ 22 27015 25565 24454 ]; + networking.firewall.allowedTCPPortRanges = [{ from = 16262; to = 16272; }]; + networking.firewall.allowedUDPPorts = [ 22 16261 16262 8766 8767 25565 24454 ]; + # Or disable the firewall altogether. + networking.firewall.enable = true; + + networking.networkmanager.extraConfig = lib.mkDefault '' + [connectivity] + uri=http://nmcheck.gnome.org/check_network_status.txt + ''; + + # This value determines the NixOS release from which the default + # settings for stateful data, like file locations and database versions + # on your system were taken. It‘s perfectly fine and recommended to leave + # this value at the release version of the first install of this system. + # Before changing this value read the documentation for this option + # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). + system.stateVersion = "23.05"; # Did you read the comment? + + + programs.neovim.enable = true; + programs.neovim.vimAlias = true; + programs.neovim.viAlias = true; + + services.flatpak.enable = true; + xdg.portal.enable = true; + + virtualisation.podman.enable = true; + virtualisation.podman.dockerCompat = true; + virtualisation.podman.enableNvidia = true; + virtualisation.podman.dockerSocket.enable = true; +} diff --git a/configurations/host/flamaster/default.nix b/configurations/host/flamaster/default.nix new file mode 100644 index 0000000..319ac54 --- /dev/null +++ b/configurations/host/flamaster/default.nix @@ -0,0 +1,11 @@ +{ config, lib, pkgs, ... }: +{ + imports = + [ + # Include the results of the hardware scan. + ./configuration.nix + ]; + materus.profile.nix.enable = true; + + +} diff --git a/configurations/host/flamaster/extraHome.nix b/configurations/host/flamaster/extraHome.nix new file mode 100644 index 0000000..6acafa1 --- /dev/null +++ b/configurations/host/flamaster/extraHome.nix @@ -0,0 +1,21 @@ +{ config, pkgs, materusPkgs, lib, ... }: +{ + home.stateVersion = "23.05"; + home.homeDirectory = "/home/materus"; + + materus.profile = { + fonts.enable = lib.mkDefault true; + nixpkgs.enable = lib.mkDefault false; + enableDesktop = lib.mkDefault true; + enableTerminal = lib.mkDefault true; + enableTerminalExtra = lib.mkDefault true; + enableNixDevel = lib.mkDefault true; + + }; + + home.packages = [ + pkgs.papirus-icon-theme + (materusPkgs.polymc.wrap { extraJDKs = [ pkgs.graalvm17-ce ]; }) + ]; + +} diff --git a/configurations/host/flamaster/hardware-configuration.nix b/configurations/host/flamaster/hardware-configuration.nix new file mode 100644 index 0000000..ceb218d --- /dev/null +++ b/configurations/host/flamaster/hardware-configuration.nix @@ -0,0 +1,54 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_usb_sdmmc" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { + device = "/dev/disk/by-label/NixOS_Root"; + fsType = "ext4"; + }; + + fileSystems."/boot/efi" = + { + device = "/dev/disk/by-label/NixOS_EFI"; + fsType = "vfat"; + }; + + + fileSystems."/etc/nixos" = + { + device = "/materus/config/Nixerus"; + fsType = "none"; + options = [ "bind" ]; + }; + + swapDevices = [{ + device = "/var/.swapfile"; + size = 32 * 1024; + }]; + + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp5s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlo1.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/configurations/host/materusPC/scripts.nix b/configurations/host/materusPC/scripts.nix index 7fda83c..5928d7d 100644 --- a/configurations/host/materusPC/scripts.nix +++ b/configurations/host/materusPC/scripts.nix @@ -21,6 +21,28 @@ ${pkgs.openssh}/bin/ssh -t materus@valkyrie "sudo nixos-rebuild switch --flake / ''; + +flamaster-sync = pkgs.writeShellScriptBin "flamaster-sync" '' +${pkgs.rsync}/bin/rsync -avzrh --delete --exclude ".git*" --exclude "flake.lock" /materus/config/Nixerus materus@flamaster:/materus/config/ && \ + ${pkgs.rsync}/bin/rsync -avzrh --delete --exclude ".git*" /materus/config/flamaster materus@flamaster:/materus/config/ +''; + +flamaster-flakelock = pkgs.writeShellScriptBin "flamaster-flakelock" '' +${pkgs.openssh}/bin/ssh materus@flamaster "nix flake update /materus/config/Nixerus --override-input nixpkgs github:NixOS/nixpkgs/23.05 \ + --override-input home-manager github:nix-community/home-manager/release-23.05 \ + --override-input private /materus/config/flamaster/flake" +''; + +flamaster-rebuild-boot = pkgs.writeShellScriptBin "flamaster-rebuild-boot" '' +${pkgs.openssh}/bin/ssh -t materus@flamaster "sudo nixos-rebuild boot --flake /materus/config/Nixerus#flamaster \ + --override-input private /materus/config/flamaster/flake" +''; +flamaster-rebuild-switch = pkgs.writeShellScriptBin "flamaster-rebuild-switch" '' +${pkgs.openssh}/bin/ssh -t materus@flamaster "sudo nixos-rebuild switch --flake /materus/config/Nixerus#flamaster \ + --override-input private /materus/config/flamaster/flake" +''; + + in { environment.systemPackages = [ @@ -28,5 +50,10 @@ in valkyrie-rebuild-switch valkyrie-sync valkyrie-flakelock + + flamaster-rebuild-boot + flamaster-rebuild-switch + flamaster-sync + flamaster-flakelock ]; } diff --git a/configurations/host/materusPC/tmp.nix b/configurations/host/materusPC/tmp.nix index df38401..353f1d8 100644 --- a/configurations/host/materusPC/tmp.nix +++ b/configurations/host/materusPC/tmp.nix @@ -23,12 +23,7 @@ in services.xserver.displayManager.startx.enable = true; services.teamviewer.enable = true; - services.xserver.windowManager.awesome.enable = true; - services.xserver.windowManager.awesome.luaModules = with pkgs.luaPackages; [ - luarocks - luadbi-mysql # - ]; - + systemd.tmpfiles.rules = [ "L+ /opt/rocm/hip - - - - ${pkgs.hip}" ]; diff --git a/configurations/host/valkyrie/hardware-configuration.nix b/configurations/host/valkyrie/hardware-configuration.nix index 35968ab..d8b77a8 100644 --- a/configurations/host/valkyrie/hardware-configuration.nix +++ b/configurations/host/valkyrie/hardware-configuration.nix @@ -11,6 +11,7 @@ boot.initrd.availableKernelModules = [ "ata_piix" "virtio_pci" "floppy" "sr_mod" "virtio_blk" ]; boot.initrd.kernelModules = [ ]; + boot.kernel.sysctl = { "net.ipv4.ip_forward" = 1; }; boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; boot.tmp.useTmpfs = true;