From 473362b5f8e1fa8542ec4fcfc91874804d8d2da7 Mon Sep 17 00:00:00 2001 From: reidlab Date: Wed, 18 Dec 2024 16:55:30 -0800 Subject: [PATCH] move some things around --- README.md | 2 +- hosts/goopnet-interface/default.nix | 4 ++-- modules/desktop/hyprland.nix | 5 +++++ modules/software/distractions/gamemode.nix | 26 ++++++++++++++++++++++ modules/software/distractions/steam.nix | 23 ------------------- modules/software/{tools => system}/mpv.nix | 4 ++-- modules/software/tools/noisetorch.nix | 14 ------------ 7 files changed, 36 insertions(+), 42 deletions(-) create mode 100644 modules/software/distractions/gamemode.nix rename modules/software/{tools => system}/mpv.nix (85%) delete mode 100644 modules/software/tools/noisetorch.nix diff --git a/README.md b/README.md index bb16951..e372900 100755 --- a/README.md +++ b/README.md @@ -18,10 +18,10 @@ each host should have these files: ## todo - multi architecture configuration ([nix-systems](https://github.com/nix-systems/nix-systems)?) - - divide steam and gamemode? - hidpi option ? mostly auto these days though - better theming for hyprlock, rofi, dunst (accent for hyprlock & dunst, variants for rofi) - some way for border radius, border, tranparency theme options - tags for pip and popups in hyprland config - make wl-clip-persist, polkit agent, and networkmanager applet systemd services? - gtk cursors are MESSED UP. top priority rn + - niri.. yum diff --git a/hosts/goopnet-interface/default.nix b/hosts/goopnet-interface/default.nix index d18264d..c367a67 100755 --- a/hosts/goopnet-interface/default.nix +++ b/hosts/goopnet-interface/default.nix @@ -76,6 +76,7 @@ system.fish.enable = true; system.syncthing.enable = true; system.flatpak.enable = true; + system.mpv.enable = true; # editors editors.micro.enable = true; editors.vscode.enable = true; @@ -84,12 +85,11 @@ # distractions distractions.discord.enable = true; distractions.discord.vesktop = true; + distractions.gamemode.enable = true; distractions.steam.enable = true; # tools tools.gpg.enable = true; - tools.mpv.enable = true; tools.rbw.enable = true; - tools.noisetorch.enable = true; }; }; } diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix index a5f2a45..3b7fcb1 100644 --- a/modules/desktop/hyprland.nix +++ b/modules/desktop/hyprland.nix @@ -137,6 +137,11 @@ in { "$mod, right, movefocus, r" "$mod, up, movefocus, u" "$mod, down, movefocus, d" + # move windows with mod + shift + arrow keys + "$mod SHIFT, left, movewindow, l" + "$mod SHIFT, right, movewindow, r" + "$mod SHIFT, up, movewindow, u" + "$mod SHIFT, down, movewindow, d" # example special workspace (scratchpad) "$mod, grave, togglespecialworkspace, magic" diff --git a/modules/software/distractions/gamemode.nix b/modules/software/distractions/gamemode.nix new file mode 100644 index 0000000..93ca2d6 --- /dev/null +++ b/modules/software/distractions/gamemode.nix @@ -0,0 +1,26 @@ +{ lib, config, pkgs, ... }: + +with lib; +let + cfg = config.modules.software.distractions.gamemode; +in { + options.modules.software.distractions.gamemode = { + enable = mkEnableOption "Enable Gamemode, a program to optimize your system performance on demand"; + }; + + config = mkIf cfg.enable { + # optimize linux system performance on demand + # https://github.com/FeralInteractive/gamemode + user.extraGroups = [ "gamemode" ]; + programs.gamemode = { + enable = true; + enableRenice = true; + settings = { + general = { + softrealtime = "auto"; + renice = 10; + }; + }; + }; + }; +} diff --git a/modules/software/distractions/steam.nix b/modules/software/distractions/steam.nix index 9164f6c..c0bacdd 100644 --- a/modules/software/distractions/steam.nix +++ b/modules/software/distractions/steam.nix @@ -11,29 +11,6 @@ in { config = mkIf cfg.enable { programs.steam.enable = true; - # optimize linux system performance on demand - # https://github.com/FeralInteractive/gamemode - user.extraGroups = [ "gamemode" ]; - programs.gamemode = { - enable = true; - enableRenice = true; - settings = { - custom = { - start = "${pkgs.libnotify}/bin/notify-send --app-name GameMode 'GameMode started'"; - end = "${pkgs.libnotify}/bin/notify-send --app-name GameMode 'GameMode ended'"; - }; - }; - }; - - programs.gamescope = { - enable = true; - capSysNice = true; - }; - programs.steam.gamescopeSession = { - enable = true; - args = [ "-W 1920" "-H 1080" "-r 60" "--expose-wayland" "-e" ]; - }; - user.packages = [ pkgs.protontricks pkgs.steam-run ]; }; } diff --git a/modules/software/tools/mpv.nix b/modules/software/system/mpv.nix similarity index 85% rename from modules/software/tools/mpv.nix rename to modules/software/system/mpv.nix index ee45fc7..53bb6b3 100644 --- a/modules/software/tools/mpv.nix +++ b/modules/software/system/mpv.nix @@ -2,9 +2,9 @@ with lib; let - cfg = config.modules.software.tools.mpv; + cfg = config.modules.software.system.mpv; in { - options.modules.software.tools.mpv = { + options.modules.software.system.mpv = { enable = mkEnableOption "Enable mpv, a lightweight video player"; }; diff --git a/modules/software/tools/noisetorch.nix b/modules/software/tools/noisetorch.nix deleted file mode 100644 index 4479532..0000000 --- a/modules/software/tools/noisetorch.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ config, lib, ... }: - -with lib; -let - cfg = config.modules.software.tools.noisetorch; -in { - options.modules.software.tools.noisetorch = { - enable = mkEnableOption "Enable noisetorch, a microphone noise supression tool"; - }; - - config = mkIf cfg.enable { - programs.noisetorch.enable = true; - }; -}