refactor

home-manager/modules/hypr/hyprland/keybinds.nix

@@ -112,6 +112,7 @@
       "RCtrl, 3, togglespecialworkspace, s3"
       "RCtrl, 4, togglespecialworkspace, s4"
       "RCtrl, 5, togglespecialworkspace, s5"
+      "RCtrl, 0, togglespecialworkspace, screensaver"
 
       "${super}+Rctrl, 1, movetoworkspacesilent, special:s1"
       "${super}+Rctrl, 2, movetoworkspacesilent, special:s2"

home-manager/modules/hypr/hyprland/rules.nix

@@ -11,6 +11,7 @@
       "bordercolor rgba(FF00EA30) rgba(3A86FF80) 225deg, bordersize 2, onworkspace:special:s5"
 
       "noblur, opacity 1 1, onworkspace:special:s1"
+      "noblur, nodim, opacity 0, onworkspace:special:screensaver"
       "workspace 1, class:.*zen.*"
 
       "idleinhibit fullscreen, class:^(*)$"
@@ -25,6 +26,7 @@
       "special:s3,gapsout:50,gapsin:0"
       "special:s4,gapsout:50,gapsin:0"
       "special:s5,gapsout:50,gapsin:0,on-created-empty:[workspace s5 silent] Telegram"
+      "special:screensaver,gapsout:0,gapsin:0,on-created-empty:[fullscreenstate 2] kitty cat"
     ];
   };
 }

hosts/fenrir-nixos/configuration.nix

@@ -5,126 +5,20 @@
   imports = [ ../../nixos/custom.nix ./hardware-configuration.nix ];
 
   fileSystems."/".options = [ "ssd" "noatime" "compress=zstd" ];
-
   swapDevices = [{
     device = "/swapfile";
-    size = 4 * 1024; # Creates an 4GB swap file
+    size = 4 * 1024;
     randomEncryption.enable = true;
   }];
 
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  # TODO: fix conflicted configurations
-
-  # This runs only intel/amdgpu igpus and nvidia dgpus do not drain power.
-
-  ##### disable nvidia, very nice battery life.
-  # boot.extraModprobeConfig = ''
-  #   blacklist nouveau
-  #   options nouveau modeset=0
-  # '';
-
-  # services.udev.extraRules = ''
-  #   # Remove NVIDIA USB xHCI Host Controller devices, if present
-  #   ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c0330", ATTR{power/control}="auto", ATTR{remove}="1"
-
-  #   # Remove NVIDIA USB Type-C UCSI devices, if present
-  #   ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c8000", ATTR{power/control}="auto", ATTR{remove}="1"
-
-  #   # Remove NVIDIA Audio devices, if present
-  #   ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x040300", ATTR{power/control}="auto", ATTR{remove}="1"
-
-  #   # Remove NVIDIA VGA/3D controller devices
-  #   ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x03[0-9]*", ATTR{power/control}="auto", ATTR{remove}="1"
-  # '';
-
   services.thermald.enable = true;
-  services.power-profiles-daemon.enable = false;
+  services.auto-cpufreq = { enable = true; }; # !!!
-  services.auto-cpufreq = { enable = true; };
-
-  # boot.blacklistedKernelModules =
-  #   [ "nouveau" "nvidia" "nvidia_drm" "nvidia_modeset" ];
-
-  # TODO: try to connect proxy on all system
-
-  networking.networkmanager = { enable = true; };
-
-  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";
-  };
-
-  services.xserver.enable = true;
-
-  services.xserver.displayManager.gdm.enable = true;
-  services.xserver.desktopManager.gnome.enable = true;
-
-  services.xserver.xkb = {
-    layout = "us,ru";
-    variant = "";
-    options = "grp:win_space_toggle";
-  };
-
-  services.printing.enable = true;
-
-  services.pulseaudio.enable = false;
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-  };
-
-  # services.xserver.libinput.enable = true;
-
-  users.users.krosh = {
-    isNormalUser = true;
-    description = "krosh";
-    extraGroups = [ "networkmanager" "wheel" ];
-  };
-
-  system.stateVersion = "25.11";
-
-  programs.hyprland = {
-    enable = true;
-    withUWSM = true;
-    # xwayland.enable = true; # Xwayland can be disabled.
-  };
 
   hardware.graphics.enable = true;
   services.xserver.videoDrivers = [ "modesetting" "nvidia" ];
-  # hardware.nvidia.open = true;
   hardware.nvidia = {
     open = true;
-    modesetting.enable = true; # полезно и для Wayland/tearing
+    modesetting.enable = true;
-    # prime = {
-    #   offload.enable = true;
-    #   offload.enableOffloadCmd = true; # добавит скрипт `nvidia-offload`
-
-    #   # intelBusId = "PCI:0:2:0"; # <-- подставь свои
-    #   # nvidiaBusId = "PCI:1:0:0"; # <-- подставь свои
-    # };
   };
 
-  programs.uwsm.enable = true;
-
-  users.users.krosh.shell = pkgs.zsh;
-
-  security.polkit.enable = true;
-  # hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.latest;
-
-  environment.sessionVariables.NIXOS_OZONE_WL = "1";
 }

hosts/loki-nixos/configuration.nix

@@ -1,152 +1,15 @@
 { config, pkgs, ... }:
 
 {
-  networking.hostName = "loki-nixos"; # Define your hostname.
+  networking.hostName = "loki-nixos";
-  imports = [
+  imports = [ ../../nixos/custom.nix ./hardware-configuration.nix ];
-    ../../nixos/custom.nix
-    ./hardware-configuration.nix
-
-  ];
 
   fileSystems."/".options = [ "ssd" "noatime" "compress=zstd" ];
   swapDevices = [{
     device = "/swapfile";
-    size = 16 * 1024; # required when using an existing file
+    size = 16 * 1024;
     randomEncryption.enable = true;
   }];
   boot.resumeDevice = "/dev/nvme0n1p2";
 
-  #services.fprintd.enable = true;
-
-  # Bootloader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-
-  # Enable networking
-  networking.networkmanager.enable = true;
-
-  # Set your time zone.
-  time.timeZone = "Europe/Moscow";
-
-  # Select internationalisation properties.
-  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";
-  };
-
-  # Enable the X11 windowing system.
-  services.xserver.enable = true;
-
-  # Enable the GNOME Desktop Environment.
-  # services.xserver.displayManager.gdm.enable = true;
-  # services.xserver.desktopManager.gnome.enable = true;
-  services.displayManager.gdm.enable = true;
-  services.desktopManager.gnome.enable = true;
-
-  # Configure keymap in X11
-  services.xserver.xkb = {
-    layout = "us,ru";
-    variant = "";
-    options = "grp:win_space_toggle";
-  };
-
-  # Enable CUPS to print documents.
-  services.printing.enable = true;
-
-  # Enable sound with pipewire.
-  services.pulseaudio.enable = false;
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    # If you want to use JACK applications, uncomment this
-    #jack.enable = true;
-
-    # use the example session manager (no others are packaged yet so this is enabled by default,
-    # no need to redefine it in your config for now)
-    #media-session.enable = true;
-  };
-
-  # Enable touchpad support (enabled default in most desktopManager).
-  # services.xserver.libinput.enable = true;
-
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.krosh = {
-    isNormalUser = true;
-    description = "krosh";
-    extraGroups = [ "fprint" "networkmanager" "wheel" "libvirtd" ];
-    packages = with pkgs;
-      [
-        #  thunderbird
-      ];
-  };
-
-  # Allow unfree packages
-  nixpkgs.config.allowUnfree = true;
-
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  environment.systemPackages = with pkgs;
-    [
-      #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
-      #  wget
-    ];
-
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
-  # programs.gnupg.agent = {
-  #   enable = true;
-  #   enableSSHSupport = true;
-  # };
-
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
-  # services.openssh.enable = true;
-
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "25.11"; # Did you read the comment?
-
-  programs.hyprland = {
-    enable = true;
-    withUWSM = true;
-  };
-
-  programs.uwsm.enable = true;
-
-  users.users.krosh.shell = pkgs.zsh;
-
-  security.polkit.enable = true;
-
-  environment.sessionVariables.NIXOS_OZONE_WL = "1";
-
 }

hosts/template/configuration.nix

@@ -0,0 +1,9 @@
+{ config, pkgs, ... }:
+
+{
+  networking.hostName = "hostname";
+  imports = [ ../../nixos/custom.nix ./hardware-configuration.nix ];
+
+  services.desktopManager.gnome.enable = true;
+  programs.hyprland.enable = false;
+}

nixos/custom.nix

@@ -1,25 +1,38 @@
 { config, pkgs, lib, ... }:
 
+# KROSH mention
+
 {
   imports = [
     ./modules/amnezia.nix
-    ./modules/security.nix
+    ./modules/audio.nix
-    ./modules/memory.nix
-    ./modules/fonts.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;
+  system.stateVersion = "25.11";
-  # services.gnome.gnome-keyring.enable = lib.mkForce false;
-  services.gnome.gcr-ssh-agent.enable = lib.mkForce false;
-
   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 = {
+  programs.gnupg.agent = { enable = true; };
-    enable = true;
-    # enableSSHSupport = true;
-  };
-  # services.yubikey-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;
+  };
+}

proc.sh

@@ -0,0 +1,10 @@
+grep "cpu MHz" /proc/cpuinfo | head
+
+# попробовать поднять лимит на всех ядрах
+for c in /sys/devices/system/cpu/cpu[0-7]; do
+  echo 4100000 | sudo tee "$c/cpufreq/scaling_max_freq"
+done
+
+# проверить, применилось ли
+grep "cpu MHz" /proc/cpuinfo | head
+sudo tlp-stat -p | sed -n '1,25p'

proc_min.sh

@@ -0,0 +1,10 @@
+grep "cpu MHz" /proc/cpuinfo | head
+
+# попробовать поднять лимит на всех ядрах
+for c in /sys/devices/system/cpu/cpu[0-7]; do
+  echo 800000 | sudo tee "$c/cpufreq/scaling_max_freq"
+done
+
+# проверить, применилось ли
+grep "cpu MHz" /proc/cpuinfo | head
+sudo tlp-stat -p | sed -n '1,25p'