moving server configs to be more modular

flake.nix

@@ -3,7 +3,7 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-22.05";
+    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-22.11";
     home-manager = {
       url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixpkgs";

modules/base.nix

@@ -2,10 +2,23 @@
 
 with lib;
 {
-  nixpkgs.config.allowUnfree = true;
+
+  nix = {
+   extraOptions = "experimental-features = nix-command flakes";
+   package = pkgs.nixFlakes; 
+  };
+
+  nixpkgs.config.allowUnFree = true;
+
+  # Use the systemd-boot EFI boot loader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
   i18n.defaultLocale = "en_US.UTF-8";
   time.timeZone = "America/Chicago";
 
+  networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
+
   # Set default shell to be dash for speed
   # Apparently this is bad because a lot of nix relies on bash
   # environment.binsh = "${pkgs.dash}/bin/dash";

modules/desktop.nix

@@ -21,14 +21,7 @@ with lib;
     kernelPackages = pkgs.linuxPackages_zen;
     kernelParams = [ "mem_sleep_default=deep" "nvme.noacpi=1"];
     # initrd.kernelModules = [ "amdgpu" ];
-    loader = {
-      systemd-boot.enable = true;
-      efi.canTouchEfiVariables = true;
   };
-  };
-
-  networking.networkmanager.enable = true;
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
   # The global useDHCP flag is deprecated, therefore explicitly set to false here.
   # Per-interface useDHCP will be mandatory in the future, so this generated config

pkgs/base-packages.nix

@@ -44,3 +44,4 @@
     neofetch
   ];
 }
+

system/dalinar/configuration.nix

@@ -4,33 +4,11 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
+      ../../modules/base.nix
+      ../../pkgs/base-packages.nix
     ];
 
-  nix = {
-   extraOptions = "experimental-features = nix-command flakes";
-   package = pkgs.nixFlakes; 
-  };
-
-  nixpkgs.config.allowUnFree = true;
-
-  # Use the systemd-boot EFI boot loader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
   networking.hostName = "dalinar"; # Define your hostname.
-  # Pick only one of the below networking options.
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-  networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
-
-  # Set your time zone.
-  time.timeZone = "America/Chicago";
-
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-
-  # Select internationalisation properties.
-  i18n.defaultLocale = "en_US.UTF-8";
 
   # Enable the X11 windowing system.
   # services.xserver.enable = true;
@@ -59,9 +37,6 @@
    ];
   };
 
-  environment.homeBinInPath = true;
-  programs.fish.enable = true;
-
   # Enable touchpad support (enabled default in most desktopManager).
   # services.xserver.libinput.enable = true;
 
@@ -71,32 +46,6 @@
     extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
   };
 
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  environment.systemPackages = with pkgs; [
-    vim  
-    wget
-    yt-dlp
-    bat
-    ripgrep
-    ffmpeg-full
-    rsync
-    dutree
-    tmux
-    git
-    samba
-    exa
-    jq
-    fd
-    bc
-    sysstat
-    procs
-    btop
-    htop
-    unzip
-    blesh
-  ];
-
   virtualisation.docker.enable = true;
 
   # Some programs need SUID wrappers, can be configured further or are

system/kohlin/configuration.nix

@@ -4,51 +4,13 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
+      ../../modules/base.nix
+      ../../pkgs/base-packages.nix
     ];
 
-  nix = {
-   extraOptions = "experimental-features = nix-command flakes";
-   package = pkgs.nixFlakes; 
-  };
-
-  nixpkgs.config.allowUnFree = true;
-
-  # Use the systemd-boot EFI boot loader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
   boot.loader.efi.efiSysMountPoint = "/boot/efi";
 
   networking.hostName = "kohlin"; # Define your hostname.
-  # Pick only one of the below networking options.
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-  networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
-
-  # Set your time zone.
-  time.timeZone = "America/Chicago";
-
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-
-  # Select internationalisation properties.
-  i18n.defaultLocale = "en_US.UTF-8";
-
-  # Enable the X11 windowing system.
-  # services.xserver.enable = true;
-
-  # Configure keymap in X11
-  # services.xserver.layout = "us";
-  # services.xserver.xkbOptions = {
-  #   "eurosign:e";
-  #   "caps:escape" # map caps to escape.
-  # };
-
-  # Enable CUPS to print documents.
-  # services.printing.enable = true;
-
-  # Enable sound.
-  # sound.enable = true;
-  # hardware.pulseaudio.enable = true;
 
   hardware.opengl = {
    enable = true;
@@ -59,13 +21,6 @@
     libvdpau-va-gl    
    ];
   };
-
-  environment.homeBinInPath = true;
-  programs.fish.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 = {
     chris = {
@@ -74,33 +29,6 @@
     };
   };
 
-
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  environment.systemPackages = with pkgs; [
-    vim  
-    wget
-    yt-dlp
-    bat
-    ripgrep
-    ffmpeg-full
-    rsync
-    dutree
-    tmux
-    git
-    samba
-    exa
-    jq
-    fd
-    bc
-    sysstat
-    procs
-    btop
-    htop
-    unzip
-    #blesh
-  ];
-
   virtualisation.docker.enable = true;
 
   # Some programs need SUID wrappers, can be configured further or are