przystosowanie konfiguracji pod siebie

modules/core/boot.nix

@@ -5,7 +5,9 @@
     kernelPackages = pkgs.linuxPackages_zen;
     kernelModules = [ "v4l2loopback" ];
     extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ];
-    kernel.sysctl = { "vm.max_map_count" = 2147483642; };
+    kernel.sysctl = {
+      "vm.max_map_count" = 2147483642;
+    };
     loader.systemd-boot.enable = true;
     loader.efi.canTouchEfiVariables = true;
     # Appimage Support

modules/core/default.nix

@@ -4,7 +4,6 @@
   ...
 }:
 let
-  # Import the host-specific variables.nix
   vars = import ../../hosts/${host}/variables.nix;
 in
 {
@@ -16,11 +15,9 @@ in
     ./network.nix
     ./nfs.nix
     ./nh.nix
-    #./quickshell.nix  #Disabled for now not using it yet
     ./packages.nix
     ./printing.nix
-    # Conditionally import the display manager module
-    (if vars.displayManager == "tui" then ./greetd.nix else ./sddm.nix)
+    ./greetd.nix
     ./security.nix
     ./services.nix
     ./steam.nix

modules/core/flatpak.nix

@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   xdg.portal = {
     enable = true;
     extraPortals = [ pkgs.xdg-desktop-portal-hyprland ];
@@ -7,24 +8,12 @@
   services = {
     flatpak = {
       enable = true;
-
-      # List the Flatpak applications you want to install
-      # Use the official Flatpak application ID (e.g., from flathub.org)
-      # Examples:
       packages = [
-        #"com.github.tchx84.Flatseal" #Manage flatpak permissions - should always have this
-        #"com.rtosta.zapzap"              # WhatsApp client
-        #"io.github.flattool.Warehouse"   # Manage flatpaks, clean data, remove flatpaks and deps
-        #"it.mijorus.gearlever"           # Manage and support AppImages
-        #"io.github.freedoom.Phase1"      #  Classic Doom FPS 1
-        #"io.github.freedoom.Phase2"      #  Classic Doom FPS 2
-        #"io.github.dvlv.boxbuddyrs"      #  Manage distroboxes
-        #"de.schmidhuberj.tubefeeder"     #watch YT videos
-
-        # Add other Flatpak IDs here, e.g., "org.mozilla.firefox"
+        "org.vinegarhq.Sober"
+        "io.github.flattool.Warehouse"
+        "com.github.tchx84.Flatseal"
       ];
 
-      # Optional: Automatically update Flatpaks when you run nixos-rebuild swit ch
       update.onActivation = true;
     };
   };

modules/core/fonts.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   fonts = {
     packages = with pkgs; [
       dejavu_fonts

modules/core/greetd.nix

@@ -1,7 +1,9 @@
-{ pkgs
-, username
-, ...
-}: {
+{
+  pkgs,
+  username,
+  ...
+}:
+{
   services.greetd = {
     enable = true;
     #vt = 3;

modules/core/network.nix

@@ -1,7 +1,8 @@
-{ pkgs
-, host
-, options
-, ...
+{
+  pkgs,
+  host,
+  options,
+  ...
 }:
 let
   inherit (import ../../hosts/${host}/variables.nix) hostId;

modules/core/nh.nix

@@ -1,7 +1,9 @@
-{ pkgs
-, username
-, ...
-}: {
+{
+  pkgs,
+  username,
+  ...
+}:
+{
   programs.nh = {
     enable = true;
     clean = {

modules/core/packages.nix

@@ -6,13 +6,9 @@
 }:
 {
   programs = {
-    neovim = {
-      enable = true;
-      defaultEditor = true;
-    };
-    firefox.enable = false; # Firefox is not installed by default
+    nano.enable = true;
     hyprland = {
-      enable = true; # set this so desktop file is created
+      enable = true;
       withUWSM = false;
     };
     dconf.enable = true;
@@ -33,9 +29,9 @@
     # Hyprland systeminfo QT  (Optional)
     #inputs.hyprsysteminfo.packages.${pkgs.system}.default
 
+    discord
     amfora # Fancy Terminal Browser For Gemini Protocol
     appimage-run # Needed For AppImage Support
-    librewolf # Brave Browser
     brightnessctl # For Screen Brightness Control
     cliphist # Clipboard manager using rofi menu
     cmatrix # Matrix Movie Effect In Terminal
@@ -78,10 +74,33 @@
     usbutils # Good Tools For USB Devices
     uwsm # Universal Wayland Session Manager (optional must be enabled)
     v4l-utils # Used For Things Like OBS Virtual Camera
-    waypaper  # wallpaper changer
+    waypaper # wallpaper changer
     warp-terminal # Terminal with AI support build in
     wget # Tool For Fetching Files With Links
     ytmdl # Tool For Downloading Audio From YouTube
+    nextcloud-client
+    plexamp
+    bitwarden-desktop
+    tutanota-desktop
+    slack
+    ungoogled-chromium
+    anki-bin
+    onlyoffice-bin
+    freetube
+    mattermost-desktop
+    kdePackages.kdenlive
+    wineWowPackages.waylandFull # wine64
+    lutris
+    space-cadet-pinball
+    dex
+    exercism
+    tty-solitaire
+    cmatrix
+    cowsay
+    sl
+    fortune
+    ookla-speedtest
+    kronometer
     inputs.prismlauncher-cracked.packages.${system}.default
   ];
 }

modules/core/sddm.nix

@@ -1,72 +0,0 @@
-# SDDM is a display manager for X11 and Wayland
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}: let
-  foreground = config.stylix.base16Scheme.base00;
-  textColor = config.stylix.base16Scheme.base05;
-  sddm-astronaut = pkgs.sddm-astronaut.override {
-    embeddedTheme = "pixel_sakura";
-    themeConfig =
-      if lib.hasSuffix "sakura_static.png" config.stylix.image
-      then {
-        FormPosition = "left";
-        Blur = "2.0";
-      }
-      else if lib.hasSuffix "studio.png" config.stylix.image
-      then {
-        Background = pkgs.fetchurl {
-          url = "https://raw.githubusercontent.com/anotherhadi/nixy-wallpapers/refs/heads/main/wallpapers/studio.gif";
-          sha256 = "sha256-qySDskjmFYt+ncslpbz0BfXiWm4hmFf5GPWF2NlTVB8=";
-        };
-        HeaderTextColor = "#${textColor}";
-        DateTextColor = "#${textColor}";
-        TimeTextColor = "#${textColor}";
-        LoginFieldTextColor = "#${textColor}";
-        PasswordFieldTextColor = "#${textColor}";
-        UserIconColor = "#${textColor}";
-        PasswordIconColor = "#${textColor}";
-        WarningColor = "#${textColor}";
-        LoginButtonBackgroundColor = "#${foreground}";
-        SystemButtonsIconsColor = "#${foreground}";
-        SessionButtonTextColor = "#${textColor}";
-        VirtualKeyboardButtonTextColor = "#${textColor}";
-        DropdownBackgroundColor = "#${foreground}";
-        HighlightBackgroundColor = "#${textColor}";
-      }
-      else {
-        FormPosition = "left";
-        Blur = "4.0";
-        Background = "${toString config.stylix.image}";
-        HeaderTextColor = "#${textColor}";
-        DateTextColor = "#${textColor}";
-        TimeTextColor = "#${textColor}";
-        LoginFieldTextColor = "#${textColor}";
-        PasswordFieldTextColor = "#${textColor}";
-        UserIconColor = "#${textColor}";
-        PasswordIconColor = "#${textColor}";
-        WarningColor = "#${textColor}";
-        LoginButtonBackgroundColor = "#${config.stylix.base16Scheme.base01}";
-        SystemButtonsIconsColor = "#${textColor}";
-        SessionButtonTextColor = "#${textColor}";
-        VirtualKeyboardButtonTextColor = "#${textColor}";
-        DropdownBackgroundColor = "#${config.stylix.base16Scheme.base01}";
-        HighlightBackgroundColor = "#${textColor}";
-        FormBackgroundColor = "#${config.stylix.base16Scheme.base01}";
-      };
-  };
-in {
-  services.displayManager = {
-    sddm = {
-      package = pkgs.kdePackages.sddm;
-      extraPackages = [sddm-astronaut];
-      enable = true;
-      wayland.enable = true;
-      theme = "sddm-astronaut-theme";
-    };
-  };
-
-  environment.systemPackages = [sddm-astronaut];
-}

modules/core/services.nix

@@ -1,4 +1,5 @@
-{ profile, ... }: {
+{ profile, ... }:
+{
   # Services to start
   services = {
     libinput.enable = true; # Input Handling
@@ -8,7 +9,7 @@
       enable = true; # Enable SSH
       settings = {
         PermitRootLogin = "no"; # Prevent root from SSH login
-        PasswordAuthentication = true; #Users can SSH using kb and password
+        PasswordAuthentication = true; # Users can SSH using kb and password
         KbdInteractiveAuthentication = true;
       };
       ports = [ 22 ];
@@ -18,10 +19,7 @@
     gnome.gnome-keyring.enable = true;
 
     smartd = {
-      enable =
-        if profile == "vm"
-        then false
-        else true;
+      enable = if profile == "vm" then false else true;
       autodetect = true;
     };
     pipewire = {

modules/core/starfish.nix

@@ -1,4 +1,5 @@
-{ ... }: {
+{ ... }:
+{
   programs = {
     starship = {
       enable = false;

modules/core/steam.nix

@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   programs = {
     steam = {
       enable = true;
@@ -16,5 +17,7 @@
         "--expose-wayland"
       ];
     };
+
+    gamemode.enable = true;
   };
 }

modules/core/stylix.nix

@@ -1,6 +1,7 @@
-{ pkgs
-, host
-, ...
+{
+  pkgs,
+  host,
+  ...
 }:
 let
   inherit (import ../../hosts/${host}/variables.nix) stylixImage;

modules/core/syncthing.nix

@@ -1,4 +1,5 @@
-{ username, ... }: {
+{ username, ... }:
+{
   services.syncthing = {
     enable = false;
     user = "${username}";

modules/core/system.nix

@@ -30,8 +30,8 @@ in
   };
   environment.variables = {
     NIXOS_OZONE_WL = "1";
-    ZANEYOS_VERSION = "2.4";
-    ZANEYOS = "true";
+    GARANDOS_VERSION = "1.0";
+    GARANDOS = "true";
   };
   console.keyMap = "${consoleKeyMap}";
   system.stateVersion = "23.11"; # Do not change!

modules/core/thunar.nix

@@ -1,14 +1,12 @@
-{ host
-, pkgs
-, ...
+{
+  host,
+  pkgs,
+  ...
 }:
-let
-  inherit (import ../../hosts/${host}/variables.nix) thunarEnable;
-in
 {
   programs = {
     thunar = {
-      enable = thunarEnable;
+      enable = true;
       plugins = with pkgs.xfce; [
         thunar-archive-plugin
         thunar-volman

modules/core/user.nix

@@ -1,9 +1,11 @@
-{ pkgs
-, inputs
-, username
-, host
-, profile
-, ...
+{
+  pkgs,
+  inputs,
+  username,
+  host,
+  profile,
+  system,
+  ...
 }:
 let
   inherit (import ../../hosts/${host}/variables.nix) gitUsername;
@@ -13,8 +15,16 @@ in
   home-manager = {
     useUserPackages = true;
     useGlobalPkgs = false;
-    backupFileExtension = "backup";
-    extraSpecialArgs = { inherit inputs username host profile; };
+    backupFileExtension = "backup-nixos";
+    extraSpecialArgs = {
+      inherit
+        inputs
+        username
+        host
+        profile
+        system
+        ;
+    };
     users.${username} = {
       imports = [ ./../home ];
       home = {
@@ -30,15 +40,16 @@ in
     description = "${gitUsername}";
     extraGroups = [
       "adbusers"
-      "docker" #access to docker as non-root
-      "libvirtd" #Virt manager/QEMU access
+      "docker" # access to docker as non-root
+      "libvirtd" # Virt manager/QEMU access
       "lp"
       "networkmanager"
       "scanner"
-      "wheel" #subdo access
-      "vboxusers" #Virtual Box
+      "wheel" # subdo access
+      "vboxusers" # Virtual Box
+      "gamemode"
     ];
-    shell = pkgs.zsh;
+    shell = pkgs.bash;
     ignoreShellProgramCheck = true;
   };
   nix.settings.allowed-users = [ "${username}" ];

modules/core/virtualisation.nix

@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   # Only enable either docker or podman -- Not both
   virtualisation = {
     docker = {