diff --git a/configuration.nix b/configuration.nix index 8468992..8c14b11 100644 --- a/configuration.nix +++ b/configuration.nix @@ -20,8 +20,6 @@ ./modules/services.nix ]; - chaotic.mesa-git.enable = true; - boot = { initrd.kernelModules = [ ]; initrd.verbose = false; @@ -102,6 +100,7 @@ ''; onBoot = "ignore"; }; + spiceUSBRedirection.enable = true; }; # Define a user account. Don't forget to set a password with ‘passwd’. @@ -113,6 +112,10 @@ "wheel" "docker" "qemu-libvirtd" + "camera" + "video" + "render" + "input" ]; shell = pkgs.zsh; #packages = with pkgs; [ ]; @@ -181,14 +184,19 @@ enable = true; enable32Bit = true; package = pkgs.mesa; + extraPackages = with pkgs; [ + rocmPackages.clr.icd # The ROCm OpenCL ICD + rocmPackages.rocminfo # The utility you want to run + rocmPackages.rocm-smi # Useful for general GPU health checks + ]; }; - # amdgpu.opencl.enable = true; ROCM + amdgpu.opencl.enable = true; # ROCM }; # QT stuff qt = { - style = "gtk2"; platformTheme = "qt5ct"; + style = "adwaita-dark"; enable = true; }; diff --git a/flake.lock b/flake.lock index c0f01fb..ccf4092 100644 --- a/flake.lock +++ b/flake.lock @@ -1,85 +1,5 @@ { "nodes": { - "chaotic": { - "inputs": { - "flake-schemas": "flake-schemas", - "home-manager": "home-manager", - "jovian": "jovian", - "nixpkgs": "nixpkgs", - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1763563060, - "narHash": "sha256-WoNrCTrsiONytvw31fvaRzwc9RcqqHv/LUyYyYflgIg=", - "owner": "chaotic-cx", - "repo": "nyx", - "rev": "c5bfa8ed2037abd4ca213b363065cb6f76155035", - "type": "github" - }, - "original": { - "owner": "chaotic-cx", - "ref": "nyxpkgs-unstable", - "repo": "nyx", - "type": "github" - } - }, - "flake-schemas": { - "locked": { - "lastModified": 1721999734, - "narHash": "sha256-G5CxYeJVm4lcEtaO87LKzOsVnWeTcHGKbKxNamNWgOw=", - "rev": "0a5c42297d870156d9c57d8f99e476b738dcd982", - "revCount": 75, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.5/0190ef2f-61e0-794b-ba14-e82f225e55e6/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1763416652, - "narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "jovian": { - "inputs": { - "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1763453666, - "narHash": "sha256-Hu8lDUlbMFvcYX30LBXX7Gq5FbU35bERH0pSX5qHf/Q=", - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "rev": "b843b551415c7aecc97c8b3ab3fff26fd0cd8bbf", - "type": "github" - }, - "original": { - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "type": "github" - } - }, "nix-flatpak": { "locked": { "lastModified": 1754777568, @@ -95,52 +15,13 @@ "type": "github" } }, - "nix-github-actions": { - "inputs": { - "nixpkgs": [ - "chaotic", - "jovian", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729697500, - "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=", - "owner": "zhaofengli", - "repo": "nix-github-actions", - "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "ref": "matrix-name", - "repo": "nix-github-actions", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1763421233, - "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", + "lastModified": 1765183668, + "narHash": "sha256-TBA7CE44IHYfvOPBWcyLncpVrrKEiXWPdOrF8CD6W84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1763640637, - "narHash": "sha256-3LY/CFiVH1driDqPwP3UmGRqKGM11eJkuIUzsKsflZM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "33dee0014543abf6ada764a776fa0f93fbbe325c", + "rev": "fc2de1563f89f0843eba27f14576d261df0e3b80", "type": "github" }, "original": { @@ -152,30 +33,8 @@ }, "root": { "inputs": { - "chaotic": "chaotic", "nix-flatpak": "nix-flatpak", - "nixpkgs": "nixpkgs_2" - } - }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1763433504, - "narHash": "sha256-cVid5UNpk88sPYHkLAA5aZEHOFQXSB/2L1vl18Aq7IM=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "42ce16c6d8318a654d53f047c9400b7d902d6e61", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index 44e8825..aff4df8 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,6 @@ { inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small"; - chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; nix-flatpak = { url = "github:gmodena/nix-flatpak"; @@ -9,13 +8,12 @@ }; }; - outputs = { self, nixpkgs, nix-flatpak, chaotic, ... }: { + outputs = { self, nixpkgs, nix-flatpak, ... }: { nixosConfigurations = { epiquev2 = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ ./configuration.nix - chaotic.nixosModules.default nix-flatpak.nixosModules.nix-flatpak ]; }; diff --git a/modules/packages.nix b/modules/packages.nix index 3767b9f..d31571e 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -25,15 +25,16 @@ bzip2 ccache curl - czkawka + czkawka-full ddcutil - discord-krisp + # discord distrobox docker-buildx docker-compose dog eza - ffmpeg + fahclient + ffmpeg-full ffmpegthumbnailer file file-roller @@ -49,6 +50,7 @@ gnome.gvfs gotop gparted + gphoto2 gst_all_1.gst-libav gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-base @@ -71,6 +73,7 @@ libgsf libnotify libreoffice + libsForQt5.qtstyleplugins linux-firmware lm_sensors lrzip @@ -84,7 +87,6 @@ ncdu nil nixfmt-rfc-style - noisetorch ntfs3g nufraw-thumbnailer nvtopPackages.amd @@ -97,6 +99,8 @@ prismlauncher-unwrapped protonup-qt radeontop + rocmPackages.rocm-smi + rocmPackages.rocminfo rquickshare scrcpy screen @@ -120,7 +124,6 @@ vscode-fhs webp-pixbuf-loader wev - weylus wget which wine diff --git a/modules/programs.nix b/modules/programs.nix index 65deaa4..18cff12 100644 --- a/modules/programs.nix +++ b/modules/programs.nix @@ -45,6 +45,10 @@ zsh.enable = true; gamemode.enable = true; firefox.enable = true; + virt-manager.enable = true; + weylus.enable = true; + gamescope.enable = true; + noisetorch.enable = true; git = { enable = true; @@ -64,14 +68,18 @@ enable = true; libraries = with pkgs; [ ]; }; - # obs-studio = { - # enable = true; - # plugins = with pkgs.obs-studio-plugins; [ - # obs-vaapi - # obs-vkcapture - # wlrobs - # ]; - # }; + + obs-studio = { + enable = true; + plugins = with pkgs.obs-studio-plugins; [ + wlrobs + obs-backgroundremoval + obs-pipewire-audio-capture + obs-vaapi # optional AMD hardware acceleration + obs-gstreamer + obs-vkcapture + ]; + }; steam = { dedicatedServer.openFirewall = true; @@ -81,6 +89,5 @@ protontricks.enable = true; remotePlay.openFirewall = true; }; - virt-manager.enable = true; }; }