From dd4ca5a69edcf11b30391ce783790343a8e89023 Mon Sep 17 00:00:00 2001 From: worble Date: Sat, 23 Aug 2025 14:51:32 +0100 Subject: [PATCH] lots of updates; playing with wine --- configuration/base.nix | 6 ++++ configuration/modules/virtualisation.nix | 2 +- devices/tuxedo/configuration.nix | 8 ++--- flake.nix | 8 +---- home-manager/base.nix | 6 ++-- home-manager/base/mpv.nix | 3 +- home-manager/base/terminal.nix | 6 ++++ home-manager/development/dotnet.nix | 2 +- home-manager/development/vscode.nix | 6 +++- home-manager/gaming.nix | 40 +++++++++++++++++++++--- 10 files changed, 64 insertions(+), 23 deletions(-) diff --git a/configuration/base.nix b/configuration/base.nix index 6bba185..ffb30e2 100644 --- a/configuration/base.nix +++ b/configuration/base.nix @@ -107,7 +107,13 @@ vim curl inetutils + dig + rar + zstd + xz + p7zip + libva-utils smartmontools appimage-run diff --git a/configuration/modules/virtualisation.nix b/configuration/modules/virtualisation.nix index 9f29dce..73aff8f 100644 --- a/configuration/modules/virtualisation.nix +++ b/configuration/modules/virtualisation.nix @@ -28,6 +28,6 @@ # }; }; programs.virt-manager.enable = true; - environment.systemPackages = with pkgs;[ podman-compose ]; + environment.systemPackages = with pkgs;[ podman-compose podman-tui podman-desktop ]; } diff --git a/devices/tuxedo/configuration.nix b/devices/tuxedo/configuration.nix index 4034120..a0a792c 100644 --- a/devices/tuxedo/configuration.nix +++ b/devices/tuxedo/configuration.nix @@ -39,11 +39,6 @@ services.hardware.openrgb.enable = true; - services.lsfg-vk = { - enable = true; - ui.enable = true; # installs gui for configuring lsfg-vk - }; - # fileSystems."/mnt/HDD1" = { # fsType = "ext4"; # label = "HDD1"; @@ -86,6 +81,9 @@ environment.systemPackages = with pkgs;[ distrobox gpu-screen-recorder-gtk + + inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".lsfg-vk + inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".lsfg-vk-ui ]; # Define a user account. Don't forget to set a password with ‘passwd’. diff --git a/flake.nix b/flake.nix index d90dbec..f72bfb4 100644 --- a/flake.nix +++ b/flake.nix @@ -29,14 +29,9 @@ url = "github:soupglasses/nix-system-graphics?shallow=1"; inputs.nixpkgs.follows = "nixpkgs"; }; - - lsfg-vk-flake = { - url = "github:pabloaul/lsfg-vk-flake/main"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; - outputs = { self, nixpkgs, nixos-hardware, home-manager, system-manager, nix-system-graphics, nix-index-database, lsfg-vk-flake, ... }@inputs: + outputs = { self, nixpkgs, nixos-hardware, home-manager, system-manager, nix-system-graphics, nix-index-database, ... }@inputs: let system = "x86_64-linux"; pkgs = import nixpkgs { @@ -49,7 +44,6 @@ specialArgs = { inherit inputs; }; modules = [ ./devices/tuxedo/configuration.nix - lsfg-vk-flake.nixosModules.default ]; }; nixosConfigurations.starlite = nixpkgs.lib.nixosSystem { diff --git a/home-manager/base.nix b/home-manager/base.nix index a292a17..26d88eb 100644 --- a/home-manager/base.nix +++ b/home-manager/base.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, inputs, ... }: +{ pkgs, ... }: { imports = [ @@ -14,11 +14,11 @@ keepassxc qbittorrent libreoffice-qt - inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".joplin-desktop + joplin-desktop # comms teamspeak_client - vesktop + discord # media strawberry diff --git a/home-manager/base/mpv.nix b/home-manager/base/mpv.nix index 488a83e..2d9e581 100644 --- a/home-manager/base/mpv.nix +++ b/home-manager/base/mpv.nix @@ -10,9 +10,10 @@ uosc sponsorblock ]; + + mpv = pkgs.mpv-unwrapped; } ); - config = { screenshot-directory = lib.mkDefault "~/Pictures/"; screenshot-template = lib.mkDefault "%F/%F_snapshot_%P"; diff --git a/home-manager/base/terminal.nix b/home-manager/base/terminal.nix index 5338929..b436520 100644 --- a/home-manager/base/terminal.nix +++ b/home-manager/base/terminal.nix @@ -45,6 +45,12 @@ with lib; ''; }; + nix-index = { + enable = true; + enableBashIntegration = true; + enableFishIntegration = true; + }; + git = { enable = true; delta.enable = true; diff --git a/home-manager/development/dotnet.nix b/home-manager/development/dotnet.nix index 03ea64b..195453c 100644 --- a/home-manager/development/dotnet.nix +++ b/home-manager/development/dotnet.nix @@ -1,4 +1,4 @@ -{ pkgs, inputs, ... }: +{ pkgs, ... }: { home.packages = with pkgs;[ diff --git a/home-manager/development/vscode.nix b/home-manager/development/vscode.nix index 2c8b862..38a99db 100644 --- a/home-manager/development/vscode.nix +++ b/home-manager/development/vscode.nix @@ -34,7 +34,9 @@ in ms-python.python ms-python.debugpy charliermarsh.ruff - ]) ++ (with vscode-marketplace;[ bradlc.vscode-tailwindcss ]); + ]) ++ (with vscode-marketplace;[ + bradlc.vscode-tailwindcss + ]); userSettings = with pkgs;{ "workbench.iconTheme" = "material-icon-theme"; "window.titleBarStyle" = "custom"; @@ -89,6 +91,8 @@ in "bashIde.shfmt.path" = "${shfmt}/bin/shfmt"; "rust-analyzer.rustfmt.overrideCommand" = [ "${rustfmt}/bin/rustfmt" ]; + + "tailwindCSS.classFunctions" = [ "cva" "cx" ]; }; }; }; diff --git a/home-manager/gaming.nix b/home-manager/gaming.nix index 2ad766c..2b8b25d 100644 --- a/home-manager/gaming.nix +++ b/home-manager/gaming.nix @@ -1,16 +1,48 @@ { pkgs, ... }: { + xdg.dataFile."proton/proton-ge" = { + source = pkgs.proton-ge-bin; + }; + home.packages = with pkgs;[ - steamguard-cli + # Wine / Proton + wineWowPackages.staging + winetricks bottles - ryubing - mgba - scanmem (heroic.override { extraPkgs = pkgs: [ pkgs.gamescope ]; }) + (umu-launcher.override { + extraPkgs = pkgs: with pkgs.gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + gst-plugins-ugly + gst-libav + gst-vaapi + gamescope + ]; + }) + + # Steam + steamguard-cli + + # Emulators + ryubing + mgba + + # Cheat engine + scanmem ]; + + # programs.lutris = { + # enable = true; + # extraPackages = with pkgs; [ mangohud winetricks gamescope gamemode umu-launcher ]; + # protonPackages = [ pkgs.proton-ge-bin ]; + # winePackages = [ pkgs.wineWowPackages.staging ]; + # }; }