refactor: remove nvtop, update kernelPackages, and add nixpkgs overlay

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

.gitea/workflows/check.yml

@@ -3,7 +3,7 @@ name: Check NixOS Config
 on:
   pull_request:
   push:
-    branches: [main]
+    branches: [master]
   workflow_dispatch:
 
 jobs:

.gitignore

@@ -0,0 +1 @@
+flake.lock

configuration.nix

@@ -9,6 +9,18 @@
     ./nvidia.nix
     ./shell.nix
     ./yami-dev-stack.nix
+    ./gaming.nix
+  ];
+
+  nixpkgs.overlays = [
+    (final: prev: {
+      pkgsi686Linux = prev.pkgsi686Linux.extend (final': prev': {
+        openldap = prev'.openldap.overrideAttrs (_old: {
+          doCheck = false;
+          doInstallCheck = false;
+        });
+      });
+    })
   ];
 
   nix = {
@@ -22,7 +34,7 @@
   };
 
   boot = {
-    kernelPackages = pkgs.linuxPackages_zen;
+    kernelPackages = pkgs.linuxPackages;
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot.enable = false;
@@ -46,11 +58,11 @@
       fsType = "ext4";
       options = [ "nosuid" "nodev" "nofail" ];
     };
-    "/mnt/wd_blue" = {
+    #"/mnt/wd_blue" = {
-      device = "/dev/disk/by-uuid/91feabaf-ea5f-490e-9925-56f7c05e7110";
+    #  device = "/dev/disk/by-uuid/91feabaf-ea5f-490e-9925-56f7c05e7110";
-      fsType = "ext4";
+    #  fsType = "ext4";
-      options = [ "nosuid" "nodev" "nofail" ];
+    #  options = [ "nosuid" "nodev" "nofail" ];
-    };
+    #};
   };
 
   networking = {
@@ -58,6 +70,12 @@
     networkmanager.enable = true;
   };
 
+  hardware.bluetooth = {
+    enable = true;
+    powerOnBoot = true;
+  };
+  services.blueman.enable = true;
+
   time.timeZone = "Europe/Moscow";
 
   i18n = {
@@ -93,13 +111,6 @@
     tunMode.enable = true;
   };
 
-  programs.steam = {
-    enable = true;
-    remotePlay.openFirewall = true;
-    dedicatedServer.openFirewall = true;
-  };
-
-  programs.gamemode.enable = true;
 
   services.tailscale.enable = true;
   # Docker is now managed by yami-dev-stack.nix when that module is enabled.

flake.lock

@@ -1,5 +1,63 @@
 {
   "nodes": {
+    "codex-cli-nix": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1779385571,
+        "narHash": "sha256-qvJmkFUHLb0lWUHguEpcFh5sBUSSBzkjGimWkh7RMfQ=",
+        "owner": "sadjow",
+        "repo": "codex-cli-nix",
+        "rev": "1b8816f0f793031ee98c928ae7a3bcca2f0b54c0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "sadjow",
+        "repo": "codex-cli-nix",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "helium-browser": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "utils": "utils"
+      },
+      "locked": {
+        "lastModified": 1779508010,
+        "narHash": "sha256-7Wcp38Saw8cnyfc1OyjsxiF0btKBaL5KcHV+q9ljsns=",
+        "owner": "schembriaiden",
+        "repo": "helium-browser-nix-flake",
+        "rev": "4e6b8bdd6692db7f2357e4dd86444914e53ec095",
+        "type": "github"
+      },
+      "original": {
+        "owner": "schembriaiden",
+        "repo": "helium-browser-nix-flake",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -7,11 +65,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776454077,
+        "lastModified": 1779507042,
-        "narHash": "sha256-7zSUFWsU0+jlD7WB3YAxQ84Z/iJurA5hKPm8EfEyGJk=",
+        "narHash": "sha256-7wOwi8B6D0BYsieZCnHZZj2sNUzgJhLoIVSfkwB7lxQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "565e5349208fe7d0831ef959103c9bafbeac0681",
+        "rev": "509ed3c603349a9d43de9e2ae6613baea6bd5b34",
         "type": "github"
       },
       "original": {
@@ -22,11 +80,27 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1776169885,
+        "lastModified": 1779259093,
-        "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=",
+        "narHash": "sha256-7DKWmH23hL2eYdkxCKeqj2i+yljTKuU+3Nk1UPHOnxc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9",
+        "rev": "d99b013d5d1931ad77fe3912ed218170dec5d9a4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1779508470,
+        "narHash": "sha256-Ap9KJX+5xHIn3bPIpfNgT6MEXdAECECwo4/rmlQD74M=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "29916453413845e54a65b8a1cf996842300cd299",
         "type": "github"
       },
       "original": {
@@ -38,8 +112,58 @@
     },
     "root": {
       "inputs": {
+        "codex-cli-nix": "codex-cli-nix",
+        "helium-browser": "helium-browser",
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs_2"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "utils": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
       }
     }
   },

flake.nix

@@ -7,21 +7,41 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    helium-browser = {
+      url = "github:schembriaiden/helium-browser-nix-flake";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    codex-cli-nix.url = "github:sadjow/codex-cli-nix";
   };
 
-  outputs = { nixpkgs, home-manager, ... }: {
+  outputs = { nixpkgs, home-manager, helium-browser, codex-cli-nix, ... }:
-    nixosConfigurations.chexit = nixpkgs.lib.nixosSystem {
+    let
       system = "x86_64-linux";
-      modules = [
+      pkgs = nixpkgs.legacyPackages.${system};
-        ./configuration.nix
+    in
-        home-manager.nixosModules.home-manager
+    {
-        {
+      nixosConfigurations.chexit = nixpkgs.lib.nixosSystem {
-          home-manager.useGlobalPkgs = true;
+        inherit system;
-          home-manager.useUserPackages = true;
+        specialArgs = {
-          home-manager.backupFileExtension = "hm-bak";
+          helium = helium-browser.packages.${system}.helium;
-          home-manager.users.chexit = import ./home.nix;
+          codex = codex-cli-nix.packages.${system}.default;
-        }
+        };
-      ];
+        modules = [
+          ./configuration.nix
+          home-manager.nixosModules.home-manager
+          {
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
+            home-manager.backupFileExtension = "hm-bak";
+            home-manager.users.chexit = import ./home.nix;
+          }
+        ];
+      };
+
+      devShells.${system}.default = pkgs.mkShell {
+        buildInputs = [
+          codex-cli-nix.packages.${system}.default
+        ];
+      };
     };
-  };
 }

gaming.nix

@@ -0,0 +1,32 @@
+{ pkgs, ... }:
+
+{
+  programs.steam = {
+    enable = true;
+    remotePlay.openFirewall = true;
+    dedicatedServer.openFirewall = true;
+  };
+
+  programs.gamemode.enable = true;
+
+  services.udev.extraRules = ''
+    # DualSense: тачпад не должен работать как мышь рабочего стола.
+    # Steam Input/SDL читают геймпад (включая тачпад) через hidraw,
+    # так что в играх он останется доступен как тачпад контроллера.
+    SUBSYSTEM=="input", ATTRS{name}=="Sony Interactive Entertainment DualSense Wireless Controller Touchpad", ENV{LIBINPUT_IGNORE_DEVICE}="1", ENV{ID_INPUT_MOUSE}="0", ENV{ID_INPUT_TOUCHPAD}="0"
+    SUBSYSTEM=="input", ATTRS{name}=="DualSense Wireless Controller Touchpad", ENV{LIBINPUT_IGNORE_DEVICE}="1", ENV{ID_INPUT_MOUSE}="0", ENV{ID_INPUT_TOUCHPAD}="0"
+  '';
+
+  environment.systemPackages = with pkgs; [
+    dualsensectl
+    protonup-qt
+    prismlauncher
+    lutris
+    winetricks
+    wineWow64Packages.stagingFull
+    dxvk
+    vkd3d-proton
+    mangohud
+    gamemode
+  ];
+}

packages.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, helium, codex, ... }:
 
 {
   nixpkgs.config.allowUnfree = true;
@@ -9,12 +9,12 @@
     git
     htop
     btop
-    nvtopPackages.nvidia
     ntfs3g
     kdePackages.qtstyleplugin-kvantum
     kdePackages.kate
 
     # soft
+    helium
     firefox
     vesktop
     materialgram
@@ -26,12 +26,15 @@
 
     # dev
     vscode
+    zed-editor
     docker-compose
+    codex
+    jetbrains.rust-rover
 
-    # gaming / media
+    # media / gpu utils
+    gpu-screen-recorder-gtk
     libva-utils
     vdpauinfo
     lazydocker
-    mangohud
   ];
 }