From a1dd79241c4b1128d5b9bcddd2f514ac15d0cf20 Mon Sep 17 00:00:00 2001
From: Aria Nolan <tacocat@chytrid.xyz>
Date: Sun, 29 Oct 2023 00:35:51 -0400
Subject: [PATCH] added script to activate wayland specialisation, disabled
 bash lsp (causing issues)

---
 flake.nix                           | 13 +------------
 hosts/JWST/configuration.nix        | 22 +++++++++++-----------
 users/tacocat/helix/languages.nix   | 24 ++++++++++++------------
 users/tacocat/home.nix              |  6 ++++++
 users/tacocat/wayland/default.nix   |  3 +++
 users/tacocat/wayland/river/init    |  1 -
 users/tacocat/wayland/river/process |  1 -
 users/tacocat/wayland/river/reload  | 11 -----------
 8 files changed, 33 insertions(+), 48 deletions(-)
 delete mode 100755 users/tacocat/wayland/river/reload

diff --git a/flake.nix b/flake.nix
index f9368d7..4d1b3ce 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,6 +20,7 @@
     nixpkgs,
     home-manager,
     helix,
+    ...
   }: let
     system = "x86_64-linux";
     pkgs = inputs.nixpkgs.legacyPackages.${system};
@@ -57,21 +58,9 @@
       extraSpecialArgs = {inherit inputs;}; # Pass flake inputs to our config
       modules = [
         ./users/tacocat/home.nix
-        ./users/tacocat/wayland
       ];
     };
 
-    # homeConfigurations."tacocat-X11" = inputs.home-manager.lib.homeManagerConfiguration {
-    #   inherit pkgs;
-    #   extraSpecialArgs = {inherit inputs;}; # Pass flake inputs to our config
-    #   modules = [
-    #     ./users/tacocat/home.nix
-    #     ./users/tacocat/X11
-    #   ];
-    # };
-
-    #outputs home-manager activation package for use on non-NixOS, i think?
     packages.${system}."tacocat" = self.homeConfigurations."tacocat".activationPackage;
-    # packages.${system}."tacocat-X11" = self.homeConfigurations."tacocat-X11".activationPackage;
   };
 }
diff --git a/hosts/JWST/configuration.nix b/hosts/JWST/configuration.nix
index f01698c..85ced02 100644
--- a/hosts/JWST/configuration.nix
+++ b/hosts/JWST/configuration.nix
@@ -86,17 +86,17 @@
   };
 
   programs.river.enable = true;
-  programs.river.extraPackages = with pkgs; [
-    swaylock
-    swayidle
-    dunst
-    wlsunset
-    nm-applet
-    grim
-    slurp
-    waybar
-    wbg
-  ];
+  # programs.river.extraPackages = with pkgs; [
+  #   swaylock
+  #   swayidle
+  #   dunst
+  #   wlsunset
+  #   nm-applet
+  #   grim
+  #   slurp
+  #   waybar
+  #   wbg
+  # ];
 
   environment = {
     systemPackages = with pkgs; [
diff --git a/users/tacocat/helix/languages.nix b/users/tacocat/helix/languages.nix
index 248a5ea..1915977 100644
--- a/users/tacocat/helix/languages.nix
+++ b/users/tacocat/helix/languages.nix
@@ -5,14 +5,14 @@
 }: {
   programs.helix.languages = {
     language = [
-      {
-        name = "bash";
-        auto-format = false;
-        formatter = {
-          command = "${pkgs.shfmt}/bin/shfmt";
-          args = ["-i" "2"];
-        };
-      }
+      # {
+      #   name = "bash";
+      #   auto-format = false;
+      #   formatter = {
+      #     command = "${pkgs.shfmt}/bin/shfmt";
+      #     args = ["-i" "2"];
+      #   };
+      # }
 
       {
         name = "java";
@@ -20,10 +20,10 @@
       }
     ];
     language-server = {
-      bash-language-server = {
-        command = "${pkgs.nodePackages.bash-language-server}/bin/bash-language-server";
-        args = ["start"];
-      };
+      # bash-language-server = {
+      #   command = "${pkgs.nodePackages.bash-language-server}/bin/bash-language-server";
+      #   args = ["start"];
+      # };
 
       clangd = {
         command = "${pkgs.clang-tools}/bin/clangd";
diff --git a/users/tacocat/home.nix b/users/tacocat/home.nix
index 6b166b8..7af74d8 100644
--- a/users/tacocat/home.nix
+++ b/users/tacocat/home.nix
@@ -27,6 +27,7 @@
       wineWowPackages.unstable
       eza
       bat
+      networkmanagerapplet
       comic-mono
       maple-mono
       jetbrains-mono
@@ -35,6 +36,11 @@
       jdk20
       pdftk
       git
+      (writeShellScriptBin "hs-way" ''
+        home-manager --flake $HOME/nix-config/#tacocat switch
+        GEN=$(home-manager generations | head -1 | awk '{print $NF}')
+        "$GEN/specialisation/wayland/activate"
+      '')
     ];
   };
 
diff --git a/users/tacocat/wayland/default.nix b/users/tacocat/wayland/default.nix
index 5a8f98e..c0353dc 100644
--- a/users/tacocat/wayland/default.nix
+++ b/users/tacocat/wayland/default.nix
@@ -19,6 +19,9 @@
     swaylock
     swayidle
     wbg    
+    dunst
+    grim
+    slurp
   ];
 
   programs.rofi.package = pkgs.rofi-wayland-unwrapped;
diff --git a/users/tacocat/wayland/river/init b/users/tacocat/wayland/river/init
index cddd557..8c5637c 100755
--- a/users/tacocat/wayland/river/init
+++ b/users/tacocat/wayland/river/init
@@ -21,7 +21,6 @@ riverctl map normal Super Q close
 
 # Super+Shift+E to exit river
 riverctl map normal Super+Shift E exit
-riverctl map normal Super+Shift R spawn "$HOME/.config/river/reload"
 
 # Super+J and Super+K to focus the next/previous view in the layout stack
 riverctl map normal Super J focus-view next
diff --git a/users/tacocat/wayland/river/process b/users/tacocat/wayland/river/process
index 2de4acc..02abb8e 100755
--- a/users/tacocat/wayland/river/process
+++ b/users/tacocat/wayland/river/process
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 
-wlsunset -S 8:00 -s 23:30 &
 waybar &
 nm-applet --indicator &
 dunst &
diff --git a/users/tacocat/wayland/river/reload b/users/tacocat/wayland/river/reload
deleted file mode 100755
index 7448cf7..0000000
--- a/users/tacocat/wayland/river/reload
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-# killall pipewire
-killall wlsunset
-killall waybar
-killall nm-applet
-killall dunst
-killall swayidle
-killall wbg
-killall void-setup
-
-~/.config/river/init