2 files changed, 93 insertions, 99 deletions

diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix
index d4cd0d7..be74098 100644
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -2,37 +2,37 @@
 {
   nixpkgs.config.allowUnfree = true;
 
-  imports =
-    [
+  imports = [
       ./hardware-configuration.nix
-      ../../modules/greet.nix
-      ../../modules/virtualization.nix
-      ../../modules/boot.nix
-      ../../modules/audio.nix
-      ../../modules/networking.nix
-      # ../../modules/scx.nix
-      ../../modules/tor.nix
-      # ../../modules/hyprland.nix
-      ../../modules/niri.nix
-      ../../modules/ollama.nix
+      ../../modules/sys/default.nix
       inputs.home-manager.nixosModules.home-manager
       inputs.chaotic.nixosModules.default
     ];
 
-  home-manager = {
-    extraSpecialArgs = { inherit inputs; };
-    users = {
-      "adam" = import ../../home/home.nix;
+  szpont = {
+    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;
     };
-    backupFileExtension = "bak";
-    useGlobalPkgs = true;
-    useUserPackages = true;
+    locale.enable = true;
+    network.enable = true;
+    security.enable = true;
+    virtualization.enable = true;
+    niri.enable = true;
   };
 
-  services.smartd.enable = true;
-
-  services.spotifyd = {
+  programs.alvr = {
     enable = true;
+    openFirewall = true;
   };
 
   programs.thunar = {
@@ -76,46 +76,16 @@ programs.steam = {
   protontricks.enable = true;
 
   extraCompatPackages = with pkgs; [
-    proton-cachyos_nightly_x86_64_v4
-    proton-cachyos_x86_64_v4
     proton-ge-custom
   ];
 };
 
-  services.flatpak.enable = true;
-
-hardware.cpu.amd.updateMicrocode = true;
-
-services.xserver.videoDrivers = [ "amdgpu" ];
-hardware.sensor.iio.enable = true;
-services.lact.enable = true;
-
- nix.settings = {
-   trusted-users = [ "root" "adam" ];
-   experimental-features = [ "nix-command" "flakes" ];
- };
-
-  hardware = {
-    enableRedistributableFirmware = true;
-    graphics = {
-      enable = true;
-      enable32Bit = true;
-    };
-    amdgpu = {
-      initrd.enable = true;
-      overdrive.enable = true;
-    };
-  };
-
-chaotic = {
-  mesa-git = {
+  programs.gamemode = {
     enable = true;
-    fallbackSpecialisation = false;
-      extraPackages = with pkgs; [
-        mesa_git.opencl
-      ];
+    enableRenice = true;
   };
-};
+
+  services.flatpak.enable = true;
 
   services.dbus.enable = true;
 
@@ -126,29 +96,6 @@ chaotic = {
     ];
   };
 
-  time.timeZone = "Europe/Warsaw";
-
-  i18n.defaultLocale = "en_US.UTF-8";
-  i18n.extraLocaleSettings = {
-    LC_TIME = "pl_PL.UTF-8";
-    LC_NUMERIC = "pl_PL.UTF-8";
-    LC_MONETARY = "pl_PL.UTF-8";
-    LC_PAPER = "pl_PL.UTF-8";
-    LC_MEASUREMENT = "pl_PL.UTF-8";
-    LC_COLLATE = "pl_PL.UTF-8";
-    LC_NAME = "pl_PL.UTF-8";
-    LC_ADDRESS = "pl_PL.UTF-8";
-    LC_TELEPHONE = "pl_PL.UTF-8";
-    LC_IDENTIFICATION = "pl_PL.UTF-8";
-  };
-
-  console = {
-    keyMap = "pl";
-    earlySetup = true;
-    font = "ter-v32n";
-    packages = with pkgs; [ terminus_font ];
-  };
-
 environment.sessionVariables = {
   NIXOS_OZONE_WL = "1";
   ELECTRON_ENABLE_WAYLAND = "1";
@@ -158,45 +105,27 @@ environment.sessionVariables = {
     
     users.users.adam = {
       isNormalUser = true;
-      extraGroups = [ "wheel" "input" "docker" ];
+      extraGroups = [ "wheel" "input" ];
       home = "/home/adam";
       shell = pkgs.fish;
    };
    
-  programs.nh = {
-    enable = true;
-    flake = "/etc/nixos";
-  };
-
    environment.systemPackages = with pkgs; [
     pigz
+    pxz
     nautilus
-    gnome-keyring
-    kdePackages.dolphin
     swaylock-effects
     swayidle
     helvum
     fuzzel
     wineWowPackages.waylandFull
-    # wineWowPackages.unstableFull
     winetricks
-    tuigreet
     linux-firmware
     mangohud
     cliphist
     wl-clipboard
-    nix-output-monitor
-    nvd
     rivalcfg
-    lutris
-    easyeffects
    ];
 
-  fonts.packages = with pkgs; [
-    nerd-fonts.jetbrains-mono 
-    nerd-fonts.fira-mono
-    nerd-fonts.fira-code
-];
-
 system.stateVersion = "25.05";
 }
diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix
new file mode 100644
index 0000000..71580b7
--- /dev/null
+++ b/hosts/desktop/home.nix
@@ -0,0 +1,65 @@
+{ pkgs, inputs, ... }:
+{
+  imports = [
+    ../../modules/hm/default.nix
+];
+
+  home.username = "adam";
+  home.homeDirectory = "/home/adam";
+  home.stateVersion = "25.05";
+
+  home.packages = with pkgs; [
+    librewolf
+    gavin-bc
+    qalculate-gtk
+    onlyoffice-desktopeditors
+    file
+    heroic
+    protonvpn-gui
+    evolution
+    imagemagick
+    kdePackages.kdenlive
+    syncplay
+    bottles
+    ncdu
+    prismlauncher
+    inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww
+    grim
+    slurp
+    satty
+    veracrypt
+    brave
+    qbittorrent-enhanced
+    foot
+    bitwarden-desktop
+    yt-dlp_git
+    ffmpeg
+    mpv
+    gimp
+    thunderbird
+    obsidian
+  ];
+
+  services.easyeffects.enable = true;
+
+  services.cliphist = {
+    enable = true;
+    systemdTargets = [ "graphical-session.target" ];
+  };
+
+  gtk = {
+    enable = true;
+    colorScheme = "dark";
+    theme = {
+      name = "Adwaita-dark";
+      package = pkgs.gnome-themes-extra;
+    };
+  };
+
+  qt = {
+    enable = true;
+    style.name = "adwaita-dark";
+    style.package = pkgs.adwaita-qt;
+    platformTheme.name = "kde";
+  };
+}