refactor

configuration.nix

@@ -1,44 +1,44 @@
-{ pkgs, ... }@all: with all;
+{ ... }@all: with all;
 {
   imports = [
     inputs.sops-nix.nixosModules.sops
-
     ./system-modules/adb.nix
     ./system-modules/auto-mount.nix
+    ./system-modules/tz.nix
+    ./system-modules/bluetooth.nix
     ./system-modules/boot.nix
-    ./system-modules/boot.nix 
     ./system-modules/calendar.nix
     ./system-modules/dm.nix
     ./system-modules/docker.nix
     ./system-modules/fcitx5.nix
     ./system-modules/fonts.nix
-    ./system-modules/fonts.nix
-    ./system-modules/fuse.nix
     ./system-modules/fuse.nix
     ./system-modules/games.nix
     ./system-modules/gc.nix
-    ./system-modules/gc.nix
     ./system-modules/gpg.nix
     ./system-modules/hardware-configuration.nix
-    ./system-modules/hardware-configuration.nix
     ./system-modules/health_reminder.nix
     ./system-modules/hsmw.nix
     ./system-modules/kanata.nix
+    ./system-modules/terminal.nix
     ./system-modules/kodi.nix
     ./system-modules/networking.nix
     ./system-modules/nixd.nix
     ./system-modules/nvidia.nix 
-    ./system-modules/nvidia.nix 
     ./system-modules/ollama.nix
     ./system-modules/qmk.nix
     ./system-modules/scanning.nix
     ./system-modules/sops.nix
     ./system-modules/sound.nix
-    ./system-modules/sound.nix
     ./system-modules/sshd.nix
+    ./system-modules/base-packages.nix
+    ./system-modules/input.nix
     ./system-modules/syncthing.nix
     ./system-modules/tuda.nix
-    ./system-modules/users.nix
+    ./system-modules/gui.nix
+    ./system-modules/editor.nix
+    ./system-modules/printing.nix
+    ./system-modules/security.nix
     ./system-modules/users.nix
     ./system-modules/virtualisation.nix
     ./system-modules/ydotool.nix
@@ -48,110 +48,20 @@
     ./system-modules/postgres.nix
     ./system-modules/nx2site/proxy.nix
     ./system-modules/nx2site/audiobookshelf.nix
-    # ./system-modules/nx2site/dyn_dns.nix
     ./system-modules/nx2site/gitea.nix
     ./system-modules/nx2site/open-web-calendar.nix
     ./system-modules/nx2site/radicale.nix
-    # ./system-modules/nx2site/nextcloud.nix
     ./system-modules/nx2site/vaultwarden.nix
     ./system-modules/nx2site/paperless.nix
-
-    ./system-modules/calendar-publish.nix
-    ./system-modules/calendar-lec.nix
-    ./system-modules/calendar-lr.nix
-    ./system-modules/calendar-dicos.nix
+    ./system-modules/calendar/publish.nix
+    ./system-modules/calendar/lec.nix
+    ./system-modules/calendar/lr.nix
+    ./system-modules/calendar/dicos.nix
   ] else [
   ]);
-
-  # Set your time zone.
-  time.timeZone = "Europe/Berlin";
-
-  # Select internationalisation properties.
-  i18n.defaultLocale = "en_US.UTF-8";
-  console.font = "Lat2-Terminus16";
-  console.keyMap = "de";
-
-  services.xserver = {
-    enable = true;
-    xkb = {
-      layout = "de";
-      options = "eurosign:e,caps:escape";
-    };
-    # lightdm in lightdm.nix
-  };
-  # Enable CUPS to print documents.
-  services.printing.enable = true;
-
-  # rtkit is optional but recommended
-  security.rtkit.enable = true;
-
-  # Enable touchpad support (enabled default in most desktopManager).
-  services.libinput.enable = true;
-  hardware.uinput.enable = true;
-
-  hardware.bluetooth = {
-    enable = true;
-    powerOnBoot = true;  
-    package = pkgs.bluez5-experimental;
-    settings.Policy.AutoEnable = "true";
-    settings.General.Enable = "Source,Sink,Media,Socket";
-   };
-  services.blueman.enable = true;
-
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  environment.systemPackages = with pkgs; ([
-    git
-    git-crypt
-    lazygit # home-manager module is bugged
-    wget
-    curlHTTP3
-    zip
-    unzip
-    p7zip
-    unar
-    nano
-    htop
-    direnv
-    openssl
-    blueman
-    dmidecode
-    file
-    parallel
-  ]);
-
-  environment.variables = {
-    EDITOR = "hx";
-    VISUAL = "hx";  
-  };
-
-
-  programs.hyprland = {
-    # config is done with home-manager
-    enable = true;
-    xwayland.enable = true;
-  };
-
   systemd.extraConfig = "DefaultLimitNOFILE=2048";
-  boot.tmp.useTmpfs = false; 
-
-  system.stateVersion = pkgs.version;
-
-  # nixpkgs.pkgs = pkgs;
-
-  nix = {
-    settings = {
-      experimental-features = [ "nix-command" "flakes" ];
-      substitute = true;
-      substituters = [
-        "https://yazi.cachix.org"
-      ];
-      trusted-public-keys = [
-        "yazi.cachix.org-1:Dcdz63NZKfvUCbDGngQDAZq6kOroIrFoyO064uvLh8k="
-      ];
-    };
-  };
-
+  system.stateVersion = hyper.pkgs-version;
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
   programs.bash.shellInit = ''
     source $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh
   '';