Przystosowywanie pod siebie.

modules/core/default.nix

@@ -1,11 +1,7 @@
 {
   inputs,
-  host,
   ...
 }:
-let
-  vars = import ../../hosts/${host}/variables.nix;
-in
 {
   imports = [
     ./boot.nix

modules/core/flatpak.nix

@@ -2,8 +2,24 @@
 {
   xdg.portal = {
     enable = true;
-    extraPortals = [ pkgs.xdg-desktop-portal-hyprland ];
+    wlr.enable = true;
+    extraPortals = with pkgs; [
+      xdg-desktop-portal-hyprland
+      xdg-desktop-portal-gtk
+    ];
     configPackages = [ pkgs.hyprland ];
+    config.common = {
+      default = [
+        "hyprland"
+        "gtk"
+      ];
+      "org.freedesktop.impl.portal.Settings" = [
+        "hyprland"
+      ];
+      "org.freedesktop.impl.portal.FileChooser" = [
+        "gtk"
+      ];
+    };
   };
   services = {
     flatpak = {

modules/core/network.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   host,
   options,
   ...
@@ -37,6 +36,4 @@ in
       ];
     };
   };
-
-  environment.systemPackages = with pkgs; [ networkmanagerapplet ];
 }

modules/core/nh.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   username,
   ...
 }:
@@ -12,9 +11,4 @@
     };
     flake = "/home/${username}/garandos";
   };
-
-  environment.systemPackages = with pkgs; [
-    nix-output-monitor
-    nvd
-  ];
 }

modules/core/packages.nix

@@ -26,10 +26,20 @@
   nixpkgs.config.allowUnfree = true;
 
   environment.systemPackages = with pkgs; [
-    # Hyprland systeminfo QT  (Optional)
-    #inputs.hyprsysteminfo.packages.${pkgs.system}.default
-
+    nixd
+    nil
     discord
+    trash-cli
+    eddie
+    dex
+    galculator
+    networkmanagerapplet
+    nix-output-monitor
+    nvd
+    ffmpegthumbnailer # Need For Video / Image Preview
+    virt-viewer # View Virtual Machines
+    lazydocker
+    docker-client
     amfora # Fancy Terminal Browser For Gemini Protocol
     appimage-run # Needed For AppImage Support
     brightnessctl # For Screen Brightness Control
@@ -43,8 +53,7 @@
     ffmpeg # Terminal Video / Audio Editing
     file-roller # Archive Manager
     gedit # Simple Graphical Text Editor
-    #gemini-cli # CLI AI client ONLY (optional)
-    gimp # Great Photo Editor
+    gimp3 # Great Photo Editor
     glxinfo # needed for inxi diag util
     tuigreet # The Login Manager (Sometimes Referred To As Display Manager)
     htop # Simple Terminal Based System Monitor
@@ -92,7 +101,6 @@
     wineWowPackages.waylandFull # wine64
     lutris
     space-cadet-pinball
-    dex
     exercism
     tty-solitaire
     cmatrix
@@ -102,5 +110,7 @@
     ookla-speedtest
     kronometer
     inputs.prismlauncher-cracked.packages.${system}.default
+    zed-editor
+    distrobox
   ];
 }

modules/core/quickshell.nix

@@ -1,31 +0,0 @@
-{ pkgs, inputs, ... }:
-{
-  environment.systemPackages = with pkgs; [
-    inputs.quickshell.packages.${pkgs.system}.default
-
-    # Qt6 related kits（for slove Qt5Compat problem）
-    qt6.qt5compat
-    qt6.qtbase
-    qt6.qtquick3d
-    qt6.qtwayland
-    qt6.qtdeclarative
-    qt6.qtsvg
-
-    # alternate options
-    # libsForQt5.qt5compat
-    kdePackages.qt5compat
-    libsForQt5.qt5.qtgraphicaleffects
-  ];
-
-  # necessary environment variables
-  environment.variables = {
-    QML_IMPORT_PATH = "${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtbase}/lib/qt-6/qml";
-    QML2_IMPORT_PATH = "${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtbase}/lib/qt-6/qml";
-  };
-
-  # make sure the Qt application is working properly
-  environment.sessionVariables = {
-    QT_QPA_PLATFORM = "wayland;xcb";
-    QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
-  };
-}

modules/core/security.nix

@@ -18,5 +18,11 @@ _: {
     pam.services.swaylock = {
       text = ''auth include login '';
     };
+    sudo = {
+      enable = true;
+      extraConfig = ''
+        Defaults	pwfeedback
+      '';
+    };
   };
 }

modules/core/thunar.nix

@@ -1,5 +1,4 @@
 {
-  host,
   pkgs,
   ...
 }:
@@ -13,7 +12,4 @@
       ];
     };
   };
-  environment.systemPackages = with pkgs; [
-    ffmpegthumbnailer # Need For Video / Image Preview
-  ];
 }

modules/core/virtualisation.nix

@@ -1,16 +1,10 @@
-{ pkgs, ... }:
+{ ... }:
 {
   # Only enable either docker or podman -- Not both
   virtualisation = {
-    docker = {
-      enable = true;
-    };
-
+    docker.enable = true;
     podman.enable = false;
-
-    libvirtd = {
-      enable = true;
-    };
+    libvirtd.enable = true;
 
     virtualbox.host = {
       enable = false;
@@ -18,13 +12,5 @@
     };
   };
 
-  programs = {
-    virt-manager.enable = false;
-  };
-
-  environment.systemPackages = with pkgs; [
-    virt-viewer # View Virtual Machines
-    lazydocker
-    docker-client
-  ];
+  programs.virt-manager.enable = false;
 }

modules/core/xserver.nix

@@ -4,7 +4,7 @@ let
 in
 {
   services.xserver = {
-    enable = false;
+    enable = true;
     xkb = {
       layout = "${keyboardLayout}";
       variant = "";