absolutely massive rewrite, made (almost) everything modular with changes to come

1 files changed, 37 insertions, 101 deletions

diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix
index be74098..4dbf3bb 100644
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -1,131 +1,67 @@
-{ inputs, pkgs, ... }:
+{ pkgs, ... }:
 {
   nixpkgs.config.allowUnfree = true;
 
   imports = [
       ./hardware-configuration.nix
-      ../../modules/sys/default.nix
-      inputs.home-manager.nixosModules.home-manager
-      inputs.chaotic.nixosModules.default
+      ../../sys/default.nix
     ];
 
-  szpont = {
-    audio.enable = true;
-    bootloader = "systemd-boot";
-    drivers = {
-      enable = true;
-      amd.enable = true;
-      stability = "unstable";
+  szpont.sys = {
+    core = {
+      audio.enable = true;
+      bootloader = "systemd-boot";
+      drivers = {
+        enable = true;
+        amd.enable = true;
+        stability = "unstable";
+      };
+      fonts.enable = true;
+      greet.enable = true;
+      home-manager = {
+        enable = true;
+        users.adam.path = ./home.nix;
+      };
+      locale.enable = true;
+      network.enable = true;
+      security.enable = true;
     };
-    fonts.enable = true;
-    greet.enable = true;
-    home-manager = {
-      enable = true;
-      users.adam.path = ./home.nix;
+    srv = {
+      files = {
+        thunar.enable = true;
+        utils.enable = true;
+      };
+      gaming = {
+        enable = true;
+        steam.enable = true;
+        vr.enable = true;
+      };
+      kvm.enable = true;
+      nix-helper.enable = true;
+      ollama.enable = true;
     };
-    locale.enable = true;
-    network.enable = true;
-    security.enable = true;
-    virtualization.enable = true;
-    niri.enable = true;
-  };
-
-  programs.alvr = {
-    enable = true;
-    openFirewall = true;
-  };
-
-  programs.thunar = {
-    enable = true;
-    plugins = [
-      pkgs.xfce.thunar-volman
-      pkgs.xfce.thunar-vcs-plugin
-      pkgs.xfce.thunar-archive-plugin
-    ];
-  };
-
-  nixpkgs.config.packageOverrides = pkgs: {
-    bottles = pkgs.bottles.override { 
-      removeWarningPopup = true; 
+    wm = {
+      niri.enable = true;
     };
   };
 
-  programs.xwayland = {
-    enable = true;
-    package = pkgs.xwayland-satellite;
-  };
-
   programs.kdeconnect.enable = true;
 
-  programs.coolercontrol.enable = true;
-
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-    pinentryPackage = pkgs.pinentry-curses;
-  };
-  
-  programs.gamescope.enable = true;
-
-programs.steam = {
-  enable = true;
-  localNetworkGameTransfers.openFirewall = true;
-  dedicatedServer.openFirewall = true;
-  remotePlay.openFirewall = false;
-  extest.enable = true;
-  protontricks.enable = true;
-
-  extraCompatPackages = with pkgs; [
-    proton-ge-custom
-  ];
-};
-
-  programs.gamemode = {
-    enable = true;
-    enableRenice = true;
-  };
-
   services.flatpak.enable = true;
 
-  services.dbus.enable = true;
-
-  xdg.portal = {
-    enable = true;
-    extraPortals = with pkgs; [
-      xdg-desktop-portal-gtk
-    ];
-  };
-
-environment.sessionVariables = {
-  NIXOS_OZONE_WL = "1";
-  ELECTRON_ENABLE_WAYLAND = "1";
-  };
-
     programs.fish.enable = true;
     
     users.users.adam = {
       isNormalUser = true;
-      extraGroups = [ "wheel" "input" ];
+      extraGroups = [ "wheel" ];
       home = "/home/adam";
       shell = pkgs.fish;
    };
    
    environment.systemPackages = with pkgs; [
-    pigz
-    pxz
     nautilus
-    swaylock-effects
-    swayidle
-    helvum
-    fuzzel
-    wineWowPackages.waylandFull
-    winetricks
-    linux-firmware
-    mangohud
-    cliphist
-    wl-clipboard
     rivalcfg
    ];
 
-system.stateVersion = "25.05";
+  system.stateVersion = "25.05";
 }