i cant rember oof v2
This commit is contained in:
parent
48bc7c14a0
commit
bb641b9068
8 changed files with 146 additions and 76 deletions
|
|
@ -60,8 +60,10 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
hardware = {
|
hardware = {
|
||||||
|
## Enable all firmware modules
|
||||||
enableAllFirmware = true;
|
enableAllFirmware = true;
|
||||||
|
sensor.hddtemp.enable = true;
|
||||||
|
usbStorage.manageStartStop = true;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -23,14 +23,14 @@
|
||||||
wayland.enable = true;
|
wayland.enable = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
## Eventual login greeter/display manager,
|
## Eventual login greeter/display manager,
|
||||||
## wayland native.
|
## wayland native.
|
||||||
#services.greetd = {
|
#greetd = {
|
||||||
#enable = true;
|
#enable = true;
|
||||||
#settings.default_session = {
|
#settings.default_session = {
|
||||||
#command = "${pkgs.greetd.regreet}/bin/regreet";
|
#command = "${pkgs.greetd.regreet}/bin/regreet";
|
||||||
#};
|
#};
|
||||||
#};
|
#};
|
||||||
|
|
||||||
## Virtual filesystem, needed this for something i think ?
|
## Virtual filesystem, needed this for something i think ?
|
||||||
gvfs.enable = true;
|
gvfs.enable = true;
|
||||||
|
|
|
||||||
104
core/gaming.nix
104
core/gaming.nix
|
|
@ -8,37 +8,60 @@
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
};
|
};
|
||||||
|
|
||||||
hardware.opentabletdriver = {
|
hardware = {
|
||||||
enable = true;
|
|
||||||
#package = [ ];
|
opentabletdriver = {
|
||||||
#daemon.enable = true;
|
## Open tablet driver, for Osu!, mainly.
|
||||||
#blacklistedKernelModules = [ ];
|
enable = true;
|
||||||
|
## Disable conflicting drivers
|
||||||
|
blacklistedKernelModules = [
|
||||||
|
"hid-uclogic"
|
||||||
|
"wacom"
|
||||||
|
];
|
||||||
|
## Enables the daemon via systemd
|
||||||
|
daemon.enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.sessionVariables = rec {
|
services = {
|
||||||
XDG_CACHE_HOME = "$HOME/.cache";
|
## Enabling flatpak in case i need it
|
||||||
XDG_CONFIG_HOME = "$HOME/.config";
|
#flatpak.enable = true;
|
||||||
XDG_BIN_HOME = "$HOME/.local/bin";
|
## ratbagd for gaming mouse config
|
||||||
XDG_DATA_HOME = "$HOME/.local/share";
|
ratbagd.enable = true;
|
||||||
# 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
|
environment = {
|
||||||
PATH = [
|
## All common gaming packages declared here
|
||||||
"\${XDG_BIN_HOME}"
|
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 = {
|
programs = {
|
||||||
|
|
||||||
## Java for some reason
|
## Java for some reason
|
||||||
java.enable = true;
|
java.enable = true;
|
||||||
|
|
||||||
## "GameMode"
|
## To run "normal" linux applications seamlessly
|
||||||
gamemode = {
|
appimage = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
binfmt = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
## Gamescope compositor for steam
|
## Gamescope compositor for steam
|
||||||
|
## (config copy-pasted from nixos wiki)
|
||||||
gamescope = {
|
gamescope = {
|
||||||
enable = true;
|
enable = true;
|
||||||
capSysNice = 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 itself
|
||||||
steam = {
|
steam = {
|
||||||
enable = true;
|
enable = true;
|
||||||
#remotePlay.openFirewall = true;
|
## This should help games run more betterer
|
||||||
gamescopeSession = {
|
gamescopeSession = {
|
||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
|
## No clue what this is doing
|
||||||
package = pkgs.steam.override {
|
package = pkgs.steam.override {
|
||||||
extraLibraries = pkgs: [
|
extraLibraries = pkgs: [
|
||||||
pkgs.xorg.libxcb
|
pkgs.xorg.libxcb
|
||||||
];
|
];
|
||||||
|
## No clue what this shit does
|
||||||
extraPkgs = pkgs: with pkgs; [
|
extraPkgs = pkgs: with pkgs; [
|
||||||
xorg.libXcursor
|
xorg.libXcursor
|
||||||
xorg.libXi
|
xorg.libXi
|
||||||
|
|
@ -73,6 +119,8 @@
|
||||||
gamemode
|
gamemode
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
## Not sure we need gamescope here
|
||||||
|
## as it's defined elsewhere but o well
|
||||||
extraPackages = with pkgs; [
|
extraPackages = with pkgs; [
|
||||||
gamescope
|
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
|
|
||||||
];
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -91,10 +91,8 @@
|
||||||
## theoretically pass off as a complete linux distribution.
|
## theoretically pass off as a complete linux distribution.
|
||||||
## So there needs to be -some- way for users who are unwilling
|
## So there needs to be -some- way for users who are unwilling
|
||||||
## to use a terminal and are more comfortable with a GUI.
|
## to use a terminal and are more comfortable with a GUI.
|
||||||
|
|
||||||
#inputs.nixos-conf-editor.packages.${system}.nixos-conf-editor
|
#inputs.nixos-conf-editor.packages.${system}.nixos-conf-editor
|
||||||
#nixos-conf-editor
|
#nixos-conf-editor
|
||||||
|
|
||||||
## Disabling this for now. Eats disk space, and it's useless until
|
## Disabling this for now. Eats disk space, and it's useless until
|
||||||
## wei make a single "control" module using 'let bindings' anyway.
|
## wei make a single "control" module using 'let bindings' anyway.
|
||||||
########
|
########
|
||||||
|
|
@ -140,6 +138,7 @@
|
||||||
git-crypt # Transparent file encryption in git
|
git-crypt # Transparent file encryption in git
|
||||||
undervolt # Utility to change CPU settings
|
undervolt # Utility to change CPU settings
|
||||||
android-tools # Commands for interfacing with android devices
|
android-tools # Commands for interfacing with android devices
|
||||||
|
smartmontools # Tools for monitoring HDD health
|
||||||
magic-wormhole # Direct file sharing
|
magic-wormhole # Direct file sharing
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,7 @@
|
||||||
|
|
||||||
## Import program configs
|
## Import program configs
|
||||||
#./nixvim
|
#./nixvim
|
||||||
|
./obs-studio.nix
|
||||||
./neofetch.nix
|
./neofetch.nix
|
||||||
./kitty.nix
|
./kitty.nix
|
||||||
./fish.nix
|
./fish.nix
|
||||||
|
|
@ -21,6 +22,16 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
home = {
|
home = {
|
||||||
|
|
||||||
|
pointerCursor = {
|
||||||
|
gtk.enable = true;
|
||||||
|
package = pkgs.bibata-cursors;
|
||||||
|
name = "Bibata-Modern-Classic";
|
||||||
|
size = 12;
|
||||||
|
};
|
||||||
|
|
||||||
|
sessionVariables.GTK_THEME = "Adwaita-dark";
|
||||||
|
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
|
|
||||||
## Games
|
## Games
|
||||||
|
|
@ -61,7 +72,7 @@
|
||||||
ardour # Digital Audio Workstation
|
ardour # Digital Audio Workstation
|
||||||
|
|
||||||
## Image and Video playback and production
|
## Image and Video playback and production
|
||||||
obs-studio # Screen sharing
|
#obs-studio # Screen sharing
|
||||||
#inkscape # Vector image editing
|
#inkscape # Vector image editing
|
||||||
#shotcut # Video editing
|
#shotcut # Video editing
|
||||||
#blender # 3D modelling
|
#blender # 3D modelling
|
||||||
|
|
@ -73,9 +84,9 @@
|
||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
home-manager.enable = true; # Declarative dots
|
home-manager.enable = true; # Declarative dots
|
||||||
|
droidcam.enable = true; # Use smartphone as webcam
|
||||||
firefox.enable = true; # Browser of choice
|
firefox.enable = true; # Browser of choice
|
||||||
|
nheko.enable = true; # Matrix client for qt kitties
|
||||||
neovim = { # Zoomer text editor
|
neovim = { # Zoomer text editor
|
||||||
enable = true;
|
enable = true;
|
||||||
defaultEditor = true; # Default but keeping micro around
|
defaultEditor = true; # Default but keeping micro around
|
||||||
|
|
@ -84,27 +95,19 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
services = {
|
services = {
|
||||||
|
|
||||||
kdeconnect = { # Mobile <-> Desktop interaction
|
kdeconnect = { # Mobile <-> Desktop interaction
|
||||||
enable = true;
|
enable = true;
|
||||||
indicator = true;
|
indicator = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
gnome-keyring = { # GTK keyring for login/sudo/ssh/gpg prompts
|
gnome-keyring = { # GTK keyring for login/sudo/ssh/gpg prompts
|
||||||
enable = true;
|
enable = true;
|
||||||
#components = [ ];
|
#components = [ ];
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
home.pointerCursor = {
|
home = {
|
||||||
gtk.enable = true;
|
|
||||||
package = pkgs.bibata-cursors;
|
|
||||||
name = "Bibata-Modern-Classic";
|
|
||||||
size = 12;
|
|
||||||
};
|
|
||||||
|
|
||||||
home.sessionVariables.GTK_THEME = "Adwaita-dark";
|
};
|
||||||
|
|
||||||
qt = {
|
qt = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
@ -140,7 +143,6 @@
|
||||||
gtk-application-prefer-dark-theme=1
|
gtk-application-prefer-dark-theme=1
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
dconf = {
|
dconf = {
|
||||||
|
|
|
||||||
16
home/common/obs-studio.nix
Normal file
16
home/common/obs-studio.nix
Normal file
|
|
@ -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
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -24,8 +24,28 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
|
|
||||||
## For when bimbo needs to play with platters and cbf to deal with cli
|
## For when bimbo needs to play with platters and cbf to deal with cli
|
||||||
gnome-disks.enable = true;
|
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; [
|
home.packages = with pkgs; [
|
||||||
|
|
@ -55,6 +75,7 @@
|
||||||
gnome-power-manager # GUI power and battery stats
|
gnome-power-manager # GUI power and battery stats
|
||||||
gnome-calculator # GTK calculator
|
gnome-calculator # GTK calculator
|
||||||
gnome-calendar # GTK calendar
|
gnome-calendar # GTK calendar
|
||||||
|
gsmartcontrol # GUI for smartctl (smartmontools)
|
||||||
pavucontrol # Volume control centre
|
pavucontrol # Volume control centre
|
||||||
hyprpicker # Colour picker
|
hyprpicker # Colour picker
|
||||||
hyprcursor # Cursor, duh
|
hyprcursor # Cursor, duh
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
graphics = {
|
graphics = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enable32Bit = true;
|
enable32Bit = false;
|
||||||
|
|
||||||
## Packages for the iGPU inside Hades
|
## Packages for the iGPU inside Hades
|
||||||
extraPackages = with pkgs; [
|
extraPackages = with pkgs; [
|
||||||
|
|
@ -38,16 +38,16 @@
|
||||||
## Packages for the dGPU inside Hades
|
## Packages for the dGPU inside Hades
|
||||||
amdgpu = {
|
amdgpu = {
|
||||||
initrd.enable = true;
|
initrd.enable = true;
|
||||||
#opencl.enable = true;
|
opencl.enable = true;
|
||||||
## Vulkan packages for the dGPU inside Hades
|
## Vulkan packages for the dGPU inside Hades
|
||||||
#amdvlk = {
|
amdvlk = {
|
||||||
#enable = false;
|
enable = false;
|
||||||
#package = [ ];
|
#package = [ ];
|
||||||
#support32Bit.enable = true;
|
support32Bit.enable = false;
|
||||||
#supportExperimental.enable = true;
|
supportExperimental.enable = false;
|
||||||
#settings = {
|
#settings = {
|
||||||
#};
|
#};
|
||||||
#};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
@ -56,19 +56,19 @@
|
||||||
|
|
||||||
## For tweaking system performance
|
## For tweaking system performance
|
||||||
corectrl = {
|
corectrl = {
|
||||||
enable = false;
|
enable = true;
|
||||||
## Allows tweaking GPU performance
|
## Allows tweaking GPU performance
|
||||||
gpuOverclock = {
|
gpuOverclock = {
|
||||||
enable = false;
|
enable = true;
|
||||||
## Needed for radeon GPU overclocking
|
## Needed for radeon GPU overclocking
|
||||||
#ppfeaturemask = "0xfffd7fff";
|
ppfeaturemask = "0xfffd7fff";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
## Performance tweaking continued
|
## Performance tweaking continued
|
||||||
tuxclocker = {
|
tuxclocker = {
|
||||||
enable = false;
|
enable = false;
|
||||||
#enableAMD = true;
|
enableAMD = true;
|
||||||
#useUnfree = true;
|
useUnfree = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
@ -77,11 +77,11 @@
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
#umr
|
#umr
|
||||||
lact
|
lact
|
||||||
#radeontop
|
radeontop
|
||||||
#amdgpu_top
|
#amdgpu_top
|
||||||
#radeontools
|
#radeontools
|
||||||
#radeon-profile
|
#radeon-profile
|
||||||
#nvtopPackages.amd
|
nvtopPackages.amd
|
||||||
];
|
];
|
||||||
|
|
||||||
systemd = {
|
systemd = {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue