From 498caa457880004d95931b4d5a02145d09935fe0 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Thu, 13 Jun 2024 18:46:59 -0500
Subject: [PATCH] Fish formatting and ls aliases

---
 modules/home-manager/fish.nix            | 13 +++++++------
 modules/home-manager/fish/shellInit.fish | 23 +++++++++++++----------
 nixos/dragon.nix                         |  9 ++++++---
 3 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/modules/home-manager/fish.nix b/modules/home-manager/fish.nix
index b6dc153..c889e31 100644
--- a/modules/home-manager/fish.nix
+++ b/modules/home-manager/fish.nix
@@ -47,13 +47,14 @@
     };
     shellAbbrs = {};
     shellAliases = {
-      l = "br";
       ls = "eza --group-directories-first --classify";
-      la = "eza -la --group-directories-first --classify";
-      lA = "eza -la --all --group-directories-first --classify";
-      tree = "eza --tree --level=3";
-      lt = "eza -l --sort=modified";
-      lat = "eza -la --sort=modified";
+      l = "ls";
+      ll = "ls --long --group";
+      la = "ll --all";
+      lA = "la --all"; # --all twice to show . and ..
+      tree = "ls --tree --level=3";
+      lt = "ll --sort=modified";
+      lat = "la --sort=modified";
       lc = "lt --sort=accessed";
       lT = "lt --reverse";
       lC = "lc --reverse";
diff --git a/modules/home-manager/fish/shellInit.fish b/modules/home-manager/fish/shellInit.fish
index 9975684..4b5ffc0 100644
--- a/modules/home-manager/fish/shellInit.fish
+++ b/modules/home-manager/fish/shellInit.fish
@@ -1,10 +1,10 @@
 # paths
 if not set --query NICE_HOME
-	set --export --universal NICE_HOME $HOME
+    set --export --universal NICE_HOME $HOME
 
-	# if HOME ends with a dir called .home, assume that NICE_HOME is HOME's parent dir
-	test (basename $HOME) = .home \
-		&& set --export --universal NICE_HOME (realpath $HOME/..)
+    # if HOME ends with a dir called .home, assume that NICE_HOME is HOME's parent dir
+    test (basename $HOME) = .home \
+        && set --export --universal NICE_HOME (realpath $HOME/..)
 end
 
 set --export --universal XDG_CONFIG_HOME $HOME/.config
@@ -38,8 +38,8 @@ set --export --universal BROWSER firefox
 set --export --universal SOPS_AGE_KEY_FILE "$XDG_CONFIG_HOME/sops/age/keys.txt"
 
 if has_command skim
-	set --export --universal SKIM_ALT_C_COMMAND "fd --hidden --type directory"
-	set --export --universal SKIM_CTRL_T_COMMAND "fd --hidden"
+    set --export --universal SKIM_ALT_C_COMMAND "fd --hidden --type directory"
+    set --export --universal SKIM_CTRL_T_COMMAND "fd --hidden"
 end
 
 # colors
@@ -67,17 +67,20 @@ set -U fish_pager_color_progress white\x1e\x2d\x2dbackground\x3d333 # status ind
 # set -U fish_pager_color_secondary \x2d\x2dbackground\x3d181818 # alternating rows
 
 if test -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.fish'
-	source '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.fish'
+    source '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.fish'
 end
 
 function has_command --wraps=command --description "Exits non-zero if the given command cannot be found"
-	command --quiet --search $argv[1]
+    command --quiet --search $argv[1]
 end
 
 if has_command rtx
-	rtx activate fish | source
+    rtx activate fish | source
 end
 
 for dir in ~/.cargo/bin ~/.nimble/bin ~/.local/bin /opt/homebrew/bin
-	test -d $dir && fish_add_path $dir
+    test -d $dir && fish_add_path $dir
 end
+
+# don't let other users read my files by default
+umask 077
diff --git a/nixos/dragon.nix b/nixos/dragon.nix
index ad94f57..8b48764 100644
--- a/nixos/dragon.nix
+++ b/nixos/dragon.nix
@@ -149,11 +149,14 @@
   powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
 
   networking = {
-    firewall = {
+    firewall = let
+      terraria = 7777;
+      stardew-valley = 24642;
+    in {
       enable = true;
       allowPing = true;
-      allowedTCPPorts = [22 7777];
-      allowedUDPPorts = [];
+      allowedTCPPorts = [22 terraria stardew-valley];
+      allowedUDPPorts = [terraria stardew-valley];
     };
   };