break out

modules/nixos/base.nix

@@ -1,10 +1,13 @@
 {
   inputs,
+  nixosModules,
   pkgs,
   userName,
   ...
 }:
 {
+  imports = [ nixosModules.packages.common ];
+
   nixpkgs.config.allowUnfree = true;
 
   nix = {
@@ -27,14 +30,6 @@
     };
   };
 
-  boot.loader.systemd-boot = {
-    enable = true;
-    configurationLimit = 10;
-    edk2-uefi-shell.enable = true;
-  };
-  boot.loader.efi.canTouchEfiVariables = true;
-  boot.loader.grub.enable = false;
-
   i18n = rec {
     defaultLocale = "en_US.UTF-8";
     extraLocales = [ "sv_SE.UTF-8/UTF-8" ];
@@ -96,51 +91,8 @@
 
   environment.sessionVariables = {
     EDITOR = "nvim";
-    NIXOS_OZONE_WL = "1";
   };
 
-  environment.systemPackages = with pkgs; [
-    inputs."lolcat++".packages.${pkgs.stdenv.hostPlatform.system}.default
-
-    file
-    cowsay
-    fortune
-    bat
-    fastfetch
-    curl
-    eza
-    fzf
-    git
-    git-lfs
-    ripgrep
-    neovim
-    odt2txt
-    openssl
-    stow
-    tpm2-tools
-    unzip
-    wget
-    killall
-    tealdeer
-    yazi
-    fd
-
-    efibootmgr
-
-    nil
-
-    gcc
-    clang
-    gnumake
-    cmake
-    ninja
-    pkg-config
-    binutils
-    gdb
-    nodejs
-    rustup
-  ];
-
   security.sudo.wheelNeedsPassword = true;
 
   users.users.${userName}.openssh.authorizedKeys.keys = [ ];