From d336212904e8bc205e6d9c7fc87e0fd27ee6fa5f Mon Sep 17 00:00:00 2001
From: "Lennart J. Kurzweg (Nx2)" <git@nx2.site>
Date: Mon, 15 Apr 2024 10:20:40 +0200
Subject: [PATCH] Hypr + fuse + ssh

---
 configuration.nix                  |  1 +
 home-modules/hyprland/hyprland.nix | 82 +++++++++++++++---------------
 home-modules/ssh.nix               |  5 +-
 system-modules/fuse.nix            |  7 +++
 4 files changed, 53 insertions(+), 42 deletions(-)
 create mode 100644 system-modules/fuse.nix

diff --git a/configuration.nix b/configuration.nix
index 806acad..dab72b2 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -4,6 +4,7 @@ in
 {
   imports = [
     ./system-modules/hardware-configuration.nix
+    ./system-modules/fuse.nix
     ./system-modules/nvidia.nix # only does stuff if nvidia.enabled
     ./system-modules/users.nix
     ./system-modules/sound.nix
diff --git a/home-modules/hyprland/hyprland.nix b/home-modules/hyprland/hyprland.nix
index 539ba91..9449c28 100644
--- a/home-modules/hyprland/hyprland.nix
+++ b/home-modules/hyprland/hyprland.nix
@@ -3,7 +3,7 @@ let
   animation-speed = "2";
   transparency = rice.transparency;
   gap-size = 10;
-  rounding = 10;
+  rounding = 3;
   border-width = 3;
   monitors = {
     xps = {
@@ -116,40 +116,40 @@ in
           d1 = if host == "NxXPS" then monitors.xps.main.name else monitors.north.main.name;
           d2 = if host == "NxXPS" then monitors.xps.second.name else monitors.north.left.name;
           d3 = if host == "NxXPS" then monitors.xps.main.name else monitors.north.right.name;
-          compact = ",gapsin:0, gapsout:0, rounding:0, bordersize:0";
+          compact = "gapsin:0, gapsout:0, bordersize:1, rounding:false";
         in
         [
-          "${d1}, 11, default:true"
-          "${d1}, 12"
-          "${d1}, 13"
-          "${d1}, 14"
-          "${d1}, 15"
-          "${d1}, 16"
-          "${d1}, 17"
-          "${d1}, 18"
-          "${d1}, 19"
-          "${d1}, 10 ${compact}"
-          "${d1}, 100 ${compact}"
-          "${d2}, 21 ${compact}"
-          "${d2}, 22"
-          "${d2}, 23"
-          "${d2}, 24"
-          "${d2}, 25"
-          "${d2}, 26"
-          "${d2}, 27"
-          "${d2}, 28"
-          "${d2}, 29"
-          "${d2}, 20"
-          "${d3}, 31, default:true"
-          "${d3}, 32"
-          "${d3}, 33"
-          "${d3}, 34"
-          "${d3}, 35"
-          "${d3}, 36"
-          "${d3}, 37"
-          "${d3}, 38"
-          "${d3}, 39"
-          "${d3}, 30 ${compact}"
+          "11, monitor:${d1}, default:true"
+          "12, monitor:${d1}"
+          "13, monitor:${d1}"
+          "14, monitor:${d1}"
+          "15, monitor:${d1}"
+          "16, monitor:${d1}"
+          "17, monitor:${d1}"
+          "18, monitor:${d1}"
+          "19, monitor:${d1}"
+          "10, monitor:${d1}, ${compact}"
+          "100, monitor:${d1}, ${compact}"
+          "21, monitor:${d2}, default:true, ${compact}"
+          "22, monitor:${d2}"
+          "23, monitor:${d2}"
+          "24, monitor:${d2}"
+          "25, monitor:${d2}"
+          "26, monitor:${d2}"
+          "27, monitor:${d2}"
+          "28, monitor:${d2}"
+          "29, monitor:${d2}"
+          "20, monitor:${d2}"
+          "31, monitor:${d3}, default:${let x = if host == "NxNORTH" then "true" else "false"; in x}"
+          "32, monitor:${d3}"
+          "33, monitor:${d3}"
+          "34, monitor:${d3}"
+          "35, monitor:${d3}"
+          "36, monitor:${d3}"
+          "37, monitor:${d3}"
+          "38, monitor:${d3}"
+          "39, monitor:${d3}"
+          "30, monitor:${d3}, ${compact}"
         ];
 
       # "device:logitech-wireless-mouse-mx-master-1" = {
@@ -179,7 +179,7 @@ in
         gaps_in = builtins.div gap-size 2;
         gaps_out = gap-size;
         border_size = border-width;
-        "col.active_border" = "rgba(${rice.color.red}ff)";
+        "col.active_border" = "rgba(${rice.color.red}ff) rgba(${rice.color.bright-cyan}ff) 45deg";
         "col.inactive_border" = "rgba(${rice.color.black}ff)";
 
         cursor_inactive_timeout = 10;
@@ -276,7 +276,7 @@ in
       windowrulev2 = [
         "opacity ${transparency},class:^(com.chatterino.*)$"
         "opacity ${transparency},class:^(chatterino)$"
-        "bordercolor rgba(${rice.color.bright-magenta}ff) rgba(${rice.color.magenta}), pinned:1"
+        "bordercolor rgba(${rice.color.bright-magenta}ff), pinned:1"
       ];
 
       windowrule = [
@@ -528,7 +528,7 @@ in
     extraConfig = ''
       submap = browserSM
       bind = , W, exec, waybar_mode unset
-      bind = , W, exec, hyprctl dispatch exec [workspace 11] firefox 
+      bind = , W, exec, hyprctl dispatch exec firefox 
       bind = , W, submap, reset
 
       bind = , Y, exec, waybar_mode unset 
@@ -536,7 +536,7 @@ in
       bind = , Y, submap, reset
 
       bind = , T, exec, waybar_mode unset
-      bind = , T, exec,  hyprctl dispatch exec [workspace 10] "firefox https://twitch.tv"
+      bind = , T, exec,  hyprctl dispatch exec firefox https://twitch.tv
       bind = , T, submap, reset
 
       bind = , R, exec, waybar_mode unset
@@ -837,16 +837,16 @@ in
               workspaceMargin = 30  
               workspaceBorderSize = 3 
               centerAligned = true
-              overrideGaps = 10
-              gapsIn = 10
-              gapsOut = 10
+              overrideGaps = false
+              gapsIn = 0
+              gapsOut = 0
               hideBackgroundLayers = false
               drawActiveWorkspace = true
               autoDrag = true
               autoScroll = true
               exitOnClick = false
               switchOnDrop = false
-              exitOnSwitch = false
+              exitOnSwitch = trueß
               showNewWorkspace = true
               showEmptyWorkspace = false
           }
diff --git a/home-modules/ssh.nix b/home-modules/ssh.nix
index 8b77116..630b019 100644
--- a/home-modules/ssh.nix
+++ b/home-modules/ssh.nix
@@ -1,7 +1,10 @@
 { config, pkgs, lib, system, user, allowed, secrets, ... }: 
 
 {
-  
+
+  home.packages = with pkgs; [
+    sshfs
+  ];
 
 
   home.file.".ssh/config".text = ''
diff --git a/system-modules/fuse.nix b/system-modules/fuse.nix
new file mode 100644
index 0000000..3ca7c52
--- /dev/null
+++ b/system-modules/fuse.nix
@@ -0,0 +1,7 @@
+{ config, pkgs, ...}:
+
+{
+  environment.systemPackages = with pkgs; [
+    jmtpfs
+  ];
+}
\ No newline at end of file