terminal workspace setup + actually using unstable channel + top bar -> bottom bar & other quickshell adjustments

3 files changed, 35 insertions, 18 deletions

diff --git a/nixos/home.nix b/nixos/home.nix
index a18ac97..c0a7719 100644
--- a/nixos/home.nix
+++ b/nixos/home.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, username, ... }:
+{ config, pkgs, username, terminalworkspace, ... }:
 {
   users.users.${username} = {
     isNormalUser = true;
@@ -19,18 +19,33 @@ function fish_prompt -d "Write out the prompt"
     printf '%s@%s %s%s%s > ' $USER $hostname \
         (set_color $fish_color_cwd) (prompt_pwd) (set_color normal)
 end
+'' + (if terminalworkspace.tmux then ''
+if status is-interactive
+    set fish_greeting
 
-# if status is-interactive
-#     set fish_greeting
-#
-#     if not set -q TMUX
-#         tmux new-session -d -s "main" -c "~/dev"
-#         if not set -q VSCODE_PID
-#             tmux -u a
-#         end
-#     end
-# end
+    if not set -q TMUX
+        tmux new-session -d -s "main" -c "~/dev"
+        if not set -q VSCODE_PID
+            tmux -u a
+        end
+    end
+end
+'' else '''') + (if terminalworkspace.zellij then ''
+if status is-interactive
+    set fish_greeting
+
+    if status is-interactive
+    set fish_greeting
 
+    if not set -q ZELLIJ
+        if not set -q VSCODE_PID
+            cd ~/dev
+            zellij attach --create main
+        end
+    end
+end
+end
+'' else '''') + ''
 function tsnode
     set filename (basename $argv[1] .ts)
     tsc $filename.ts
@@ -53,6 +68,7 @@ alias find="fd"
 alias cloc="tokei"
 alias scrcpy="scrcpy --render-driver=opengl"
 alias wisdom="fortune ~/.config/fortune/showerthoughts | cowsay | lolcat"
+alias search="rg --color=always --line-number --no-heading \"\" | fzf --ansi --phony --query \"\" --bind \"change:reload(rg --color=always --line-number --no-heading {q} || true)\""
 function mkcd
     mkdir -p $argv[1]
     cd $argv[1]
@@ -69,11 +85,8 @@ set -U fish_user_paths $HOME/.bin $fish_user_paths
 set ANDROID_NDK_HOME /opt/android-ndk
 set ANDROID_NDK_ROOT /opt/android-ndk
 set ANDROID_HOME /opt/android-sdk
-    '';
+'';
   };
-  # programs.nushell = {
-  #   enable = true;
-  # };
   environment.systemPackages = with pkgs; [
     nushell
     home-manager
diff --git a/nixos/opt/nvidia.nix b/nixos/opt/nvidia.nix
index 63db5b2..5bfe45e 100644
--- a/nixos/opt/nvidia.nix
+++ b/nixos/opt/nvidia.nix
@@ -5,8 +5,12 @@
     modesetting.enable = true;
     package = config.boot.kernelPackages.nvidiaPackages.stable;
     nvidiaSettings = true;
-    open = true;
+    open = false;
   };
+  hardware.graphics.enable32Bit = true;
+  hardware.graphics.extraPackages = with pkgs; [
+    nvidia-vaapi-driver
+  ];
   boot.kernelParams = [ "acpi_backlight=video" ];
   boot.initrd.kernelModules = [ "nvidia" "hp_wmi" ];
   services.xserver.videoDrivers = [ "nvidia" ];
diff --git a/nixos/terminal_workspace/zellij.nix b/nixos/terminal_workspace/zellij.nix
index 549fe9f..be0c884 100644
--- a/nixos/terminal_workspace/zellij.nix
+++ b/nixos/terminal_workspace/zellij.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, pkgs, unstable, ... }:
 {
   environment.systemPackages = with pkgs; [
-    zellij
+    unstable.zellij
   ];
 }