xserber

5 files changed, 59 insertions, 6 deletions

diff --git a/home-configuration/config/niri/config.kdl b/home-configuration/config/niri/config.kdl
index 62e9793..f91c17f 100644
--- a/home-configuration/config/niri/config.kdl
+++ b/home-configuration/config/niri/config.kdl
@@ -235,7 +235,7 @@ binds {
     Mod+Shift+V { switch-focus-between-floating-and-tiling; }
 
     Mod+Shift+F { toggle-column-tabbed-display; }
-    Mod+F hotkey-overlay-title="Spawn file manager (caja)" { spawn-sh "XDG_DATA_DIRS=/etc/profiles/per-user/coast/share:/run/current-system/sw/share:$HOME/.nix-profile/share:$XDG_DATA_DIRS caja"; }
+    Mod+F hotkey-overlay-title="Spawn file manager (nautilus)" { spawn-sh "XDG_DATA_DIRS=/etc/profiles/per-user/coast/share:/run/current-system/sw/share:$HOME/.nix-profile/share:$XDG_DATA_DIRS nautilus"; }
     Print { screenshot; }
     Super+Shift+S { screenshot; }
     Control+Alt+S { screenshot-window; }
diff --git a/home-configuration/config/nvim/lazy-lock.json b/home-configuration/config/nvim/lazy-lock.json
index e4d83c3..3f016ea 100755
--- a/home-configuration/config/nvim/lazy-lock.json
+++ b/home-configuration/config/nvim/lazy-lock.json
@@ -8,7 +8,7 @@
   "cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" },
   "comfy-line-numbers.nvim": { "branch": "main", "commit": "9adedbaf1f410cdaacf4fb2ca8eb44f3d5f6d010" },
   "fterm.nvim": { "branch": "master", "commit": "d1320892cc2ebab472935242d9d992a2c9570180" },
-  "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
+  "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
   "lsp_signature.nvim": { "branch": "master", "commit": "b7ace9ddb1640ce266012a45a672dfdaedfa5ec6" },
   "lualine.nvim": { "branch": "master", "commit": "221ce6b2d999187044529f49da6554a92f740a96" },
   "mason.nvim": { "branch": "main", "commit": "16ba83bfc8a25f52bb545134f5bee082b195c460" },
diff --git a/home-configuration/default.nix b/home-configuration/default.nix
index 0c955db..3f33732 100644
--- a/home-configuration/default.nix
+++ b/home-configuration/default.nix
@@ -17,6 +17,7 @@ in
     ./managed/git
     ./managed/prismlauncher
     ./managed/obs-studio
+    ./managed/xserver
   ];
   home.username = "coast";
   home.homeDirectory = "/home/coast";
@@ -25,7 +26,6 @@ in
   xdg.configFile = builtins.mapAttrs
     (key: subpath: {
       source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/Configuration/home-configuration/config/${subpath}";
-      recursive = true;
     })
     configs;
 
@@ -61,7 +61,6 @@ in
     pkgs.nixpkgs-fmt
     pkgs.qbittorrent
     pkgs.nautilus
-    pkgs.caja
     pkgs.xray
     pkgs.git
     pkgs.gnumake
@@ -98,6 +97,7 @@ in
     pkgs.obs-cmd
     pkgs.gedit
     pkgs.feishin
+    pkgs.alsa-utils
     pkgs.gnome-themes-extra
   ];
 }
diff --git a/home-configuration/managed/prismlauncher/default.nix b/home-configuration/managed/prismlauncher/default.nix
index f31c610..8928bf1 100644
--- a/home-configuration/managed/prismlauncher/default.nix
+++ b/home-configuration/managed/prismlauncher/default.nix
@@ -1,10 +1,10 @@
 { lib, pkgs, ... }:
 let
   pname = "prismlauncher";
-  version = "11.0.2-1";
+  version = "11.0.3";
   src = pkgs.fetchurl {
     url = "https://github.com/Diegiwg/PrismLauncher-Cracked/releases/download/${version}/PrismLauncher-Linux-x86_64.AppImage";
-    hash = "sha256-P+6s4g8uCqXQx0p5rieJFpuDV7AquGVYrcTs9XWFAsA=";
+    hash = "sha256:7559471672cbb36fb6e2159d894a96d9a56da563770dc74b982d84927ee56be0";
   };
   icon = pkgs.fetchurl {
     url = "https://upload.wikimedia.org/wikipedia/commons/7/74/Prism_Launcher_logo.svg";
diff --git a/home-configuration/managed/xserver/default.nix b/home-configuration/managed/xserver/default.nix
new file mode 100644
index 0000000..e5889de
--- /dev/null
+++ b/home-configuration/managed/xserver/default.nix
@@ -0,0 +1,53 @@
+{ pkgs, ... }:
+{
+  xsession.windowManager.bspwm.enable = true;
+  xsession.windowManager.bspwm.package = pkgs.bspwm-unstable;
+  xsession.windowManager.bspwm.settings = {
+    border_width = 2;
+    focused_border_color = "#383838";
+    normal_border_color = "#282828";
+    window_gap = 10;
+    split_ratiop = 0.5;
+    smart_gap = true;
+    focus_follows_pointer = false;
+    click_to_focus = true;
+    pointer_follows_monitor = true;
+    remove_disabled_monitors = true;
+    auto_cancel = true;
+    auto_alternate = true;
+    bottom_padding = 0;
+  };
+  xsession.windowManager.bspwm.extraConfig = ''
+          pidb() {
+        	pgrep -x "$1" >/dev/null 2>&1
+        }
+
+        run() {
+        	proc="$1"
+        	cmd="$2"
+
+        	if ! pidb "$proc"; then
+        		sh -c "$cmd" &
+        	fi
+        }
+
+        ### }}}
+
+
+        ### {{{ rerun/start processes
+
+        # piss
+        run "piss" "piss"
+
+        # picom
+        run "picom" "picom --backend glx"
+
+        # dunst
+        # run "dunst" "dunst"
+
+        # bspbar
+        # run "bspbar" "bspbar"
+
+    	xwallpaper --center "$HOME/Wallpapers/nature2art.png"
+  '';
+}