13 files changed, 61 insertions, 35 deletions
diff --git a/home/ebisu/fortune/default.nix b/home/ebisu/fortune/default.nix
index dfff660..e12e633 100644
--- a/home/ebisu/fortune/default.nix
+++ b/home/ebisu/fortune/default.nix
@@ -7,13 +7,13 @@
     ./editor
     ./education
     ./filesystem
-    # ./gaming
     ./multimedia
     ./network
     ./rice
     ./scripts
     ./system
     ./utility
+    # ./gaming.nix
     ./language.nix
   ];
 }
diff --git a/home/ebisu/fortune/development/nix/default.nix b/home/ebisu/fortune/development/nix/default.nix
index 954dd97..edb0c4a 100644
--- a/home/ebisu/fortune/development/nix/default.nix
+++ b/home/ebisu/fortune/development/nix/default.nix
@@ -30,5 +30,6 @@
     manix
     niv
     nix-diff
+    nix-fast-build
   ];
 }
diff --git a/home/ebisu/fortune/development/tools/git.nix b/home/ebisu/fortune/development/tools/git.nix
index ebf6d4c..eb4bb42 100644
--- a/home/ebisu/fortune/development/tools/git.nix
+++ b/home/ebisu/fortune/development/tools/git.nix
@@ -7,5 +7,6 @@
     gitoxide
     (callPackage ../../../../../pkgs/git-sumi.nix { })
     git-crypt
+    git-lfs
   ];
 }
diff --git a/home/ebisu/fortune/filesystem/archive.nix b/home/ebisu/fortune/filesystem/archive.nix
index cb16eff..c87b222 100644
--- a/home/ebisu/fortune/filesystem/archive.nix
+++ b/home/ebisu/fortune/filesystem/archive.nix
@@ -5,5 +5,6 @@
     xar
     pigz
     unzip
+    zip
   ];
 }
diff --git a/home/ebisu/fortune/gaming.nix b/home/ebisu/fortune/gaming.nix
new file mode 100644
index 0000000..5501fcd
--- /dev/null
+++ b/home/ebisu/fortune/gaming.nix
@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    # lutris
+    # xivlauncher
+    # ttyper
+    # runelite
+    # sidequest
+    steam-tui
+  ];
+}
diff --git a/home/ebisu/fortune/gaming/default.nix b/home/ebisu/fortune/gaming/default.nix
deleted file mode 100644
index bf0d842..0000000
--- a/home/ebisu/fortune/gaming/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ pkgs, ... }:
-{
-  imports = [ ./steam.nix ];
-
-  programs.gamemode = {
-    enable = true;
-    enableRenice = false;
-  };
-
-  home.packages = with pkgs; [
-    lutris
-    gamescope
-    # xivlauncher
-    mangohud
-    ttyper
-    runelite
-    sidequest
-  ];
-}
diff --git a/home/ebisu/fortune/gaming/steam.nix b/home/ebisu/fortune/gaming/steam.nix
deleted file mode 100644
index 1d8595f..0000000
--- a/home/ebisu/fortune/gaming/steam.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ pkgs, ... }:
-{
-  # programs.steam.enable = true;
-  home.packages = [ pkgs.steam-tui ];
-}
diff --git a/home/ebisu/fortune/network/tools/default.nix b/home/ebisu/fortune/network/tools/default.nix
index ad475a8..6b32efc 100644
--- a/home/ebisu/fortune/network/tools/default.nix
+++ b/home/ebisu/fortune/network/tools/default.nix
@@ -20,5 +20,6 @@
     tcpdump
     (pkgs.callPackage ../../../../../pkgs/bindtointerface.nix { })
     trayscale
+    nmap
   ];
 }
diff --git a/home/ebisu/fortune/scripts/scripts/neovide-lunarvim b/home/ebisu/fortune/scripts/scripts/neovide-lunarvim
index 7faffd2..dd9abcd 100644
--- a/home/ebisu/fortune/scripts/scripts/neovide-lunarvim
+++ b/home/ebisu/fortune/scripts/scripts/neovide-lunarvim
@@ -1,7 +1,8 @@
 # https://aur.archlinux.org/cgit/aur.git/tree/script.sh?h=neovide-lunarvim
 
-export LUNARVIM_CONFIG_DIR="${LUNARVIM_CONFIG_DIR:-$HOME/.config/lvim}"
-export LUNARVIM_RUNTIME_DIR="${LUNARVIM_RUNTIME_DIR:-$HOME/.local/share/lunarvim}"
-export LUNARVIM_CACHE_DIR="${LUNARVIM_CACHE_DIR:-$HOME/.cache/lvim}"
+export LUNARVIM_RUNTIME_DIR="${LUNARVIM_RUNTIME_DIR:-"$HOME/.local/share/lunarvim"}"
+export LUNARVIM_CONFIG_DIR="${LUNARVIM_CONFIG_DIR:-"$HOME/.config/lvim"}"
+export LUNARVIM_CACHE_DIR="${LUNARVIM_CACHE_DIR:-"$HOME/.cache/lvim"}"
+export LUNARVIM_BASE_DIR="${LUNARVIM_BASE_DIR:-"$HOME/.local/share/lunarvim/lvim"}"
 
 exec neovide -- -u "$LUNARVIM_RUNTIME_DIR/lvim/init.lua" "$@"
diff --git a/justfile b/justfile
index dc86168..b38e3a3 100644
--- a/justfile
+++ b/justfile
@@ -4,6 +4,7 @@ default:
 os hostname='kansai':
   #!/usr/bin/env sh
 
+
   if command -v doas &> /dev/null; then
     SUPERUSER_COMMAND=doas
   else
@@ -13,7 +14,7 @@ os hostname='kansai':
   if ! command -v nh &> /dev/null; then
     $SUPERUSER_COMMAND nixos-rebuild switch --flake .#{{hostname}}
   else
-    FLAKE="$(pwd)" nh home switch -- --impure
+    FLAKE="$(pwd)" nh os switch
   fi
 
 home user='ebisu':
diff --git a/modules/hardware/bluetooth.nix b/modules/hardware/bluetooth.nix
index 8400a72..8a6afaa 100644
--- a/modules/hardware/bluetooth.nix
+++ b/modules/hardware/bluetooth.nix
@@ -8,12 +8,11 @@
     package = pkgs.bluez5-experimental;
     disabledPlugins = [ "sap" ];
 
-    settings = {
-      General = {
-        JustWorksRepairing = "always";
-        MultiProfile = "multiple";
-        Experimental = true;
-      };
+    settings.General = {
+      JustWorksRepairing = "always";
+      MultiProfile = "multiple";
+      Experimental = true;
+      Enable = "Source,Sink,Media,Socket";
     };
   };
 }
diff --git a/modules/system/default.nix b/modules/system/default.nix
index cdef99d..d6f1656 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -6,6 +6,7 @@
     ./desktop
     ./networking
     ./services
+    # ./gaming.nix
     ./encryption.nix
     ./programs.nix
     ./systemd.nix
@@ -21,4 +22,11 @@
       enableNg = true;
     };
   };
+
+  environment.enableAllTerminfo = true;
+
+  console = {
+    earlySetup = true;
+    keyMap = "us";
+  };
 }
diff --git a/modules/system/gaming.nix b/modules/system/gaming.nix
new file mode 100644
index 0000000..790a94e
--- /dev/null
+++ b/modules/system/gaming.nix
@@ -0,0 +1,26 @@
+{ pkgs, ... }:
+let
+  openFirewall = false;
+in
+{
+  programs.steam = {
+    enable = true;
+    remotePlay.openFirewall = openFirewall;
+    localNetworkGameTransfers.openFirewall = openFirewall;
+    dedicatedServer.openFirewall = openFirewall;
+    extest.enable = true;
+
+    package = pkgs.steam.override { extraEnv.MANGOHUD = true; };
+  };
+
+  programs.gamemode = {
+    enable = true;
+    enableRenice = false;
+  };
+
+  environment.systemPackages = with pkgs; [
+    mangohud
+    gamescope
+    steamtinkerlaunch
+  ];
+}