From f27516a5a89e43aab6f3868a160b124d98f197f4 Mon Sep 17 00:00:00 2001
From: Rouven Seifert <rouven@rfive.de>
Date: Sat, 21 Jan 2023 23:42:49 +0100
Subject: [PATCH] final touches

---
 users/rouven/modules/default.nix            |   1 -
 users/rouven/modules/flameshot/default.nix  |  15 ---
 users/rouven/modules/hyprland/default.nix   | 115 ++++++++++----------
 users/rouven/modules/hyprland/hyprland.conf |   5 +-
 users/rouven/modules/kdeconnect/default.nix |   7 --
 users/rouven/modules/packages.nix           |   1 +
 users/rouven/modules/tmux/default.nix       |   3 +-
 7 files changed, 61 insertions(+), 86 deletions(-)
 delete mode 100644 users/rouven/modules/flameshot/default.nix
 delete mode 100644 users/rouven/modules/kdeconnect/default.nix

diff --git a/users/rouven/modules/default.nix b/users/rouven/modules/default.nix
index b4c9680..a060011 100644
--- a/users/rouven/modules/default.nix
+++ b/users/rouven/modules/default.nix
@@ -8,7 +8,6 @@
       ./git
       ./gpg
       ./hyprland
-      ./kdeconnect #TODO fix
       ./neovim
       ./ssh
       ./tmux
diff --git a/users/rouven/modules/flameshot/default.nix b/users/rouven/modules/flameshot/default.nix
deleted file mode 100644
index 21508c7..0000000
--- a/users/rouven/modules/flameshot/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ config, ... }:
-{
-  services.flameshot = {
-    enable = true;
-    settings = {
-      General = {
-        contrastOpacity = 188;
-        disabledTrayIcon = true;
-      };
-      Shortcuts = {
-        TYPE_COPY = "Return";
-      };
-    };
-  };
-}
diff --git a/users/rouven/modules/hyprland/default.nix b/users/rouven/modules/hyprland/default.nix
index 6aef79f..3e82585 100644
--- a/users/rouven/modules/hyprland/default.nix
+++ b/users/rouven/modules/hyprland/default.nix
@@ -2,26 +2,9 @@
 {
   imports = [ ./waybar.nix ];
   wayland.windowManager.hyprland.enable = true;
-  xdg.configFile = {
-    "hypr/hyprland.conf".source = ./hyprland.conf;
-    "hypr/hyprpaper.conf".text = ''
-      preload = ${../../../../images/wallpaper.png}
-      wallpaper =eDP-1, ${../../../../images/wallpaper.png}
-      wallpaper =HDMI-A-1, ${../../../../images/wallpaper.png}
-    '';
-    "swaylock/config".text = ''
-      indicator-radius=200
-      indicator-thickness=3
-      inside-color=00000000
-      inside-ver-color=${config.colorScheme.colors.base0D}
-      inside-clear-color=${config.colorScheme.colors.base0B}
-      ring-color=${config.colorScheme.colors.base03}
-      ring-wrong-color=${config.colorScheme.colors.base08}
-      screenshot
-      effect-blur=7x5
-    '';
+  home.sessionVariables = {
+    GRIM_DEFAULT_DIR = "~/Pictures/Screenshots/";
   };
-
   home.packages = with pkgs; [
     pulseaudio # installed to have pactl
     wofi
@@ -33,47 +16,63 @@
     swaylock-effects
   ];
 
-  xdg.configFile."wofi/config".text = ''
-    allow_images = true
-    term = alacritty
-  '';
+  xdg.configFile = {
+    "hypr/hyprland.conf".source = ./hyprland.conf;
 
-  xdg.configFile."wofi/style.css".text = ''
-    window {
-      margin: 0px;
-      border: 1px solid #${config.colorScheme.colors.base0D};
-      background-color: #${config.colorScheme.colors.base00};
-    }
-    
-    #input {
-      margin: 5px;
-      border: none;
-      color: #${config.colorScheme.colors.base05};
-      background-color: #${config.colorScheme.colors.base02};
-    }
-    
-    #inner-box,
-    #outer-box {
-      margin: 5px;
-      border: none;
-      background-color: #${config.colorScheme.colors.base00};
-    }
-    
-    #text {
-      margin: 5px;
-      border: none;
-      color: #${config.colorScheme.colors.base05};
-    }
+    "hypr/hyprpaper.conf".text = ''
+      preload = ${../../../../images/wallpaper.png}
+      wallpaper =eDP-1, ${../../../../images/wallpaper.png}
+      wallpaper =HDMI-A-1, ${../../../../images/wallpaper.png}
+    '';
 
-    #entry {
-      background-color: #${config.colorScheme.colors.base00};
-    }
-    
-    #entry:selected {
-      background-color: #${config.colorScheme.colors.base03};
-    }
-    
-  '';
+    "swaylock/config".text = ''
+      indicator-radius=200
+      indicator-thickness=3
+      inside-color=00000000
+      inside-ver-color=${config.colorScheme.colors.base0D}
+      inside-clear-color=${config.colorScheme.colors.base0B}
+      ring-color=${config.colorScheme.colors.base03}
+      ring-wrong-color=${config.colorScheme.colors.base08}
+      screenshot
+      effect-blur=7x5
+    '';
+
+    "wofi/config".text = ''
+      allow_images = true
+      term = alacritty
+    '';
+
+    "wofi/style.css".text = ''
+      window {
+        margin: 0px;
+        border: 1px solid #${config.colorScheme.colors.base0D};
+        background-color: #${config.colorScheme.colors.base00};
+      }
+      #input {
+        margin: 5px;
+        border: none;
+        color: #${config.colorScheme.colors.base05};
+        background-color: #${config.colorScheme.colors.base02};
+      }
+      #inner-box,
+      #outer-box {
+        margin: 5px;
+        border: none;
+        background-color: #${config.colorScheme.colors.base00};
+      }
+      #text {
+        margin: 5px;
+        border: none;
+        color: #${config.colorScheme.colors.base05};
+      }
+      #entry {
+        background-color: #${config.colorScheme.colors.base00};
+      }
+      #entry:selected {
+        background-color: #${config.colorScheme.colors.base03};
+      }
+    '';
+  };
 
   programs.mako = {
     enable = true;
diff --git a/users/rouven/modules/hyprland/hyprland.conf b/users/rouven/modules/hyprland/hyprland.conf
index 747905c..2a17ffd 100644
--- a/users/rouven/modules/hyprland/hyprland.conf
+++ b/users/rouven/modules/hyprland/hyprland.conf
@@ -13,9 +13,6 @@ monitor=eDP-1, 1920x1080, 0x0, 1
 input {
     kb_layout = us
     kb_variant = dvorak-alt-intl
-    kb_model =
-    kb_options =
-    kb_rules =
 
     follow_mouse = 1
 
@@ -142,6 +139,7 @@ bindm = $mainMod, mouse:273, resizewindow
 
 # All the fancy XF86 Keys
 bind = ,Print, exec, grim -g "$(slurp)" - | wl-copy -t image/png
+bind = SHIFT, Print, exec, grim -g "$(slurp)"
 bind = ,XF86MonBrightnessUp, exec, light -A 10
 bind = ,XF86MonBrightnessDown, exec, light -U 10
 bind = ,XF86AudioMute, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle
@@ -154,4 +152,5 @@ bind = ,XF86WLAN, exec, wpa_gui
 bind = ,XF86Messenger, exec, makoctl dismiss
 bind = SHIFT ,XF86Messenger, exec, makoctl restore
 bind = ,XF86Go, exec, makoctl invoke
+bind = ,XF86Display, exec, hyprpaper
 bind = ,Cancel, exec, swaylock
diff --git a/users/rouven/modules/kdeconnect/default.nix b/users/rouven/modules/kdeconnect/default.nix
deleted file mode 100644
index a3e6d15..0000000
--- a/users/rouven/modules/kdeconnect/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, ... }:
-{
-  services.kdeconnect = {
-    enable = true;
-    indicator = true;
-  };
-}
diff --git a/users/rouven/modules/packages.nix b/users/rouven/modules/packages.nix
index db23d14..184930a 100644
--- a/users/rouven/modules/packages.nix
+++ b/users/rouven/modules/packages.nix
@@ -46,6 +46,7 @@
     virt-manager
     powerline-fonts
     ventoy-bin
+    ripgrep
 
     # libs
     libyubikey
diff --git a/users/rouven/modules/tmux/default.nix b/users/rouven/modules/tmux/default.nix
index 8e4ad4b..54a5d65 100644
--- a/users/rouven/modules/tmux/default.nix
+++ b/users/rouven/modules/tmux/default.nix
@@ -14,8 +14,7 @@
       {
         plugin = dracula;
         extraConfig = ''
-          set -g @dracula-show-fahrenheit false
-          set -g @dracula-plugins "weather time"
+          set -g @dracula-plugins "time"
           set -g @dracula-show-left-icon session
           set -g @dracula-show-powerline true
         '';