From 9564130b66c7966b3d7e1a93de795edf543ecc82 Mon Sep 17 00:00:00 2001
From: Nydragon <contact@ccnlc.eu>
Date: Tue, 3 Sep 2024 02:01:24 +0200
Subject: [PATCH] feat: make foot default conf everywhere and waybar toggleable

---
 home/foot.nix                |  4 ++++
 home/hyprland/default.nix    |  3 ++-
 home/rofi/default.nix        |  2 +-
 home/sway/default.nix        |  2 +-
 home/waybar/config.nix       |  3 ++-
 home/waybar/default.nix      | 12 ++++++++----
 hosts/brontes/home.nix       |  7 ++++++-
 hosts/marr/configuration.nix |  1 -
 hosts/marr/home.nix          |  3 +++
 9 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/home/foot.nix b/home/foot.nix
index 5d666a4..fa3a709 100644
--- a/home/foot.nix
+++ b/home/foot.nix
@@ -16,6 +16,10 @@
       colors = {
         alpha = 0.8;
       };
+
+      scrollback = {
+        indicator-position = "none";
+      };
     };
   };
 }
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index e59f5d2..dc30c7e 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -93,7 +93,7 @@ lib.mkIf osConfig.programs.hyprland.enable {
           "focusonactivate, title:${mkRegexList [ "Firefox" ]}"
           "workspace 2,initialClass:${mkRegexList [ "firefox" ]}"
           "workspace 3,initialClass:${mkRegexList [ "obsidian" ]}"
-          "workspace 4,initialClass:${mkRegexList [ "discord" ]}"
+          "workspace 4,initialClass:${mkRegexList [ "steam" ]}"
           "workspace 5,initialClass:${mkRegexList [ "lollypop" ]}"
 
           "fullscreen, class:gamescope"
@@ -118,6 +118,7 @@ lib.mkIf osConfig.programs.hyprland.enable {
           "borderangle, 1, 8, default"
           "fade, 1, 7, default"
           "workspaces, 1, 6, default"
+          "specialWorkspace, 1, 6, default, slidevert"
         ];
       };
 
diff --git a/home/rofi/default.nix b/home/rofi/default.nix
index fba426b..d45298e 100644
--- a/home/rofi/default.nix
+++ b/home/rofi/default.nix
@@ -13,7 +13,7 @@ lib.mkIf config.programs.rofi.enable {
       package = pkgs.rofi-wayland.override { inherit plugins; };
       plugins = [ pkgs.rofi-calc ];
       theme = "${conf}/themes/rounded-gray-dark.rasi";
-      terminal = "${pkgs.alacritty}/bin/alacritty";
+      terminal = "${pkgs.foot}/bin/foot";
       extraConfig = {
         modes = [
           "combi"
diff --git a/home/sway/default.nix b/home/sway/default.nix
index b2d437e..2d4dc2a 100644
--- a/home/sway/default.nix
+++ b/home/sway/default.nix
@@ -16,7 +16,7 @@
   wayland.windowManager.sway =
     let
       homeDirectory = config.home.homeDirectory;
-      term = "${pkgs.alacritty}/bin/alacritty";
+      term = "${pkgs.foot}/bin/foot";
       filemanager = "${pkgs.nautilus}/bin/nautilus";
       colors = {
         lavender = "#babbf1";
diff --git a/home/waybar/config.nix b/home/waybar/config.nix
index 8afb627..4fde62d 100644
--- a/home/waybar/config.nix
+++ b/home/waybar/config.nix
@@ -1,3 +1,4 @@
+{ pkgs, ... }:
 {
   position = "top";
   layer = "bottom";
@@ -125,7 +126,7 @@
 
   network = {
     format-wifi = "{essid} ({signalStrength}%) ";
-    on-click = "alacritty -t nmtui -e nmtui";
+    on-click = "${pkgs.foot}/bin/foot -t nmtui -e nmtui";
   };
   privacy = {
     icon-size = 18;
diff --git a/home/waybar/default.nix b/home/waybar/default.nix
index 8df98bb..df78c05 100644
--- a/home/waybar/default.nix
+++ b/home/waybar/default.nix
@@ -1,16 +1,20 @@
-{ pkgs, ... }:
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
 let
   toCSS = import ./tocss.nix;
 in
-{
+lib.mkIf config.programs.waybar.enable {
   programs.waybar = {
-    enable = true;
     style = toCSS {
       inherit pkgs;
       file = ./style.scss;
     };
     settings = {
-      main = import ./config.nix;
+      main = import ./config.nix { inherit pkgs; };
     };
   };
 }
diff --git a/hosts/brontes/home.nix b/hosts/brontes/home.nix
index a02df8b..d1113a2 100644
--- a/hosts/brontes/home.nix
+++ b/hosts/brontes/home.nix
@@ -21,6 +21,10 @@
       nix-direnv.enable = true;
     };
 
+    programs = {
+      waybar.enable = true;
+    };
+
     services.blueman-applet.enable = true;
 
     home = {
@@ -48,11 +52,12 @@
         varia
         signal-desktop
         calibre
-        alacritty
         tagger
         soundconverter
         foliate
         kid3
+        pulseview
+        prismlauncher
 
         # proprietary
         obsidian
diff --git a/hosts/marr/configuration.nix b/hosts/marr/configuration.nix
index 046d4f6..6381e6a 100644
--- a/hosts/marr/configuration.nix
+++ b/hosts/marr/configuration.nix
@@ -166,7 +166,6 @@
     htop
     nextcloud-client
     kdeconnect
-    alacritty
     eza
     bat
     glib
diff --git a/hosts/marr/home.nix b/hosts/marr/home.nix
index bd3ddc5..b92f6e1 100644
--- a/hosts/marr/home.nix
+++ b/hosts/marr/home.nix
@@ -28,6 +28,7 @@
     };
 
     programs = {
+      waybar.enable = true;
       rofi.enable = true;
     };
     home = {
@@ -50,6 +51,8 @@
         varia
         signal-desktop
         calibre
+        pulseview
+        foot
 
         # Proprietary
         postman