From c11bd2e632306dfbd53fcf846670c538c933e467 Mon Sep 17 00:00:00 2001
From: iiogama <iiogama@0x212.org>
Date: Fri, 12 Jan 2024 21:49:00 -0800
Subject: [PATCH] Removed cage, sticking with river for my compositor.  Added
 some vim plugins, made various QoL changes, and added auto-start gui
 applications to river/init

---
 home-manager/all.nix         |  5 +++--
 home-manager/cli.nix         |  2 ++
 home-manager/dots/bash_login |  6 +++---
 home-manager/dots/river/init | 11 +++++++++--
 nixos/office.nix             |  1 +
 nixos/wayland.nix            |  9 ---------
 6 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/home-manager/all.nix b/home-manager/all.nix
index ff8a9f1..d74bcef 100644
--- a/home-manager/all.nix
+++ b/home-manager/all.nix
@@ -59,8 +59,8 @@
       set relativenumber
       set splitbelow
       set splitright
-      set tabstop=2
-      set shiftwidth=2
+      set tabstop=4
+      set shiftwidth=4
       if filereadable(expand(".vim-project"))
         source .vim-project
       endif
@@ -146,6 +146,7 @@
     mouse = false;
     newSession = false;
     prefix = "C-b";
+    terminal = "screen-256color";
     extraConfig = ''
       # Do not rename windows automatically
       set-option -g allow-rename off
diff --git a/home-manager/cli.nix b/home-manager/cli.nix
index bd49cec..c615d63 100644
--- a/home-manager/cli.nix
+++ b/home-manager/cli.nix
@@ -44,8 +44,10 @@
         dracula-nvim
         goyo-vim
         limelight-vim
+        twilight-nvim
         vim-nix
         vimwiki
+        zen-mode-nvim
       ];
     };
     yt-dlp = {
diff --git a/home-manager/dots/bash_login b/home-manager/dots/bash_login
index 215d7d3..99eac37 100644
--- a/home-manager/dots/bash_login
+++ b/home-manager/dots/bash_login
@@ -1,4 +1,4 @@
 [[ -f ~/.bashrc ]] && . ~/.bashrc
-#if [ -z "$DISPLAY" ] && [ "$XDG_VTNR" -eq 1 ]; then 
-#	exec river
-#fi
+if [ -z "$DISPLAY" ] && [ "$XDG_VTNR" -eq 1 ]; then 
+	exec river
+fi
diff --git a/home-manager/dots/river/init b/home-manager/dots/river/init
index e93dac8..b54303c 100755
--- a/home-manager/dots/river/init
+++ b/home-manager/dots/river/init
@@ -8,9 +8,14 @@ riverctl spawn "swww init"
 riverctl spawn "swww img $HOME/Pictures/wallpapers/bliss-night.png --transition-type simple"
 riverctl spawn "wl-paste --type text --watch cliphist store"
 riverctl spawn "wl-paste --type image --watch cliphist store"
-riverctl spawn "nm-applet"
-riverctl spawn "mullvad-gui"
 riverctl spawn "mako"
+riverctl spawn "mullvad-gui"
+riverctl spawn "mullvad-browser"
+riverctl spawn "librewolf"
+riverctl spawn "thunderbird"
+riverctl spawn "steam"
+riverctl spawn "discord"
+riverctl spawn "signal-desktop"
 
 # Theme
 riverctl background-color 0x282a36
@@ -27,6 +32,8 @@ riverctl map normal Super H focus-view previous
 riverctl map normal Super J focus-view next
 riverctl map normal Super K focus-view previous
 riverctl map normal Super L focus-view next
+riverctl map normal Alt Tab focus-view next
+riverctl map normal Alt+Shift Tab focus-view previous
 riverctl map normal Super Tab focus-output next
 riverctl map normal Super Bracketright focus-output next
 riverctl map normal Super Bracketleft focus-output previous
diff --git a/nixos/office.nix b/nixos/office.nix
index 5c6cbbf..791ed5e 100644
--- a/nixos/office.nix
+++ b/nixos/office.nix
@@ -4,6 +4,7 @@
   users.users.${user.name}.packages = with pkgs; [
     ledger
     libreoffice
+    obsidian
     pandoc
     pdftk
     #sc-im
diff --git a/nixos/wayland.nix b/nixos/wayland.nix
index cf901a7..4ff833a 100644
--- a/nixos/wayland.nix
+++ b/nixos/wayland.nix
@@ -31,14 +31,6 @@
     fira-code-symbols
     dina-font
   ];
-  services.cage = {
-    enable = true;
-    extraArguments = [
-      "-m extend"
-    ];
-    program = "${pkgs.foot}/bin/foot";
-    user = "${user.name}";
-  };
   programs = {
     river = {
       enable = true;
@@ -58,7 +50,6 @@
   ];
   environment.systemPackages = with pkgs; [
     bemenu
-    cagebreak
     foot
     mako
     swaylock