From aa3653e8c2519a2cdc55d6b779069f649a0cb430 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Sat, 11 May 2024 00:30:18 -0500 Subject: [PATCH] add h002 starter files --- flake.nix | 61 +++++++++++++++++++--------- hosts/h002/configuration.nix | 76 +++++++++++++++++++++++++++++++++++ users/luser/configuration.nix | 42 +++++++++++++++++++ 3 files changed, 161 insertions(+), 18 deletions(-) create mode 100644 hosts/h002/configuration.nix create mode 100644 users/luser/configuration.nix diff --git a/flake.nix b/flake.nix index 7ca118f..0d9e4da 100644 --- a/flake.nix +++ b/flake.nix @@ -16,8 +16,7 @@ home-manager = { url = "github:nix-community/home-manager/master"; - inputs.nixpkgs.follows = - "nixpkgs"; # Use system packages list where available + inputs.nixpkgs.follows = "nixpkgs"; # Use system packages list where available }; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; @@ -28,7 +27,14 @@ }; }; - outputs = { self, nypkgs, nixpkgs, home-manager, ... } @ inputs: + outputs = + { + self, + nypkgs, + nixpkgs, + home-manager, + ... + }@inputs: let user = { username = "josh"; @@ -56,6 +62,21 @@ inherit user; }; } + { + name = "h002"; + opts = { + system = "x86_64-linux"; + }; + settings = { + user = { + username = "luser"; + git = { + email = "ringofstorms@gmail.com"; + name = "RingOfStorms (Joshua Bell)"; + }; + }; + }; + } ]; directories = { @@ -68,24 +89,28 @@ in { # foldl' is "reduce" where { } is the accumulator and myHosts is the array to reduce on. - nixosConfigurations = builtins.foldl' - (acc: nixConfig: - acc // { - "${nixConfig.name}" = nixpkgs.lib.nixosSystem - { - # module = nixConfig.overrides.modules or [...] - modules = [ ./hosts/_common/configuration.nix ]; - specialArgs = inputs // { - ylib = nypkgs.legacyPackages.${nixConfig.opts.system}.lib; - settings = directories // nixConfig.settings // { + nixosConfigurations = builtins.foldl' ( + acc: nixConfig: + acc + // { + "${nixConfig.name}" = + nixpkgs.lib.nixosSystem { + # module = nixConfig.overrides.modules or [...] + modules = [ ./hosts/_common/configuration.nix ]; + specialArgs = inputs // { + ylib = nypkgs.legacyPackages.${nixConfig.opts.system}.lib; + settings = + directories + // nixConfig.settings + // { system = nixConfig.opts // { hostname = nixConfig.name; }; }; - }; - } // nixConfig.opts; - }) - { } - myHosts; + }; + } + // nixConfig.opts; + } + ) { } myHosts; }; } diff --git a/hosts/h002/configuration.nix b/hosts/h002/configuration.nix new file mode 100644 index 0000000..2bf390c --- /dev/null +++ b/hosts/h002/configuration.nix @@ -0,0 +1,76 @@ +{ config, lib, pkgs, settings, ... } @ args: +{ + imports = + [ + (settings.hostsDir + "/_common/components/neovim.nix") + # Common components this machine uses + (settings.hostsDir + "/_common/components/systemd_boot.nix") + (settings.hostsDir + "/_common/components/ssh.nix") + (settings.hostsDir + "/_common/components/caps_to_escape_in_tty.nix") + (settings.hostsDir + "/_common/components/font_jetbrainsmono.nix") + (settings.hostsDir + "/_common/components/home_manager.nix") + (settings.hostsDir + "/_common/components/gnome_xorg.nix") + (settings.hostsDir + "/_common/components/docker.nix") + # Users this machine has + (settings.usersDir + "/root/configuration.nix") + (settings.usersDir + "/josh/configuration.nix") + ]; + + # machine specific configuration + # ============================== + hardware.enableAllFirmware = true; + # Connectivity + networking.networkmanager.enable = true; + hardware.bluetooth.enable = true; + environment.shellAliases = { + wifi = "nmtui"; + }; + # Enable sound. + sound.enable = true; + hardware.pulseaudio.enable = true; + hardware.pulseaudio.package = pkgs.pulseaudioFull; + + environment.systemPackages = with pkgs; [ nvtopPackages.full ]; + + # nvidia gfx https://nixos.wiki/wiki/Nvidia + # ========= + # Enable OpenGL + hardware.opengl = { + enable = true; + driSupport = true; + driSupport32Bit = true; + }; + + # Load nvidia driver for Xorg and Wayland + services.xserver.videoDrivers = [ "nvidia" ]; + hardware.nvidia = { + # Modesetting is required. + modesetting.enable = true; + + # Nvidia power management. Experimental, and can cause sleep/suspend to fail. + # Enable this if you have graphical corruption issues or application crashes after waking + # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead + # of just the bare essentials. + 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/users/luser/configuration.nix b/users/luser/configuration.nix new file mode 100644 index 0000000..3ac975f --- /dev/null +++ b/users/luser/configuration.nix @@ -0,0 +1,42 @@ +{ lib, ylib, settings, ... }: +{ + imports = + [ ] + ## Common nix modules + ++ ylib.umport { + path = lib.fileset.maybeMissing (settings.usersDir + "/_common/nix_modules"); + recursive = true; + } + # Nix modules for this user + ++ ylib.umport { + path = lib.fileset.maybeMissing ./nix_modules; + recursive = true; + } + # Nix modules by host for this user + ++ ylib.umport { + path = lib.fileset.maybeMissing ./by_hosts/${settings.system.hostname}/nix_modules; + recursive = true; + }; + + home-manager.users.${settings.user.username} = { + imports = + [ ] + # Common home manager + ++ ylib.umport { + path = lib.fileset.maybeMissing (settings.usersDir + "/_common/home_manager"); + recursive = true; + } + # Home manger for this user + ++ ylib.umport { + path = lib.fileset.maybeMissing ./home_manager; + recursive = true; + } + # Home manager by host for this user + ++ ylib.umport { + path = lib.fileset.maybeMissing ./by_hosts/${settings.system.hostname}/home_manager; + recursive = true; + }; + }; +} + +