diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 407cd7e..8761d1c 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -2,13 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ - config, - pkgs, - unstable, - inputs, - ... -}: +{ config, pkgs, unstable, ... }: # let # berkeley-mono-typeface = pkgs.callPackage ./packages/berkeley-mono-typeface.nix; @@ -23,14 +17,8 @@ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - inputs.ucodenix.nixosModules.default ]; - services.ucodenix = { - enable = true; - cpuModelId = "00A20F12"; # AMD 5900X - }; - # Use the latest linux Kernel boot.kernelPackages = pkgs.linuxPackages_latest; @@ -175,54 +163,48 @@ # List packages installed in system profile. To search, run: # $ nix search wget - environment.systemPackages = - with pkgs; - with unstable; - [ - # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. - # wget - fzf - nixfmt-rfc-style - dwarfs + environment.systemPackages = with pkgs; with unstable; [ + # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + # wget + fzf + nixfmt-rfc-style + dwarfs - wineWowPackages.stable - winetricks - steamtinkerlaunch + wineWowPackages.stable + winetricks + steamtinkerlaunch - amdgpu_top - mangohud + amdgpu_top + mangohud - unstable.svt-av1-psy - unstable.ffmpeg-full - unstable.ab-av1 - unstable.whisper-cpp-vulkan + unstable.svt-av1-psy + unstable.ffmpeg-full + unstable.ab-av1 + unstable.whisper-cpp-vulkan - vscode.fhs # .fhs version will be more compatable even if slightly less nix flavoured + vscode.fhs # .fhs version will be more compatable even if slightly less nix flavoured - openrazer-daemon + openrazer-daemon - # === nix related === - comma - nh - # === nix related === + comma - rustc - cargo - go - pnpm - zig - maven - gradle - gcc + rustc + cargo + go + pnpm + zig + maven + gradle + gcc - # noisetorch - # yad - # unzip - # wget - # xdotool - # xxd - # xorg.xwininfo - ]; + # noisetorch + # yad + # unzip + # wget + # xdotool + # xxd + # xorg.xwininfo + ]; programs.nix-ld.enable = true; programs.nix-ld.libraries = with pkgs; [ @@ -353,13 +335,9 @@ ''; }; - # environment.variables = { - # }; - - environment.sessionVariables = { - # === Prefer RADV driver === + # === Prefer RADV driver === + environment.variables = { AMD_VULKAN_ICD = "RADV"; - FLAKE = "/home/buymymojo/etc/nixos/"; }; # This value determines the NixOS release from which the default diff --git a/nixos/flake.lock b/nixos/flake.lock index f40c46d..e099e34 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -1,22 +1,5 @@ { "nodes": { - "cpu-microcodes": { - "flake": false, - "locked": { - "lastModified": 1742753109, - "narHash": "sha256-hneAwNElAMkaTdToS6DUa47gFkXoIIR77CesMKUW21A=", - "owner": "platomav", - "repo": "CPUMicrocodes", - "rev": "f093bec842057ebf35d0525fcd69f649714f4485", - "type": "github" - }, - "original": { - "owner": "platomav", - "repo": "CPUMicrocodes", - "rev": "f093bec842057ebf35d0525fcd69f649714f4485", - "type": "github" - } - }, "home-manger": { "inputs": { "nixpkgs": [ @@ -57,28 +40,9 @@ "inputs": { "home-manger": "home-manger", "nixpkgs": "nixpkgs", - "ucodenix": "ucodenix", "unstable": "unstable" } }, - "ucodenix": { - "inputs": { - "cpu-microcodes": "cpu-microcodes" - }, - "locked": { - "lastModified": 1742827057, - "narHash": "sha256-eRUBUdKGKHxCTPkF6zoQsIKPdu58AkiPU0bxX8nuRoQ=", - "owner": "e-tho", - "repo": "ucodenix", - "rev": "1e8747f89ed13826cd7698be5a559bdbc50258fe", - "type": "github" - }, - "original": { - "owner": "e-tho", - "repo": "ucodenix", - "type": "github" - } - }, "unstable": { "locked": { "lastModified": 1742669843, diff --git a/nixos/flake.nix b/nixos/flake.nix index 82b32df..7001169 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -7,9 +7,6 @@ home-manger.url = "github:nix-community/home-manager"; home-manger.inputs.nixpkgs.follows = "nixpkgs"; - - # CPU microcode updater - ucodenix.url = "github:e-tho/ucodenix"; }; outputs = @@ -22,7 +19,6 @@ nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { specialArgs = { - inherit inputs; pkgs = import nixpkgs { inherit system; config.allowUnfree = true; @@ -35,7 +31,6 @@ modules = [ ./configuration.nix ]; - }; };