refactor

nixos/custom.nix

@@ -1,25 +1,38 @@
 { config, pkgs, lib, ... }:
 
+# KROSH mention
+
 {
   imports = [
     ./modules/amnezia.nix
-    ./modules/security.nix
-    ./modules/memory.nix
-    ./modules/fonts.nix
+    ./modules/audio.nix
     ./modules/boot.nix
-    ./modules/programs.nix
+    ./modules/fonts.nix
+    ./modules/memory.nix
     ./modules/networking.nix
     ./modules/power.nix
+    ./modules/programs.nix
+    ./modules/security.nix
+    ./modules/timelang.nix
+    ./modules/wm.nix
   ];
 
-  programs.ssh.startAgent = true;
-  # services.gnome.gnome-keyring.enable = lib.mkForce false;
-  services.gnome.gcr-ssh-agent.enable = lib.mkForce false;
-
+  system.stateVersion = "25.11";
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
   nix.gc = {
     automatic = true;
     dates = "weekly";
     options = "--delete-older-than 14d";
   };
+
+  services.printing.enable = true;
+  environment.sessionVariables.NIXOS_OZONE_WL = "1";
+
+  users.users.krosh = {
+    isNormalUser = true;
+    description = "krosh";
+    extraGroups = [ "fprint" "networkmanager" "wheel" "libvirtd" ];
+    shell = pkgs.zsh;
+  };
+
 }

nixos/modules/audio.nix

@@ -0,0 +1,12 @@
+{ config, lib, pkgs, ... }:
+
+{
+  services.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+  };
+}

nixos/modules/boot.nix

@@ -24,6 +24,10 @@
       "rd.systemd.show_status=auto"
       "kvm.enable_virt_at_load=0"
     ];
-    loader.timeout = 0;
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+      timeout = 0;
+    };
   };
 }

nixos/modules/networking.nix

@@ -3,7 +3,8 @@
 {
   # networkmanagerapplet and nm-applet
 
+  networking.networkmanager.enable = true;
   networking.nameservers = [ "8.8.8.8" "1.1.1.1" ];
   networking.networkmanager.insertNameservers = [ "1.1.1.1" "8.8.8.8" ];
-  networking.firewall.enable = false; # need it?
+  networking.firewall.enable = true;
 }

nixos/modules/programs.nix

@@ -5,11 +5,14 @@
 
   environment.systemPackages = with pkgs; [ kitty qbittorrent ];
 
+  programs.ssh.startAgent = true;
+  services.gnome.gcr-ssh-agent.enable = lib.mkForce false;
+
   # Failed to restart network-addresses-vboxnet0.service
   virtualisation.virtualbox.host.enable = true;
   virtualisation.libvirtd.enable = true;
   programs.virt-manager.enable = true;
-  users.extraGroups.vboxusers.members = [ "krosh" ];
+  # users.extraGroups.vboxusers.members = [ "krosh" ];
 
   programs.firefox.enable = true;
   programs.zsh.enable = true;

nixos/modules/security.nix

@@ -8,15 +8,12 @@
     yubikey-manager
     pam_u2f
   ];
+
   services.pcscd.enable = true;
-  programs.gnupg.agent = {
-    enable = true;
-    # enableSSHSupport = true;
-  };
-  # services.yubikey-agent.enable = true;
+  programs.gnupg.agent = { enable = true; };
 
   services.fprintd.enable = true;
   security.pam.services.sudo.fprintAuth = true;
   security.pam.services.login.fprintAuth = lib.mkForce true;
-
+  security.polkit.enable = true;
 }

nixos/modules/timelang.nix

@@ -0,0 +1,18 @@
+{ config, pkgs, lib, ... }:
+
+{
+  time.timeZone = "Europe/Moscow";
+
+  i18n.defaultLocale = "en_US.UTF-8";
+  i18n.extraLocaleSettings = {
+    LC_ADDRESS = "ru_RU.UTF-8";
+    LC_IDENTIFICATION = "ru_RU.UTF-8";
+    LC_MEASUREMENT = "ru_RU.UTF-8";
+    LC_MONETARY = "ru_RU.UTF-8";
+    LC_NAME = "ru_RU.UTF-8";
+    LC_NUMERIC = "ru_RU.UTF-8";
+    LC_PAPER = "ru_RU.UTF-8";
+    LC_TELEPHONE = "ru_RU.UTF-8";
+    LC_TIME = "ru_RU.UTF-8";
+  };
+}

nixos/modules/wm.nix

@@ -0,0 +1,18 @@
+{ config, pkgs, lib, ... }:
+
+{
+  services.xserver.enable = true;
+  services.xserver.xkb = {
+    layout = "us,ru";
+    variant = "";
+    options = "grp:win_space_toggle";
+  };
+
+  services.displayManager.gdm.enable = true;
+  services.desktopManager.gnome.enable = lib.mkDefault false;
+  programs.uwsm.enable = true;
+  programs.hyprland = {
+    enable = lib.mkDefault true;
+    withUWSM = true;
+  };
+}