bluurb

1 files changed, 7 insertions, 47 deletions

diff --git a/configuration/work/default.nix b/configuration/work/default.nix
index 5bc9958..f17ac74 100644
--- a/configuration/work/default.nix
+++ b/configuration/work/default.nix
@@ -1,15 +1,17 @@
-{ config, pkgs, inputs, ... }:
+{ config, pkgs, ... }:
 {
   imports = [
     ./hardware-configuration.nix
+    ./home-manager.nix
 
-    ../packages.nix
-    ../services.nix
-    ../users
+    ../core
     ../hyprland.nix
-    ../nix-settings.nix
   ];
 
+  system.stateVersion = "24.05"; # Do NOT change before reading configuration.nix
+
+  users.users.jras.extraGroups = [ "networkmanager" "docker" ];
+
   age.secrets.ghostnet-cert.file = ../../secrets/ghostnet-cert.age;
   age.secrets.ghostnet-key.file = ../../secrets/ghostnet-key.age;
   age.secrets.ghostnet-ca.file = ../../secrets/ghostnet-ca.age;
@@ -21,19 +23,6 @@
   age.secrets.systems-ca.file = ../../secrets/systems-ca.age;
   age.secrets.systems-tls-auth.file = ../../secrets/systems-tls-auth.age;
 
-  environment.systemPackages = with pkgs; [
-    slack
-    git-review
-    hexchat
-    apacheHttpd
-    moonlight-qt
-    brightnessctl
-    hugo
-    google-chrome
-  ];
-
-  nixpkgs.config.allowUnfree = true;
-
   virtualisation.docker = {
     enable = true;
     enableOnBoot = true;
@@ -51,21 +40,6 @@
   networking.nameservers = [ "1.1.1.1" ];
   networking.firewall.allowedTCPPorts = [];
 
-  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";
-  };
-
   services.libinput.mouse.accelProfile = "flat";
   services.libinput.mouse.accelSpeed = "-5";
   services.upower.enable = true;
@@ -151,20 +125,6 @@
     variant = "";
   };
 
-  users.users.jras = {
-    isNormalUser = true;
-    description = "Jasper Ras";
-    extraGroups = [ "networkmanager" "wheel" "docker" ];
-    packages = with pkgs; [ git ];
-  };
-
-  home-manager.useGlobalPkgs = true;
-  home-manager.useUserPackages = true;
-  home-manager.users.jras = import ../../home-manager/entrypoints/work.nix;
-  home-manager.extraSpecialArgs = { inherit inputs; monitor-names = ["eDP-1" "HDMI-A-1" "DP-10"]; };
-
   programs.gnupg.agent.enable = true;
   programs.gnupg.agent.pinentryPackage = pkgs.pinentry-gnome3;
-
-  system.stateVersion = "24.05"; # Do NOT change before reading configuration.nix
 }