bluurb

1 files changed, 9 insertions, 52 deletions

diff --git a/configuration/tarrel/default.nix b/configuration/tarrel/default.nix
index f92285b..f8519a7 100644
--- a/configuration/tarrel/default.nix
+++ b/configuration/tarrel/default.nix
@@ -1,25 +1,23 @@
-{ pkgs, inputs, config, ... }:
+{ config, ... }:
 {
   imports = [
     ./hardware-configuration.nix
+    ./home-manager.nix
 
-    ../packages.nix
-    ../services.nix
-    ../users
+    ../core
     ../hyprland.nix
-    ../nix-settings.nix
   ];
 
-  nixpkgs.config.allowUnfree = true;
+  system.stateVersion = "24.05";
+
+  networking.hostName = "tarrel";
+  networking.networkmanager.enable = true;
+
+  users.users.jras.extraGroups = [ "networkmanager" ];
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
-  environment.systemPackages = with pkgs; [
-    zola
-    discord
-  ];
-
   hardware.graphics.enable = true;
   services.xserver.videoDrivers = ["nvidia"];
   hardware.nvidia = {
@@ -33,35 +31,6 @@
 
   security.rtkit.enable = true;
   
-  time.timeZone = "Europe/Amsterdam";
-
-  i18n.defaultLocale = "en_US.UTF-8";
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "nl_NL.UTF-8";
-    LC_IDENTIFICATION = "nl_NL.UTF-8";
-    LC_MEASUREMENT = "nl_NL.UTF-8";
-    LC_MONETARY = "nl_NL.UTF-8";
-    LC_NAME = "nl_NL.UTF-8";
-    LC_NUMERIC = "nl_NL.UTF-8";
-    LC_PAPER = "nl_NL.UTF-8";
-    LC_TELEPHONE = "nl_NL.UTF-8";
-    LC_TIME = "nl_NL.UTF-8";
-  };
-
-  console.keyMap = "us-acentos";
-
-  programs.zsh.enable = true;
-
-  users.users.jras = {
-    isNormalUser = true;
-    description = "Jasper";
-    extraGroups = [ "networkmanager" "wheel" "audio" ];
-    shell = pkgs.zsh;
-  };
-
-  security.sudo.execWheelOnly = true;
-  security.sudo.wheelNeedsPassword = false;
-
   environment.sessionVariables = {
     TERMINAL = "alacritty";
     EDITOR = "helix";
@@ -69,18 +38,6 @@
 
   environment.pathsToLink = [ "/libexec" ];
 
-  networking.hostName = "tarrel";
-  networking.networkmanager.enable = true;
-
-  home-manager = {
-    useGlobalPkgs = true;
-    useUserPackages = true;
-    users.jras = import ../../home-manager/entrypoints/personal.nix;
-    extraSpecialArgs = { inherit inputs; monitor-names = ["DP-2" "HDMI-A-1"]; };
-  };
-
-  system.stateVersion = "24.05"; # Did you read the comment?
-
   services.sunshine = {
     enable = true;
     autoStart = true;