From 065a36324238ce27539da42b7052afa450f6fbc9 Mon Sep 17 00:00:00 2001 From: Javier Feliz Date: Sat, 16 Aug 2025 02:01:46 -0400 Subject: [PATCH] More bangers --- flake.nix | 1 + hosts/desktop/default.nix | 2 +- modules/home/common/fzf.nix | 7 +++++++ modules/home/common/kitty.nix | 1 - modules/home/common/shell.nix | 5 ----- modules/home/home.nix | 2 +- modules/system/gaming.nix | 11 +++++++++++ modules/system/nix-valet.nix | 12 ++++++++++++ 8 files changed, 33 insertions(+), 8 deletions(-) create mode 100644 modules/home/common/fzf.nix create mode 100644 modules/system/gaming.nix diff --git a/flake.nix b/flake.nix index 0f6620a..50b4d66 100755 --- a/flake.nix +++ b/flake.nix @@ -71,6 +71,7 @@ ./modules/system/nvidia.nix ./modules/system/nfs.nix ./modules/system/display-manager/sddm.nix + ./modules/system/gaming.nix ]; laptop = mkHost "laptop" [ diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix index 141fe8d..ac5d188 100755 --- a/hosts/desktop/default.nix +++ b/hosts/desktop/default.nix @@ -9,7 +9,7 @@ { imports = [ ../common-config.nix - ../../modules/system/nix-valet.nix + # ../../modules/system/nix-valet.nix ../../modules/system/device-management/logitech.nix ./hardware-configuration.nix ]; diff --git a/modules/home/common/fzf.nix b/modules/home/common/fzf.nix new file mode 100644 index 0000000..34591b6 --- /dev/null +++ b/modules/home/common/fzf.nix @@ -0,0 +1,7 @@ +{ ... }: +{ + programs.fzf = { + enable = true; + enableZshIntegration = true; + }; +} diff --git a/modules/home/common/kitty.nix b/modules/home/common/kitty.nix index 664095a..8fcf075 100644 --- a/modules/home/common/kitty.nix +++ b/modules/home/common/kitty.nix @@ -14,7 +14,6 @@ let hide_window_decorations yes map ctrl+shift+t new_tab_with_cwd - map ctrl+r send_text all \x15shellhistory\r ''; in { diff --git a/modules/home/common/shell.nix b/modules/home/common/shell.nix index 9d628b6..5769a0d 100755 --- a/modules/home/common/shell.nix +++ b/modules/home/common/shell.nix @@ -64,11 +64,6 @@ # Additional bash configuration initContent = '' - function shellhistory() { - cmd=$(cat .zsh_history | grep -E ^: | sed "s/^: //" | sed "s|:0;| |" | sort --reverse | uniq | awk '{print substr($0, index($0, $2))}' | fzf) - eval "$cmd" - } - function pape() { hyprctl hyprpaper preload $1 hyprctl hyprpaper wallpaper ", $1" diff --git a/modules/home/home.nix b/modules/home/home.nix index 2b5f898..c67fca5 100755 --- a/modules/home/home.nix +++ b/modules/home/home.nix @@ -13,6 +13,7 @@ ./common/shell.nix ./common/starship.nix ./common/yazi.nix + ./common/fzf.nix ./hyprland ]; @@ -36,7 +37,6 @@ # Terminal tools ripgrep - fzf bat eza jq diff --git a/modules/system/gaming.nix b/modules/system/gaming.nix new file mode 100644 index 0000000..433687f --- /dev/null +++ b/modules/system/gaming.nix @@ -0,0 +1,11 @@ +{ ... }: + +{ + # Install Steam + programs.steam = { + enable = true; + remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play + dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server + localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers + }; +} diff --git a/modules/system/nix-valet.nix b/modules/system/nix-valet.nix index 324735c..ac30fed 100644 --- a/modules/system/nix-valet.nix +++ b/modules/system/nix-valet.nix @@ -11,7 +11,18 @@ lib, ... }: +let + customCaddy = pkgs.xcaddy { + pname = "caddy-frankenphp"; + version = "2.7.6"; + subPackages = [ "cmd/caddy" ]; + + plugins = [ + "github.com/dunglas/frankenphp/caddy" + ]; + }; +in { services = { # Enable dnsmasq @@ -58,6 +69,7 @@ # Enable Caddy caddy = { enable = true; + package = customCaddy; globalConfig = '' auto_https off frankenphp