nixos upd

1 files changed, 56 insertions, 60 deletions

diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index d9b61ba..0bea009 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -9,13 +9,13 @@
     inputs.noctalia-greeter.nixosModules.default
   ];
 
-  # Nix & Flakes Settings
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
   nixpkgs.config.allowUnfree = true;
+
   nix.gc = {
-  automatic = true;
-  dates = "weekly";
-  options = "--delete-older-than 7d";  # or use KeepGenerations
+    automatic = true;
+    dates = "weekly";
+    options = "--delete-older-than 7d";
   };
 
   # Dynamic binary execution & FHS compatibility
@@ -42,7 +42,7 @@
   ];
 
   # =========================================================================
-  # HARDWARE & FILESYSTEMS
+  # HARDWARE, FILESYSTEMS & GRAPHICS
   # =========================================================================
   fileSystems."/mnt/giga" = {
     device = "/dev/disk/by-uuid/bfed3a37-05e1-465b-a4b7-d74cd31bf937";
@@ -50,7 +50,6 @@
     options = [ "defaults" "user" "rw" ];
   };
 
-  # Graphics & NVIDIA Configuration
   hardware.graphics = {
     enable = true;
     enable32Bit = true;
@@ -64,27 +63,9 @@
     nvidiaSettings = true;
     package = config.boot.kernelPackages.nvidiaPackages.latest;
   };
-  # =========================================================================
-  # PRINTING SERVICES (CUPS)
-  # =========================================================================
-  services.printing = {
-    enable = true;
-    drivers = with pkgs; [
-      brlaser                      # Драйвер для большинства монохромных лазерных принтеров Brother (серии HL, DCP, MFC)
-      gutenprint                   # Набор универсальных открытых драйверов
-      cups-filters                 # Базовые фильтры CUPS
-      # brother-lpr-drivers-extra  # Раскомментируй, если принтер совсем редкий/специфичный
-    ];
-  };
 
-  # Если принтер сетевой (Wi-Fi / Ethernet), включи автообнаружение Avahi:
-  services.avahi = {
-    enable = true;
-    nssmdns4 = true;
-    openFirewall = true;
-  };
   # =========================================================================
-  # NETWORKING & DNS
+  # NETWORKING, DNS & VPN
   # =========================================================================
   networking.hostName = "opus";
   networking.networkmanager.enable = true;
@@ -109,6 +90,13 @@
     package = pkgs.mullvad-vpn;
   };
 
+  # Avahi (Printer / Network Discovery)
+  services.avahi = {
+    enable = true;
+    nssmdns4 = true;
+    openFirewall = true;
+  };
+
   # =========================================================================
   # LOCALIZATION & TIMEZONE
   # =========================================================================
@@ -127,7 +115,7 @@
   };
 
   # =========================================================================
-  # USER ACCOUNTS & SHELL CONFIGURATION
+  # USER ACCOUNTS & PRIVILEGES
   # =========================================================================
   users.users."seraphim" = {
     isNormalUser = true;
@@ -136,7 +124,6 @@
     packages = with pkgs; [];
   };
 
-  # Privilege Elevation (doas)
   security.doas = {
     enable = true;
     extraRules = [
@@ -148,7 +135,9 @@
     ];
   };
 
-  # Shell Enhancements
+  # =========================================================================
+  # SHELLS & ENHANCEMENTS
+  # =========================================================================
   programs.fish = {
     enable = true;
     shellAliases = {
@@ -156,7 +145,6 @@
       ll = "eza -al --icons=auto";
     };
   };
-
   programs.starship.enable = true;
 
   # =========================================================================
@@ -221,7 +209,7 @@
   ];
 
   # =========================================================================
-  # AUDIO (PIPEWIRE) & MPD
+  # AUDIO & SERVICES
   # =========================================================================
   security.rtkit.enable = true;
   services.pipewire = {
@@ -231,7 +219,17 @@
     pulse.enable = true;
   };
 
-  # MPD Server
+  # Printing (CUPS)
+  services.printing = {
+    enable = true;
+    drivers = with pkgs; [
+      brlaser
+      gutenprint
+      cups-filters
+    ];
+  };
+
+  # MPD Music Server
   services.mpd = {
     enable = true;
     user = "seraphim";
@@ -251,40 +249,34 @@
     };
   };
 
-  # Allow system MPD to access user PipeWire session
   systemd.services.mpd.environment = {
     XDG_RUNTIME_DIR = "/run/user/1000";
   };
 
-  # =========================================================================
-  # SYSTEM SERVICES & PROGRAM CONFIGURATIONS
-  # =========================================================================
+  # System Utilities & Gaming
   services.gvfs.enable = true;
   services.tumbler.enable = true;
   services.gnome.gnome-keyring.enable = true;
   programs.dconf.enable = true;
 
-  # Journald Log Restraints
   services.journald.extraConfig = ''
     SystemMaxUse=50M
     MaxRetentionSec=1month
   '';
 
-  # Gaming (Steam)
   programs.steam = {
     enable = true;
     remotePlay.openFirewall = true;
     dedicatedServer.openFirewall = true;
   };
 
-  # Throne Configuration
   programs.throne = {
     enable = true;
     tunMode.enable = true;
   };
 
   # =========================================================================
-  # AUTOSTART USER SERVICES
+  # USER SERVICES
   # =========================================================================
   systemd.user.services.swingmusic = {
     description = "Swing Music Local Server";
@@ -312,7 +304,6 @@
     };
   };
 
-
   systemd.user.services.niri.enableDefaultPath = false;
 
   # =========================================================================
@@ -321,39 +312,41 @@
   environment.systemPackages = with pkgs; [
     # Flake Inputs & Hardware Overrides
     inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default
-    (pkgs.btop.override { cudaSupport = true; })
+    (btop.override { cudaSupport = true; })
 
     # Terminals & CLI Utilities
     cacert
+    duf
     eza
     fastfetch
-    pkgs.hyfetch
+    foot
     fzf
     ghfetch
     ghostty
+    hyfetch
     kitty
     stow
     util-linux
-    pkgs.duf
-    pkgs.foot
-    # Music & Audio Controls
+
+    # Audio & Music Controls
     brightnessctl
     mpc
+    mpd
+    mpd-mpris
+    mpv
     pamixer
     pavucontrol
     playerctl
-    pkgs.mpd
-    pkgs.mpd-mpris
-    pkgs.rmpc
-    pkgs.mpv
+    rmpc
+
     # Text Editors
     micro
     neovim
-    (pkgs.emacs-pgtk.override {
+    (emacs-pgtk.override {
       withNativeCompilation = true;
     })
 
-    # File Managers, Viewing & Archiving
+    # File Managers & Archiving
     file-roller
     kdePackages.ark
     kdePackages.qt6ct
@@ -363,9 +356,9 @@
     yazi
 
     # Utilities & Disk Tools
+    caligula
     cryptsetup
-    pkgs.caligula
-    pkgs.yt-dlp
+    yt-dlp
 
     # GStreamer Codecs
     gst_all_1.gst-plugins-bad
@@ -373,11 +366,13 @@
     gst_all_1.gst-plugins-good
     gst_all_1.gst-plugins-ugly
 
-    # Wayland, Niri Desktop & System UI
+    # Wayland, Desktop UI & Utilities
+    adwaita-icon-theme
     bibata-cursors
     cliphist
     fuzzel
     grim
+    hicolor-icon-theme
     hyprpolkitagent
     noctalia-shell
     slurp
@@ -385,20 +380,22 @@
     wtype
     xwayland-satellite
 
-    # Desktop Applications
+    # Desktop Applications & Office
+    claude-code
     keepassxc
+    libreoffice
+    hunspellDicts.ru_RU
     nvidia-vaapi-driver
-    pkgs.claude-code
-    pkgs.opencode
+    opencode
     telegram-desktop
     vesktop
-    adwaita-icon-theme
-    hicolor-icon-theme
+
     # Software Development & Toolchains
     black
     cargo
     clang
     clippy
+    gcc
     git
     gnumake
     nodejs
@@ -407,7 +404,6 @@
     rust-analyzer
     rustc
     tree-sitter
-    gcc
   ];
 
   system.stateVersion = "26.05";