From 1ba47972e2d6915cd848e57d4f0e498c34f88353 Mon Sep 17 00:00:00 2001 From: Xe Date: Fri, 23 Dec 2022 22:57:09 -0500 Subject: [PATCH] keitai Signed-off-by: Xe --- common/default.nix | 2 +- flake.nix | 197 +----------------------- hosts/keitai/default.nix | 120 +++++++++++++++ hosts/keitai/hardware-configuration.nix | 38 +++++ 4 files changed, 161 insertions(+), 196 deletions(-) create mode 100644 hosts/keitai/default.nix create mode 100644 hosts/keitai/hardware-configuration.nix diff --git a/common/default.nix b/common/default.nix index db5d130..a71941c 100644 --- a/common/default.nix +++ b/common/default.nix @@ -83,5 +83,5 @@ ''; }; - system.stateVersion = "21.05"; + system.stateVersion = lib.mkDefault "21.05"; } diff --git a/flake.nix b/flake.nix index c11f410..369c2bd 100644 --- a/flake.nix +++ b/flake.nix @@ -195,201 +195,6 @@ }; nixosConfigurations = { - toxapex = let pkgs = nixpkgs.legacyPackages."aarch64-linux"; - in nixpkgs.lib.nixosSystem rec { - system = "aarch64-linux"; - modules = [ - home-manager.nixosModules.home-manager - - ({ ... }: { imports = [ ./hosts/toxapex ]; }) - - ({ config, ... }: { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - - nixpkgs.overlays = [ emacs-overlay.overlay ]; - - networking.hostName = "toxapex"; - networking.nameservers = [ "100.100.100.100" ]; - networking.search = [ "shark-harmonic.ts.net" ]; - - nix.package = pkgs.nixVersions.stable; - nix.extraOptions = '' - experimental-features = nix-command flakes - ''; - - users.groups.xe = { }; - users.users.xe = { - extraGroups = [ - "wheel" - "docker" - "audio" - "plugdev" - "libvirtd" - "adbusers" - "dialout" - "within" - ]; - shell = pkgs.fish; - isNormalUser = true; - group = "xe"; - }; - - environment.systemPackages = with pkgs; [ mosh flyctl ]; - virtualisation.docker.enable = true; - - services.tailscale.enable = true; - - home-manager.users.xe = { lib, ... }: - let - name = "Xe Iaso"; - email = "me@xeiaso.net"; - commitTemplate = pkgs.writeTextFile { - name = "xe-commit-template"; - text = '' - Signed-off-by: ${name} <${email}> - ''; - }; - in { - imports = [ ./common/home-manager ]; - - within = { - emacs.enable = true; - fish.enable = true; - neofetch.enable = true; - vim.enable = true; - tmux.enable = true; - }; - - services.emacs.enable = lib.mkForce false; - programs.direnv.enable = true; - programs.direnv.nix-direnv.enable = true; - - programs.git = { - package = pkgs.gitAndTools.gitFull; - enable = true; - userName = name; - userEmail = email; - ignores = [ "*~" "*.swp" "*.#" ]; - delta.enable = true; - extraConfig = { - commit.template = "${commitTemplate}"; - core.editor = "vim"; - color.ui = "auto"; - credential.helper = "store --file ~/.git-credentials"; - format.signoff = true; - init.defaultBranch = "main"; - protocol.keybase.allow = "always"; - pull.rebase = "true"; - push.default = "current"; - }; - }; - }; - }) - ]; - }; - - # work VM - froslass = let pkgs = nixpkgs.legacyPackages."aarch64-linux"; - in nixpkgs.lib.nixosSystem rec { - system = "aarch64-linux"; - modules = [ - home-manager.nixosModules.home-manager - - ({ ... }: { - imports = [ ./hosts/froslass ./hardware/macos-rosetta ]; - fileSystems."/host" = { - device = "share"; - fsType = "virtiofs"; - }; - }) - - ({ config, ... }: { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - - nixpkgs.overlays = [ emacs-overlay.overlay ]; - - networking.hostName = "froslass"; - networking.nameservers = [ "100.100.100.100" ]; - networking.search = [ "shark-harmonic.ts.net" ]; - - nix.package = pkgs.nixVersions.stable; - nix.extraOptions = '' - experimental-features = nix-command flakes - ''; - - users.users.xe = { - extraGroups = [ - "wheel" - "docker" - "audio" - "plugdev" - "libvirtd" - "adbusers" - "dialout" - "within" - ]; - shell = pkgs.fish; - isNormalUser = true; - group = "xe"; - }; - - environment.systemPackages = with pkgs; [ mosh flyctl ]; - virtualisation.docker.enable = true; - - services.tailscale.enable = true; - - home-manager.users.xe = { lib, ... }: - let - name = "Xe Iaso"; - email = "xe@tailscale.com"; - commitTemplate = pkgs.writeTextFile { - name = "xe-commit-template"; - text = '' - Signed-off-by: ${name} <${email}> - ''; - }; - in { - imports = [ ./common/home-manager ]; - - within = { - emacs.enable = true; - fish.enable = true; - neofetch.enable = true; - vim.enable = true; - tmux.enable = true; - }; - - services.lorri.enable = true; - services.emacs.enable = lib.mkForce false; - programs.direnv.enable = true; - programs.direnv.nix-direnv.enable = true; - - programs.git = { - package = pkgs.gitAndTools.gitFull; - enable = true; - userName = name; - userEmail = email; - ignores = [ "*~" "*.swp" "*.#" ]; - delta.enable = true; - extraConfig = { - commit.template = "${commitTemplate}"; - core.editor = "vim"; - color.ui = "auto"; - credential.helper = "store --file ~/.git-credentials"; - format.signoff = true; - init.defaultBranch = "main"; - protocol.keybase.allow = "always"; - pull.rebase = "true"; - push.default = "current"; - }; - }; - }; - }) - ]; - }; - # wsl xatci = nixpkgs.lib.nixosSystem rec { system = "x86_64-linux"; @@ -485,6 +290,8 @@ ]; }; + keitai = mkSystem [ ./hosts/keitai ./hardware/location/YOW ]; + # avalon chrysalis = mkSystem [ ./hosts/chrysalis ./hardware/location/YOW ]; diff --git a/hosts/keitai/default.nix b/hosts/keitai/default.nix new file mode 100644 index 0000000..8a1c76e --- /dev/null +++ b/hosts/keitai/default.nix @@ -0,0 +1,120 @@ +# 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, ... }: + +{ + imports = + [ # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; + + # Bootloader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + boot.loader.efi.efiSysMountPoint = "/boot/efi"; + + networking.hostName = "keitai"; # 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; + + # Set your time zone. + time.timeZone = "America/Toronto"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_CA.UTF-8"; + + # Enable the X11 windowing system. + services.xserver.enable = true; + + # Enable the GNOME Desktop Environment. + services.xserver.displayManager.gdm.enable = true; + services.xserver.desktopManager.gnome.enable = true; + + # Configure keymap in X11 + services.xserver = { + layout = "us"; + xkbVariant = ""; + }; + + # 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.cadey = { + isNormalUser = true; + description = "Xe Iaso"; + extraGroups = [ "networkmanager" "wheel" ]; + packages = with pkgs; [ + firefox + # thunderbird + ]; + }; + + # 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 + ]; + + services.tailscale.enable = 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 = "22.11"; # Did you read the comment? + +} diff --git a/hosts/keitai/hardware-configuration.nix b/hosts/keitai/hardware-configuration.nix new file mode 100644 index 0000000..a48ebd5 --- /dev/null +++ b/hosts/keitai/hardware-configuration.nix @@ -0,0 +1,38 @@ +# 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" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/3babf825-1aff-4390-88b1-9d829d400755"; + fsType = "ext4"; + }; + + fileSystems."/boot/efi" = + { device = "/dev/disk/by-uuid/1B3E-1AC0"; + fsType = "vfat"; + }; + + swapDevices = [ ]; + + # 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.wlp2s0.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; +}