diff --git a/flake.nix b/flake.nix index 0f06d06..d40d6bf 100644 --- a/flake.nix +++ b/flake.nix @@ -21,40 +21,52 @@ }; outputs = - inputs@{ flake-parts, ... }: + inputs@{ flake-parts, self, ... }: flake-parts.lib.mkFlake { inherit inputs; } { imports = [ inputs.devshell.flakeModule ./nixos/machines/wsl/configuration.nix ./nixos/machines/installer/configuration.nix + ./nixos/machines/crash/machine.nix ./home-manager/machines/wsl/home.nix + ./home-manager/machines/crash/home.nix ./devshells/rust.nix ./devshells/idris2.nix ./devshells/raku.nix ]; - systems = [ - "x86_64-linux" - "aarch64-linux" - "aarch64-darwin" - "x86_64-darwin" - ]; - perSystem = - { - config, - self', - inputs', - pkgs, - system, - ... - }: - { - # Per-system attributes can be defined here. The self' and inputs' - # module parameters provide easy access to attributes of the same - # system. + config = { + systems = [ + "x86_64-linux" + "aarch64-linux" + "aarch64-darwin" + "x86_64-darwin" + ]; + perSystem = + { + config, + self', + inputs', + pkgs, + system, + ... + }: + { + # Per-system attributes can be defined here. The self' and inputs' + # module parameters provide easy access to attributes of the same + # system. + + # Equivalent to inputs'.nixpkgs.legacyPackages.hello; + packages.default = pkgs.hello; + }; + }; + options = with inputs.nixpkgs.lib; { + flake = flake-parts.lib.mkSubmoduleOptions { + homeConfigurations = mkOption { + type = types.lazyAttrsOf types.raw; + default = { }; + }; - # Equivalent to inputs'.nixpkgs.legacyPackages.hello; - packages.default = pkgs.hello; }; - flake = { }; + }; }; } diff --git a/home-manager/machines/crash/home.nix b/home-manager/machines/crash/home.nix new file mode 100644 index 0000000..8d565bd --- /dev/null +++ b/home-manager/machines/crash/home.nix @@ -0,0 +1,51 @@ +{ withSystem, inputs, ... }: +{ + # perSystem = { ... }: { config.packages.hello = ...; }; + + flake.homeConfigurations.crash = withSystem "x86_64-linux" ( + ctx@{ config, inputs', ... }: + inputs.home-manager.lib.homeManagerConfiguration { + pkgs = inputs.nixpkgs.legacyPackages.${"x86_64-linux"}; + extraSpecialArgs = { + inherit inputs inputs'; + packages = config.packages; + }; + modules = [ + ( + { + config, + lib, + pkgs, + ... + }: + { + imports = [ + ../../modules/programs/shell.nix + ../../modules/programs/neovim.nix + (import ../../modules/programs/git.nix { }) + ../../modules/programs/core.nix + ../../modules/programs/devel.nix + ../../modules/programs/ssh.nix + (import ../../modules/programs/emacs.nix { }) + ../../modules/programs/fonts.nix + ]; + home.username = "nathan"; + home.homeDirectory = "/home/nathan/"; + programs.command-not-found.enable = true; + home.stateVersion = "24.11"; + programs.home-manager.enable = true; + + # Allow unfree packages + nixpkgs.config.allowUnfree = true; + + # Machine specific configuration + programs.nushell.environmentVariables = { + VISUAL = "nvim"; + EDITOR = "nvim"; + }; + } + ) + ]; + } + ); +} diff --git a/nixos/machines/crash/configuration.nix b/nixos/machines/crash/configuration.nix new file mode 100644 index 0000000..adecdab --- /dev/null +++ b/nixos/machines/crash/configuration.nix @@ -0,0 +1,148 @@ +# 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 = + [ + ]; + + nix.settings.trusted-users = [ "root" "nathan" ]; + +programs.ssh.extraConfig = '' + Host eu.nixbuild.net + PubkeyAcceptedKeyTypes ssh-ed25519 + ServerAliveInterval 60 + IPQoS throughput + IdentityFile /home/nathan/.ssh/id_ed25519 +''; + +programs.ssh.knownHosts = { + nixbuild = { + hostNames = [ "eu.nixbuild.net" ]; + publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPIQCZc54poJ8vqawd8TraNryQeJnvH1eLpIDgbiqymM"; + }; +}; + +nix = { + distributedBuilds = true; + buildMachines = [ + { hostName = "eu.nixbuild.net"; + system = "x86_64-linux"; + maxJobs = 100; + supportedFeatures = [ "benchmark" "big-parallel" ]; + } + ]; +}; + + # Bootloader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + networking.hostName = "crash"; # Define your hostname. + + services.tailscale.enable = true; + + networking.networkmanager.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. + # You can disable this if you're only using the Wayland session. + services.xserver.enable = true; + + # Enable the KDE Plasma Desktop Environment. + services.displayManager.sddm.enable = true; + services.desktopManager.plasma6.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. + 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.nathan = { + extraGroups = [ "networkmanager" ]; + }; + + # Install firefox. + programs.firefox.enable = 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 + ]; + + # 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 = "24.11"; # Did you read the comment? + +} diff --git a/nixos/machines/crash/hardware.nix b/nixos/machines/crash/hardware.nix new file mode 100644 index 0000000..5a7ca38 --- /dev/null +++ b/nixos/machines/crash/hardware.nix @@ -0,0 +1,40 @@ +# 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" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/0a846b89-7219-47c1-9db5-362e3c018964"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/D1C9-AFA9"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/bf35a46f-552c-4b37-a68b-c2fcf132f359"; } + ]; + + # 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.wlp0s20f3.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/nixos/machines/crash/machine.nix b/nixos/machines/crash/machine.nix new file mode 100644 index 0000000..97b4aec --- /dev/null +++ b/nixos/machines/crash/machine.nix @@ -0,0 +1,49 @@ +{ withSystem, inputs, ... }: +{ + # perSystem = { ... }: { config.packages.hello = ...; }; + + flake.nixosConfigurations.crash = withSystem "x86_64-linux" ( + ctx@{ config, inputs', ... }: + inputs.nixpkgs.lib.nixosSystem { + # Expose `packages`, `inputs` and `inputs'` as module arguments. + # Use specialArgs permits use in `imports`. + # Note: if you publish modules for reuse, do not rely on specialArgs, but + # on the flake scope instead. See also https://flake.parts/define-module-in-separate-file.html + specialArgs = { + packages = config.packages; + inherit inputs inputs'; + }; + modules = [ + ( + { + config, + lib, + pkgs, + ... + }: + + { + imports = [ + # Hardware support + inputs.nixos-hardware.nixosModules.microsoft-surface-common + # Our modules + (import ../../modules/base.nix { inherit inputs; }) + (import ./configuration.nix) + (import ./hardware.nix) + (import ../../modules/user.nix { + inherit inputs; + mutableUsers = false; + }) + ]; + + nix.settings.experimental-features = [ + "nix-command" + "flakes" + ]; + + } + ) + ]; + } + ); +}