From 4e8618065288d19933eaff1c43fa5b2b4b1d2ce4 Mon Sep 17 00:00:00 2001
From: tristan <tristan@tristans.cloud>
Date: Sat, 6 Jan 2024 06:30:00 +0000
Subject: [PATCH] move games to home config

+ a few tweaks
---
 home/programs/gamer.nix          | 27 +++++++++++++++++++++++++++
 home/programs/neovim/default.nix | 11 +++++------
 home/programs/shell.nix          | 10 ++++++----
 nixos/modules/gamer.nix          | 30 +-----------------------------
 4 files changed, 39 insertions(+), 39 deletions(-)
 create mode 100644 home/programs/gamer.nix

diff --git a/home/programs/gamer.nix b/home/programs/gamer.nix
new file mode 100644
index 0000000..6571326
--- /dev/null
+++ b/home/programs/gamer.nix
@@ -0,0 +1,27 @@
+{pkgs, ...}: {
+  home.packages = with pkgs; [
+    # Games
+    airshipper
+    minetest
+    superTuxKart
+    xonotic
+
+    # Helpers
+    heroic
+    BeatSaberModManager
+    protontricks
+    protonup-qt
+    oversteer
+
+    # vr
+    monado
+    openxr-loader
+    opencomposite
+
+    (makeDesktopItem {
+      name = "x11steam";
+      desktopName = "X11 Steam Wrapper";
+      exec = "QT_QPA_PLATFORM=xcb SDL_VIDEODRIVER=x11 ${steam}/bin/steam";
+    })
+  ];
+}
diff --git a/home/programs/neovim/default.nix b/home/programs/neovim/default.nix
index 6bab72b..2967043 100644
--- a/home/programs/neovim/default.nix
+++ b/home/programs/neovim/default.nix
@@ -1,9 +1,4 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
+{pkgs, ...}: {
   programs.neovim = {
     enable = true;
     defaultEditor = true;
@@ -48,4 +43,8 @@
       };
     };
   };
+
+  home.shellAliases = {
+    v = "nvim .";
+  };
 }
diff --git a/home/programs/shell.nix b/home/programs/shell.nix
index 85993d7..d3ecb3c 100644
--- a/home/programs/shell.nix
+++ b/home/programs/shell.nix
@@ -1,5 +1,8 @@
-{pkgs, config, ...}: {
-
+{
+  pkgs,
+  config,
+  ...
+}: {
   programs.starship.enable = true;
   programs.zsh = {
     enable = true;
@@ -13,6 +16,7 @@
     completionInit = ''
       autoload -U compinit && compinit
       zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}'
+      zstyle ':completion:*' menu select
     '';
     historySubstringSearch = {
       enable = true;
@@ -24,6 +28,4 @@
   home.shellAliases = {
     rm = "${pkgs.trash-cli}/bin/trash-put";
   };
-
-
 }
diff --git a/nixos/modules/gamer.nix b/nixos/modules/gamer.nix
index 8a872ab..d7d0286 100644
--- a/nixos/modules/gamer.nix
+++ b/nixos/modules/gamer.nix
@@ -15,35 +15,7 @@ with lib; {
       "electron-25.9.0"
     ];
 
-    home-manager.users.${user}.imports = [
-      {
-        home.packages = with pkgs; [
-          # Games
-          airshipper
-          minetest
-          superTuxKart
-          xonotic
-
-          # Helpers
-          heroic
-          BeatSaberModManager
-          protontricks
-          protonup-qt
-          oversteer
-
-          # vr
-          monado
-          openxr-loader
-          opencomposite
-
-          (makeDesktopItem {
-            name = "x11steam";
-            desktopName = "X11 Steam Wrapper";
-            exec = "QT_QPA_PLATFORM=xcb SDL_VIDEODRIVER=x11 ${steam}/bin/steam";
-          })
-        ];
-      }
-    ];
+    home-manager.users.${user}.imports = [ ../../home/programs/gamer.nix ];
 
     nixpkgs.config.allowUnfreePredicate = pkg:
       builtins.elem (lib.getName pkg) [