diff --git a/home/environments/niri/waybar.nix b/home/environments/niri/waybar.nix index bca1b5c7..ceee409e 100644 --- a/home/environments/niri/waybar.nix +++ b/home/environments/niri/waybar.nix @@ -164,7 +164,7 @@ _: { "backlight" "battery" "tray" - "custom/notification" + #"custom/notification" ]; idle_inhibitor = { diff --git a/home/profiles/shell/packages.nix b/home/profiles/shell/packages.nix index 35af1ef2..c03544a9 100644 --- a/home/profiles/shell/packages.nix +++ b/home/profiles/shell/packages.nix @@ -28,5 +28,7 @@ rsync wget whois + # nix-search + nix-search-cli ]; } diff --git a/nixos/common/stylix.nix b/nixos/common/stylix.nix index 826246d1..471134d7 100644 --- a/nixos/common/stylix.nix +++ b/nixos/common/stylix.nix @@ -19,6 +19,7 @@ terminal = 0.8; popups = 0.8; }; + image = ./stylix.png; fonts = { sansSerif = { name = "Jost"; diff --git a/nixos/common/stylix.png b/nixos/common/stylix.png new file mode 100644 index 00000000..7a1a7942 Binary files /dev/null and b/nixos/common/stylix.png differ diff --git a/nixos/environments/niri/greetd.nix b/nixos/environments/niri/greetd.nix index 8fc415f1..f11b47f2 100644 --- a/nixos/environments/niri/greetd.nix +++ b/nixos/environments/niri/greetd.nix @@ -1,6 +1,9 @@ -{pkgs, ...}: { +{pkgs, config, lib, ...}: let + inherit (lib.modules) mkForce; +in { programs.regreet = { enable = true; + theme = mkForce config.home-manager.users.kat.gtk.theme; }; stylix.targets.regreet.enable = true; services.greetd = { diff --git a/nixos/profiles/gaming/lutris.nix b/nixos/profiles/gaming/lutris.nix index 4eed8c40..b93a4773 100644 --- a/nixos/profiles/gaming/lutris.nix +++ b/nixos/profiles/gaming/lutris.nix @@ -37,20 +37,6 @@ vkbasalt mangohud umu-launcher - - # support 32-bit only - wine - - # support 64-bit only - wine64 - - # wine-staging (version with experimental features) - wineWowPackages.staging - - # winetricks (all versions) winetricks - - # native wayland support (unstable) - wineWowPackages.waylandFull ]; } diff --git a/nixos/profiles/gaming/minecraft.nix b/nixos/profiles/gaming/minecraft.nix index 3c7054bd..fedb6512 100644 --- a/nixos/profiles/gaming/minecraft.nix +++ b/nixos/profiles/gaming/minecraft.nix @@ -1,8 +1,8 @@ {pkgs, ...}: { programs.java = { - enable = true; + enable = false; }; environment.systemPackages = with pkgs; [ - prismlauncher + #prismlauncher ]; } diff --git a/nixos/profiles/gaming/vr.nix b/nixos/profiles/gaming/vr.nix index 6af17efe..0b57f82e 100644 --- a/nixos/profiles/gaming/vr.nix +++ b/nixos/profiles/gaming/vr.nix @@ -35,9 +35,9 @@ */ environment.systemPackages = with pkgs; [ - wlx-overlay-s - monado-vulkan-layers - bs-manager + #wlx-overlay-s + #monado-vulkan-layers + #bs-manager ]; networking.firewall = { diff --git a/nixos/profiles/graphical/obs.nix b/nixos/profiles/graphical/obs.nix new file mode 100644 index 00000000..b6e87e03 --- /dev/null +++ b/nixos/profiles/graphical/obs.nix @@ -0,0 +1,14 @@ +{ pkgs, ... }: { + programs.obs-studio = { + enable = true; + enableVirtualCamera = true; + plugins = with pkgs.obs-studio-plugins; [ + #obs-vaapi + #obs-tuna + #obs-source-clone + obs-pipewire-audio-capture + #input-overlay + obs-vkcapture + ]; + }; +} diff --git a/nixos/profiles/graphical/packages.nix b/nixos/profiles/graphical/packages.nix index 13bfec76..9a99c77c 100644 --- a/nixos/profiles/graphical/packages.nix +++ b/nixos/profiles/graphical/packages.nix @@ -7,27 +7,8 @@ jmtpfs dnsutils usbutils - plexamp - super-slicer-beta - nvidia-vaapi-driver - nv-codec-headers-12 inputs.push2talk.defaultPackage.${pkgs.system} ]; - programs.obs-studio = { - enable = true; - enableVirtualCamera = true; - package = pkgs.obs-studio.override { - cudaSupport = true; - }; - plugins = with pkgs.obs-studio-plugins; [ - obs-vaapi - obs-tuna - obs-source-clone - obs-pipewire-audio-capture - input-overlay - obs-vkcapture - ]; - }; services.udev.packages = [ pkgs.android-udev-rules pkgs.zsa-udev-rules diff --git a/systems/goliath.nix b/systems/goliath.nix index e49f9aa6..e926ee41 100644 --- a/systems/goliath.nix +++ b/systems/goliath.nix @@ -66,6 +66,9 @@ _: let home-manager.users.kat = { programs = { + obs-studio.package = pkgs.obs-studio.override { + cudaSupport = true; + }; konawall-py.settings = { source = "e621"; tags = [ @@ -143,6 +146,8 @@ _: let builders-use-substitutes = true ''; }; + + services.xserver.videoDrivers = ["nvidia"]; hardware.nvidia = { @@ -190,6 +195,8 @@ _: let ledfx openrgb nvtopPackages.nvidia + nvidia-vaapi-driver + nv-codec-headers-12 ]; system.stateVersion = "21.11"; }; diff --git a/systems/koishi.nix b/systems/koishi.nix index 53ddd9bc..147f392a 100644 --- a/systems/koishi.nix +++ b/systems/koishi.nix @@ -53,9 +53,6 @@ _: let wireless laptop gaming - sdr - #virtualisation - #secureboot ]) ++ (with tree.nixos.environments; [ niri @@ -66,7 +63,7 @@ _: let konawall-py.settings = { source = "konachan"; tags = [ - "-rating:e" + "rating:s" ]; }; niri.settings = { @@ -109,13 +106,6 @@ _: let scheduler = "scx_lavd"; }; - virtualisation.virtualbox.host = { - enable = true; - enableExtensionPack = true; - enableKvm = true; - addNetworkInterface = false; - }; - zramSwap.enable = true; programs.ssh.extraConfig = ''