From bb641b906822a74d3f1f229843e5d6866b0256b4 Mon Sep 17 00:00:00 2001 From: serenity-F Date: Sat, 16 Nov 2024 12:22:07 +1000 Subject: [PATCH] i cant rember oof v2 --- core/config.nix | 4 +- core/display.nix | 16 ++--- core/gaming.nix | 104 ++++++++++++++++++++------------ core/packages.nix | 3 +- home/common/default.nix | 30 ++++----- home/common/obs-studio.nix | 16 +++++ home/desktop/common/default.nix | 21 +++++++ hosts/hades/default.nix | 28 ++++----- 8 files changed, 146 insertions(+), 76 deletions(-) create mode 100644 home/common/obs-studio.nix diff --git a/core/config.nix b/core/config.nix index a788a2c..acef7c4 100644 --- a/core/config.nix +++ b/core/config.nix @@ -60,8 +60,10 @@ }; hardware = { - + ## Enable all firmware modules enableAllFirmware = true; + sensor.hddtemp.enable = true; + usbStorage.manageStartStop = true; }; diff --git a/core/display.nix b/core/display.nix index 7131558..b7466f3 100644 --- a/core/display.nix +++ b/core/display.nix @@ -23,14 +23,14 @@ wayland.enable = true; }; }; - ## Eventual login greeter/display manager, - ## wayland native. - #services.greetd = { - #enable = true; - #settings.default_session = { - #command = "${pkgs.greetd.regreet}/bin/regreet"; - #}; - #}; + ## Eventual login greeter/display manager, + ## wayland native. + #greetd = { + #enable = true; + #settings.default_session = { + #command = "${pkgs.greetd.regreet}/bin/regreet"; + #}; + #}; ## Virtual filesystem, needed this for something i think ? gvfs.enable = true; diff --git a/core/gaming.nix b/core/gaming.nix index 3bb3b39..f8e0d68 100644 --- a/core/gaming.nix +++ b/core/gaming.nix @@ -8,37 +8,60 @@ nixpkgs = { }; - hardware.opentabletdriver = { - enable = true; - #package = [ ]; - #daemon.enable = true; - #blacklistedKernelModules = [ ]; + hardware = { + + opentabletdriver = { + ## Open tablet driver, for Osu!, mainly. + enable = true; + ## Disable conflicting drivers + blacklistedKernelModules = [ + "hid-uclogic" + "wacom" + ]; + ## Enables the daemon via systemd + daemon.enable = true; + }; + }; - environment.sessionVariables = rec { - XDG_CACHE_HOME = "$HOME/.cache"; - XDG_CONFIG_HOME = "$HOME/.config"; - XDG_BIN_HOME = "$HOME/.local/bin"; - XDG_DATA_HOME = "$HOME/.local/share"; - # Steam needs this to find Proton-GE - STEAM_EXTRA_COMPAT_TOOLS_PATHS = "\${HOME}/.steam/root/compatibilitytools.d"; - ## note: this doesn't replace PATH, it just adds this to it - PATH = [ - "\${XDG_BIN_HOME}" + services = { + ## Enabling flatpak in case i need it + #flatpak.enable = true; + ## ratbagd for gaming mouse config + ratbagd.enable = true; + }; + + environment = { + ## All common gaming packages declared here + systemPackages = with pkgs; [ + #steam # games storefront/launcher + piper # mouse configuration ]; + ## These are important apparently :uh: + sessionVariables = rec { + XDG_CACHE_HOME = "$HOME/.cache"; + XDG_CONFIG_HOME = "$HOME/.config"; + XDG_BIN_HOME = "$HOME/.local/bin"; + XDG_DATA_HOME = "$HOME/.local/share"; + ## Steam needs this to find Proton-GE + STEAM_EXTRA_COMPAT_TOOLS_PATHS = "\${HOME}/.steam/root/compatibilitytools.d"; + ## Note: this doesn't replace PATH, it just adds this to it + PATH = [ "\${XDG_BIN_HOME}" ]; + }; }; programs = { - ## Java for some reason java.enable = true; - ## "GameMode" - gamemode = { + ## To run "normal" linux applications seamlessly + appimage = { enable = true; + binfmt = true; }; ## Gamescope compositor for steam + ## (config copy-pasted from nixos wiki) gamescope = { enable = true; capSysNice = true; @@ -48,17 +71,40 @@ ]; }; + ## "GameMode" - https://nixos.wiki/wiki/Gamemode + ## (config copy-pasted from mynixos) + gamemode = { + enable = true; + settings = { + general = { + renice = 10; + }; + ## Warning: GPU optimisations have the potential to damage hardware + gpu = { + apply_gpu_optimisations = "accept-responsibility"; + gpu_device = 0; + amd_performance_level = "high"; + }; + custom = { + #start = "${pkgs.libnotify}/bin/notify-send 'GameMode started'"; + #end = "${pkgs.libnotify}/bin/notify-send 'GameMode ended'"; + }; + }; + }; + ## Steam itself steam = { enable = true; - #remotePlay.openFirewall = true; + ## This should help games run more betterer gamescopeSession = { enable = true; }; + ## No clue what this is doing package = pkgs.steam.override { extraLibraries = pkgs: [ pkgs.xorg.libxcb ]; + ## No clue what this shit does extraPkgs = pkgs: with pkgs; [ xorg.libXcursor xorg.libXi @@ -73,6 +119,8 @@ gamemode ]; }; + ## Not sure we need gamescope here + ## as it's defined elsewhere but o well extraPackages = with pkgs; [ gamescope ]; @@ -82,24 +130,6 @@ ]; }; - ## To run "normal" linux applications seamlessly - appimage = { - enable = true; - binfmt = true; - }; - }; - ## Enabling flatpak in case i need it - #services.flatpak.enable = true; - - ## ratbagd for gaming mouse config - services.ratbagd.enable = true; - - ## All common gaming packages declared here - environment.systemPackages = with pkgs; [ - #steam # games storefront/launcher - piper # mouse configuration - ]; - } diff --git a/core/packages.nix b/core/packages.nix index 588e572..82109b7 100644 --- a/core/packages.nix +++ b/core/packages.nix @@ -91,10 +91,8 @@ ## theoretically pass off as a complete linux distribution. ## So there needs to be -some- way for users who are unwilling ## to use a terminal and are more comfortable with a GUI. - #inputs.nixos-conf-editor.packages.${system}.nixos-conf-editor #nixos-conf-editor - ## Disabling this for now. Eats disk space, and it's useless until ## wei make a single "control" module using 'let bindings' anyway. ######## @@ -140,6 +138,7 @@ git-crypt # Transparent file encryption in git undervolt # Utility to change CPU settings android-tools # Commands for interfacing with android devices + smartmontools # Tools for monitoring HDD health magic-wormhole # Direct file sharing ]; diff --git a/home/common/default.nix b/home/common/default.nix index 7d74246..dd04dc1 100644 --- a/home/common/default.nix +++ b/home/common/default.nix @@ -12,6 +12,7 @@ ## Import program configs #./nixvim + ./obs-studio.nix ./neofetch.nix ./kitty.nix ./fish.nix @@ -21,6 +22,16 @@ ]; home = { + + pointerCursor = { + gtk.enable = true; + package = pkgs.bibata-cursors; + name = "Bibata-Modern-Classic"; + size = 12; + }; + + sessionVariables.GTK_THEME = "Adwaita-dark"; + packages = with pkgs; [ ## Games @@ -61,7 +72,7 @@ ardour # Digital Audio Workstation ## Image and Video playback and production - obs-studio # Screen sharing + #obs-studio # Screen sharing #inkscape # Vector image editing #shotcut # Video editing #blender # 3D modelling @@ -73,9 +84,9 @@ programs = { home-manager.enable = true; # Declarative dots - + droidcam.enable = true; # Use smartphone as webcam firefox.enable = true; # Browser of choice - + nheko.enable = true; # Matrix client for qt kitties neovim = { # Zoomer text editor enable = true; defaultEditor = true; # Default but keeping micro around @@ -84,27 +95,19 @@ }; services = { - kdeconnect = { # Mobile <-> Desktop interaction enable = true; indicator = true; }; - gnome-keyring = { # GTK keyring for login/sudo/ssh/gpg prompts enable = true; #components = [ ]; }; - }; - home.pointerCursor = { - gtk.enable = true; - package = pkgs.bibata-cursors; - name = "Bibata-Modern-Classic"; - size = 12; - }; + home = { - home.sessionVariables.GTK_THEME = "Adwaita-dark"; + }; qt = { enable = true; @@ -140,7 +143,6 @@ gtk-application-prefer-dark-theme=1 ''; }; - }; dconf = { diff --git a/home/common/obs-studio.nix b/home/common/obs-studio.nix new file mode 100644 index 0000000..d588ce4 --- /dev/null +++ b/home/common/obs-studio.nix @@ -0,0 +1,16 @@ +{ self, inputs, outputs, lib, config, pkgs, ... }: + +{ + + programs = { + obs-studio = { + enable = true; + enableVirtualCamera = true; + plugins = with pkgs.obs-studio-plugins; [ + droidcam-obs + ]; + }; + + }; + +} diff --git a/home/desktop/common/default.nix b/home/desktop/common/default.nix index f7892b1..040b40e 100644 --- a/home/desktop/common/default.nix +++ b/home/desktop/common/default.nix @@ -24,8 +24,28 @@ ]; programs = { + ## For when bimbo needs to play with platters and cbf to deal with cli gnome-disks.enable = true; + seahorse.enable = true; + + ## Apparently nm-applet has a programs option + nm-applet = { + enable = true; + #indicator = false; + }; + + ## idk something for nautilus + nautilus-open-any-terminal = { + enable = true; + terminal = "kitty"; + }; + + }; + + services = { + easyeffects.enable = true; + network-manager-applet.enable = true; }; home.packages = with pkgs; [ @@ -55,6 +75,7 @@ gnome-power-manager # GUI power and battery stats gnome-calculator # GTK calculator gnome-calendar # GTK calendar + gsmartcontrol # GUI for smartctl (smartmontools) pavucontrol # Volume control centre hyprpicker # Colour picker hyprcursor # Cursor, duh diff --git a/hosts/hades/default.nix b/hosts/hades/default.nix index 057cee9..5bfd4da 100644 --- a/hosts/hades/default.nix +++ b/hosts/hades/default.nix @@ -22,7 +22,7 @@ graphics = { enable = true; - enable32Bit = true; + enable32Bit = false; ## Packages for the iGPU inside Hades extraPackages = with pkgs; [ @@ -38,16 +38,16 @@ ## Packages for the dGPU inside Hades amdgpu = { initrd.enable = true; - #opencl.enable = true; + opencl.enable = true; ## Vulkan packages for the dGPU inside Hades - #amdvlk = { - #enable = false; + amdvlk = { + enable = false; #package = [ ]; - #support32Bit.enable = true; - #supportExperimental.enable = true; + support32Bit.enable = false; + supportExperimental.enable = false; #settings = { #}; - #}; + }; }; }; @@ -56,19 +56,19 @@ ## For tweaking system performance corectrl = { - enable = false; + enable = true; ## Allows tweaking GPU performance gpuOverclock = { - enable = false; + enable = true; ## Needed for radeon GPU overclocking - #ppfeaturemask = "0xfffd7fff"; + ppfeaturemask = "0xfffd7fff"; }; }; ## Performance tweaking continued tuxclocker = { enable = false; - #enableAMD = true; - #useUnfree = true; + enableAMD = true; + useUnfree = true; }; }; @@ -77,11 +77,11 @@ environment.systemPackages = with pkgs; [ #umr lact - #radeontop + radeontop #amdgpu_top #radeontools #radeon-profile - #nvtopPackages.amd + nvtopPackages.amd ]; systemd = {