From 2519d3fc4f3df771fc90f356064ec6ca4a17203a Mon Sep 17 00:00:00 2001 From: beeb5k Date: Tue, 2 Jun 2026 00:06:57 +0530 Subject: update was needed --- hosts/common.nix | 31 ++++++-- hosts/niuwux/default.nix | 130 ++++++++++++++++++++++++++++++++ hosts/niuwux/hardware-configuration.nix | 91 ++++++++++++++++++++++ hosts/nixios/default.nix | 129 ------------------------------- hosts/nixios/hardware-configuration.nix | 91 ---------------------- 5 files changed, 245 insertions(+), 227 deletions(-) create mode 100644 hosts/niuwux/default.nix create mode 100644 hosts/niuwux/hardware-configuration.nix delete mode 100644 hosts/nixios/default.nix delete mode 100644 hosts/nixios/hardware-configuration.nix (limited to 'hosts') diff --git a/hosts/common.nix b/hosts/common.nix index a6ec249..45bdfb6 100644 --- a/hosts/common.nix +++ b/hosts/common.nix @@ -94,9 +94,28 @@ security.pam.services.ly.enableGnomeKeyring = true; security.pam.services.login.enableGnomeKeyring = true; - nixpkgs.config.allowUnfree = true; - nix.registry.${user}.flake = inputs.self; - nix.registry.nixpkgs.flake = inputs.nixpkgs; + nixpkgs = { + config = { + allowUnfree = true; + doCheckByDefault = false; + # doInstallCheckByDefault = false; + }; + overlays = [ + (final: prev: { + stdenv = prev.stdenv // { + mkDerivation = args: + prev.stdenv.mkDerivation + (args + // { + doCheck = false; + # doInstallCheck = false; + }); + }; + }) + ]; + }; + # nix.registry.${user}.flake = inputs.self; + # nix.registry.nixpkgs.flake = inputs.nixpkgs; networking.networkmanager.wifi.powersave = false; networking.networkmanager.enable = true; @@ -147,7 +166,7 @@ fonts.packages = with pkgs; [ ioskeley-input nerd-fonts.symbols-only - nerd-fonts.jetbrains-mono + # nerd-fonts.jetbrains-mono # ioskeley-mono # maple-mono.NF ]; @@ -158,7 +177,7 @@ "Symbols Nerd Font" ]; - programs.fish.enable = true; + programs.zsh.enable = true; programs.nano.enable = false; programs.gnupg.agent = { enable = true; @@ -223,6 +242,4 @@ ripgrep bat ]; - - users.defaultUserShell = pkgs.fish; } diff --git a/hosts/niuwux/default.nix b/hosts/niuwux/default.nix new file mode 100644 index 0000000..ea3617a --- /dev/null +++ b/hosts/niuwux/default.nix @@ -0,0 +1,130 @@ +{ + systemState, + user, + hostname, +}: +{ + pkgs, + config, + inputs, + lib, + ... +}: +{ + imports = with inputs.self.nixosModules; [ + ./hardware-configuration.nix + (import ../common.nix { inherit user; }) + beeMods + ]; + + boot.kernelPackages = pkgs.linuxPackages_zen; + + programs.dconf.enable = true; + + beeMods = { + windowManagers = { + mango.enable = true; + hyprland.enable = false; + dwm.enable = false; + }; + }; + + programs.gpu-screen-recorder.enable = true; + + xdg.portal = lib.mkForce { + enable = true; + extraPortals = [ + pkgs.xdg-desktop-portal-gtk + pkgs.xdg-desktop-portal-wlr + ]; + config = { + common = { + default = [ "gtk" ]; + "org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ]; + "org.freedesktop.impl.portal.Inhibit" = ["none"]; + }; + mango = { + "org.freedesktop.impl.portal.ScreenCast" = [ "wlr" ]; + "org.freedesktop.impl.portal.Screenshot" = [ "wlr" ]; + "org.freedesktop.impl.portal.Inhibit" = [ "none" ]; + }; + hyrpland = { + default = [ + "hyrland" + "gtk" + ]; + }; + }; + }; + + programs.gamemode.enable = config.programs.steam.enable; + programs.gamescope = { + enable = config.programs.steam.enable; + # capSysNice = true; + }; + programs.steam = { + enable = false; + protontricks.enable = true; + gamescopeSession.enable = false; + remotePlay.openFirewall = true; + dedicatedServer.openFirewall = true; + localNetworkGameTransfers.openFirewall = true; + }; + + users.users.${user} = { + isNormalUser = true; + shell = pkgs.fish; + extraGroups = [ + "networkmanager" + "wheel" + "video" + ]; + }; + + environment.sessionVariables = { }; + + networking.hostName = hostname; + networking.firewall.allowedTCPPorts = [ ]; + networking.firewall.allowedUDPPorts = [ ]; + networking.firewall.enable = true; + + environment.systemPackages = with pkgs; [ + libva-utils + vulkan-tools + pciutils + direnv + mangohud + ]; + + services.xserver.videoDrivers = [ "nvidia" ]; + hardware = { + graphics = { + enable = true; + enable32Bit = config.programs.steam.enable; + extraPackages = with pkgs; [ + libvdpau-va-gl + nvidia-vaapi-driver + ]; + }; + + nvidia = { + modesetting.enable = true; + powerManagement.enable = true; + powerManagement.finegrained = true; + open = true; + nvidiaSettings = false; + + prime = { + offload.enable = true; + offload.enableOffloadCmd = true; + offload.offloadCmdMainProgram = "prime-run"; + nvidiaBusId = "PCI:1:0:0"; + amdgpuBusId = "PCI:5:0:0"; + }; + + package = config.boot.kernelPackages.nvidiaPackages.latest; # or stable + }; + }; + + system.stateVersion = systemState; # check flake.nix +} diff --git a/hosts/niuwux/hardware-configuration.nix b/hosts/niuwux/hardware-configuration.nix new file mode 100644 index 0000000..96c39c3 --- /dev/null +++ b/hosts/niuwux/hardware-configuration.nix @@ -0,0 +1,91 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ + config, + lib, + pkgs, + modulesPath, + ... +}: + +{ + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ + "nvme" + "xhci_pci" + "usb_storage" + "usbhid" + "sd_mod" + ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/85c4da5f-b234-498f-bf47-f2d3b26bf0cc"; + fsType = "btrfs"; + options = [ + "subvol=@" + "compress=zstd" + "noatime" + "discard=async" + "space_cache=v2" + ]; + }; + + fileSystems."/home" = { + device = "/dev/disk/by-uuid/85c4da5f-b234-498f-bf47-f2d3b26bf0cc"; + fsType = "btrfs"; + options = [ + "subvol=@home" + "compress=zstd" + "noatime" + "discard=async" + "space_cache=v2" + ]; + }; + + fileSystems."/nix" = { + device = "/dev/disk/by-uuid/85c4da5f-b234-498f-bf47-f2d3b26bf0cc"; + fsType = "btrfs"; + options = [ + "subvol=@nix" + "compress=zstd" + "noatime" + "discard=async" + "space_cache=v2" + ]; + }; + + fileSystems."/var/log" = { + device = "/dev/disk/by-uuid/85c4da5f-b234-498f-bf47-f2d3b26bf0cc"; + fsType = "btrfs"; + options = [ + "subvol=@log" + "compress=zstd" + "noatime" + "discard=async" + "space_cache=v2" + ]; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/DD2D-BC85"; + fsType = "vfat"; + options = [ + "fmask=0022" + "dmask=0022" + ]; + }; + + swapDevices = [ + { device = "/dev/disk/by-uuid/247afe44-bbc1-4931-bf26-29a540e9d7df"; } + ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/hosts/nixios/default.nix b/hosts/nixios/default.nix deleted file mode 100644 index 5d45976..0000000 --- a/hosts/nixios/default.nix +++ /dev/null @@ -1,129 +0,0 @@ -{ - systemState, - user, - hostname, -}: -{ - pkgs, - config, - inputs, - lib, - ... -}: -{ - imports = with inputs.self.nixosModules; [ - ./hardware-configuration.nix - (import ../common.nix { inherit user; }) - beeMods - ]; - - boot.kernelPackages = pkgs.linuxPackages_zen; - - programs.dconf.enable = true; - - beeMods = { - windowManagers = { - mango.enable = false; - hyprland.enable = true; - dwm.enable = false; - }; - }; - - programs.gpu-screen-recorder.enable = true; - - xdg.portal = lib.mkForce { - enable = true; - extraPortals = [ - pkgs.xdg-desktop-portal-gtk - pkgs.xdg-desktop-portal-wlr - ]; - config = { - common = { - default = [ "gtk" ]; - "org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ]; - }; - mango = { - "org.freedesktop.impl.portal.ScreenCast" = [ "wlr" ]; - "org.freedesktop.impl.portal.Screenshot" = [ "wlr" ]; - "org.freedesktop.impl.portal.Inhibit" = [ "none" ]; - }; - hyrpland = { - default = [ - "hyrland" - "gtk" - ]; - }; - }; - }; - - programs.gamemode.enable = config.programs.steam.enable; - programs.gamescope = { - enable = config.programs.steam.enable; - # capSysNice = true; - }; - programs.steam = { - enable = true; - protontricks.enable = true; - gamescopeSession.enable = false; - remotePlay.openFirewall = true; - dedicatedServer.openFirewall = true; - localNetworkGameTransfers.openFirewall = true; - }; - - users.users.${user} = { - isNormalUser = true; - shell = pkgs.fish; - extraGroups = [ - "networkmanager" - "wheel" - "video" - ]; - }; - - environment.sessionVariables = { }; - - networking.hostName = hostname; - networking.firewall.allowedTCPPorts = [ ]; - networking.firewall.allowedUDPPorts = [ ]; - networking.firewall.enable = true; - - environment.systemPackages = with pkgs; [ - libva-utils - vulkan-tools - pciutils - direnv - mangohud - ]; - - services.xserver.videoDrivers = [ "nvidia" ]; - hardware = { - graphics = { - enable = true; - enable32Bit = true; - extraPackages = with pkgs; [ - libvdpau-va-gl - nvidia-vaapi-driver - ]; - }; - - nvidia = { - modesetting.enable = true; - powerManagement.enable = true; - powerManagement.finegrained = true; - open = false; - nvidiaSettings = false; - - prime = { - offload.enable = true; - offload.enableOffloadCmd = true; - offload.offloadCmdMainProgram = "prime-run"; - nvidiaBusId = "PCI:1:0:0"; - amdgpuBusId = "PCI:5:0:0"; - }; - - package = config.boot.kernelPackages.nvidiaPackages.latest; # or stable - }; - }; - - system.stateVersion = systemState; # check flake.nix -} diff --git a/hosts/nixios/hardware-configuration.nix b/hosts/nixios/hardware-configuration.nix deleted file mode 100644 index 96c39c3..0000000 --- a/hosts/nixios/hardware-configuration.nix +++ /dev/null @@ -1,91 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ - config, - lib, - pkgs, - modulesPath, - ... -}: - -{ - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ - "nvme" - "xhci_pci" - "usb_storage" - "usbhid" - "sd_mod" - ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/85c4da5f-b234-498f-bf47-f2d3b26bf0cc"; - fsType = "btrfs"; - options = [ - "subvol=@" - "compress=zstd" - "noatime" - "discard=async" - "space_cache=v2" - ]; - }; - - fileSystems."/home" = { - device = "/dev/disk/by-uuid/85c4da5f-b234-498f-bf47-f2d3b26bf0cc"; - fsType = "btrfs"; - options = [ - "subvol=@home" - "compress=zstd" - "noatime" - "discard=async" - "space_cache=v2" - ]; - }; - - fileSystems."/nix" = { - device = "/dev/disk/by-uuid/85c4da5f-b234-498f-bf47-f2d3b26bf0cc"; - fsType = "btrfs"; - options = [ - "subvol=@nix" - "compress=zstd" - "noatime" - "discard=async" - "space_cache=v2" - ]; - }; - - fileSystems."/var/log" = { - device = "/dev/disk/by-uuid/85c4da5f-b234-498f-bf47-f2d3b26bf0cc"; - fsType = "btrfs"; - options = [ - "subvol=@log" - "compress=zstd" - "noatime" - "discard=async" - "space_cache=v2" - ]; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/DD2D-BC85"; - fsType = "vfat"; - options = [ - "fmask=0022" - "dmask=0022" - ]; - }; - - swapDevices = [ - { device = "/dev/disk/by-uuid/247afe44-bbc1-4931-bf26-29a540e9d7df"; } - ]; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} -- cgit v1.3.1