diff --git a/hosts/common/default.nix b/hosts/common/default.nix new file mode 100644 index 0000000..7a3819a --- /dev/null +++ b/hosts/common/default.nix @@ -0,0 +1,160 @@ +# 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, + pkgs, + inputs, + lib, + ... +}: { + imports = [ + # Include the results of the hardware scan. + ../../env/wayland + ({ + options, + lib, + ... + }: + lib.mkIf (options ? virtualisation.memorySize) { + users.users.zack.password = "foo"; + }) + ]; + + virtualisation.vmVariant = { + # following configuration is added only when building VM with build-vm + virtualisation = { + memorySize = 2048; # Use 2048MiB memory. + cores = 4; + }; + }; + + services.udev.extraRules = ''KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0660", GROUP="plugdev"''; + # Enable networking + networking.networkmanager.enable = true; + + security.polkit.enable = true; + + # Set your time zone. + time.timeZone = "America/New_York"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "en_US.UTF-8"; + LC_IDENTIFICATION = "en_US.UTF-8"; + LC_MEASUREMENT = "en_US.UTF-8"; + LC_MONETARY = "en_US.UTF-8"; + LC_NAME = "en_US.UTF-8"; + LC_NUMERIC = "en_US.UTF-8"; + LC_PAPER = "en_US.UTF-8"; + LC_TELEPHONE = "en_US.UTF-8"; + LC_TIME = "en_US.UTF-8"; + }; + + # Enable the X11 windowing system. + services.xserver.enable = true; + + # Configure keymap in X11 + services.xserver.xkb = { + layout = "us"; + variant = ""; + }; + + # 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 OpenGL + hardware.opengl = { + enable = true; + driSupport = true; + driSupport32Bit = true; + }; + + environment.variables = { + WLR_RENDERER_ALLOW_SOFTWARE = "1"; + }; + + nix.settings.experimental-features = ["nix-command" "flakes"]; + + # Enable touchpad support (enabled default in most desktopManager). + # services.xserver.libinput.enable = true; + + programs.zsh.enable = true; + + users.groups.plugdev = {}; + + # Define a user account. Don't forget to set a password with ‘passwd’. + users.users.zack = { + isNormalUser = true; + description = "zack"; + extraGroups = ["networkmanager" "wheel" "docker" "libvirt" "plugdev"]; + shell = pkgs.zsh; + packages = with pkgs; [ + firefox + kate + rio + telegram-desktop + kitty + # thunderbird + ]; + }; + + home-manager = { + extraSpecialArgs = {inherit inputs;}; + users = { + "zack" = { + imports = [../../modules/home-manager]; + _module.args.theme = import ../../core/theme.nix; + }; + }; + }; + + # Allow unfree packages + nixpkgs.config.allowUnfree = true; + + # 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 = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Or disable the firewall altogether. + # networking.firewall.enable = false; + + # 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.11"; # Did you read the comment? +} diff --git a/hosts/earth/configuration.nix b/hosts/earth/configuration.nix index 2fef986..a0d7f9c 100644 --- a/hosts/earth/configuration.nix +++ b/hosts/earth/configuration.nix @@ -9,6 +9,8 @@ ... }: { imports = [ + ../common/default.nix + # Include the results of the hardware scan. ./hardware-configuration.nix ./nvidia.nix @@ -29,87 +31,13 @@ networking.hostName = "earth"; # Define your hostname. - virtualisation.vmVariant = { - # following configuration is added only when building VM with build-vm - virtualisation = { - memorySize = 2048; # Use 2048MiB memory. - cores = 4; - }; - }; - - services.udev.extraRules = ''KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0660", GROUP="plugdev"''; - # Enable networking - networking.networkmanager.enable = true; - networking.networkmanager.unmanaged = ["enp6s0"]; - security.polkit.enable = true; - - # Set your time zone. - time.timeZone = "America/New_York"; - boot.supportedFilesystems = ["ntfs"]; - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; - - i18n.extraLocaleSettings = { - LC_ADDRESS = "en_US.UTF-8"; - LC_IDENTIFICATION = "en_US.UTF-8"; - LC_MEASUREMENT = "en_US.UTF-8"; - LC_MONETARY = "en_US.UTF-8"; - LC_NAME = "en_US.UTF-8"; - LC_NUMERIC = "en_US.UTF-8"; - LC_PAPER = "en_US.UTF-8"; - LC_TELEPHONE = "en_US.UTF-8"; - LC_TIME = "en_US.UTF-8"; - }; - - # Enable the X11 windowing system. - services.xserver.enable = true; - - # Configure keymap in X11 - services.xserver.xkb = { - layout = "us"; - variant = ""; - }; - - # 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 OpenGL - hardware.opengl = { - enable = true; - driSupport = true; - driSupport32Bit = true; - }; - # Load nvidia driver for Xorg and Wayland services.xserver.videoDrivers = ["nvidia"]; # or "nvidiaLegacy470 etc. - environment.variables = { - WLR_RENDERER_ALLOW_SOFTWARE = "1"; - }; - - nix.settings.experimental-features = ["nix-command" "flakes"]; - hardware.nvidia = { # Modesetting is required. modesetting.enable = true; @@ -141,71 +69,8 @@ package = config.boot.kernelPackages.nvidiaPackages.stable; }; - # Enable touchpad support (enabled default in most desktopManager). - # services.xserver.libinput.enable = true; - - programs.zsh.enable = true; - - users.groups.plugdev = {}; - - # Define a user account. Don't forget to set a password with ‘passwd’. - users.users.zack = { - isNormalUser = true; - description = "zack"; - extraGroups = ["networkmanager" "wheel" "docker" "libvirt" "plugdev"]; - shell = pkgs.zsh; - packages = with pkgs; [ - firefox - kate - rio - telegram-desktop - kitty - # thunderbird - ]; - }; - programs.virt-manager.enable = true; virtualisation.docker.enable = true; virtualisation.libvirtd.enable = true; - - home-manager = { - extraSpecialArgs = {inherit inputs;}; - users = { - "zack" = { - imports = [../../modules/home-manager]; - _module.args.theme = import ../../core/theme.nix; - }; - }; - }; - - # Allow unfree packages - nixpkgs.config.allowUnfree = true; - - # 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 = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; - - # 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.11"; # Did you read the comment? }