From 2836fa9c1e6ce925149527ab6b039805220da0d1 Mon Sep 17 00:00:00 2001
From: Frankie B <git@diskfloppy.me>
Date: Sat, 2 Sep 2023 19:41:13 +0100
Subject: Clean up home config, add waybar

---
 homes/floppydisk/default.nix | 153 ++-----------------------------------------
 1 file changed, 6 insertions(+), 147 deletions(-)

(limited to 'homes/floppydisk/default.nix')

diff --git a/homes/floppydisk/default.nix b/homes/floppydisk/default.nix
index a43cd7b..0522ae0 100644
--- a/homes/floppydisk/default.nix
+++ b/homes/floppydisk/default.nix
@@ -3,7 +3,6 @@
 {
   inputs,
   pkgs,
-  lib,
   ...
 }: {
   # You can import other home-manager modules here
@@ -212,153 +211,13 @@
 
   wayland.windowManager.hyprland = {
     enable = true;
-    settings = {
-      "env" = "XCURSOR_SIZE,24";
-
-      "$mod" = "SUPER";
-
-      exec-once = [
-        "arRPC"
-        "hyprpaper"
-        "nm-applet --indicator"
-        "waybar"
-        "swaync"
-        "1password --silent"
-      ];
-
-      monitor = [
-        "DP-1,1600x900,0x0,1"
-        "HDMI-A-1,1280x1024,1600x0,1"
-      ];
-
-      input = {
-        kb_layout = "us";
-        follow_mouse = 1;
-        touchpad.natural_scroll = "no";
-        sensitivity = 0;
-      };
-
-      general = {
-        gaps_in = 5;
-        gaps_out = 20;
-        border_size = 2;
-        "col.active_border" = "rgba(33ccffee) rgba(00ff99ee) 45deg";
-        "col.inactive_border" = "rgba(595959aa)";
-        layout = "dwindle";
-      };
-
-      decoration = {
-        blur = {
-          enabled = true;
-          size = 3;
-          passes = 1;
-          new_optimizations = 1;
-        };
-        drop_shadow = "yes";
-        shadow_range = 20;
-        shadow_render_power = 5;
-        "col.shadow" = "rgba(1a1a1aee)";
-      };
-
-      animations = {
-        enabled = true;
-        animation = [
-          "windows, 1, 7, default"
-          "windowsOut, 1, 7, default, popin 80%"
-          "border, 1, 10, default"
-          "borderangle, 1, 8, default"
-          "fade, 1, 7, default"
-          "workspaces, 1, 6, default"
-        ];
-      };
-
-      dwindle = {
-        pseudotile = true;
-        preserve_split = "yes";
-      };
-
-      master = {
-        new_is_master = true;
-      };
-
-      gestures = {
-        workspace_swipe = false;
-      };
-
-      "general:resize_on_border" = "true";
-
-      bindm = [
-        # mouse binds
-        "ALT,mouse:272,movewindow"
-      ];
-
-      binde = [
-        # volume controls
-        ", XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.4 @DEFAULT_AUDIO_SINK@ 5%+"
-        ", XF86AudioLowerVolume, exec, wpctl set-volume -l 1.4 @DEFAULT_AUDIO_SINK@ 5%-"
-      ];
-      
-      bind = [
-        # mute key
-        ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
-
-        # general shortcuts
-        "$mod, Q, exec, kitty"
-        "$mod, C, killactive, "
-        "$mod, M, exit, "
-        "$mod, V, togglefloating, "
-        "$mod, P, pseudo,"
-        "$mod, J, togglesplit,"
-
-        "$mod, E, exec, wlogout -p layer-shell"
-        "SUPERSHIFT,n,exec,swaync-client -t -sw"
-
-        # move windows
-        "$mod SHIFT, H, movewindow, l"
-        "$mod SHIFT, L, movewindow, r"
-        "$mod SHIFT, K, movewindow, u"
-        "$mod SHIFT, J, movewindow, d"
-
-        # screenshot
-        ", Print, exec, grim -l 9 -g \"$(slurp)\" - | wl-copy"
-
-        # rofi
-        "$mod, D, exec, rofi -show drun --show-icons"
-
-        # workspace scroll
-        "$mod, mouse_down, workspace, e+1"
-
-        # move active window to workspace
-        "$mod SHIFT, 1, movetoworkspace, 1"
-        "$mod SHIFT, 2, movetoworkspace, 2"
-        "$mod SHIFT, 3, movetoworkspace, 3"
-        "$mod SHIFT, 4, movetoworkspace, 4"
-        "$mod SHIFT, 5, movetoworkspace, 5"
-        "$mod SHIFT, 6, movetoworkspace, 6"
-        "$mod SHIFT, 7, movetoworkspace, 7"
-        "$mod SHIFT, 8, movetoworkspace, 8"
-        "$mod SHIFT, 9, movetoworkspace, 9"
-        "$mod SHIFT, 0, movetoworkspace, 10"
-
-        # switch workspace
-        "$mod, 1, workspace, 1"
-        "$mod, 2, workspace, 2"
-        "$mod, 3, workspace, 3"
-        "$mod, 4, workspace, 4"
-        "$mod, 5, workspace, 5"
-        "$mod, 6, workspace, 6"
-        "$mod, 7, workspace, 7"
-        "$mod, 8, workspace, 8"
-        "$mod, 9, workspace, 9"
-        "$mod, 0, workspace, 10"
+    systemdIntegration = true;
+    settings = import ./hyprland.nix;
+  };
 
-        # move window focus
-        "$mod, left, movefocus, l"
-        "$mod, right, movefocus, r"
-        "$mod, up, movefocus, u"
-        "$mod, down, movefocus, d"
-      ];
-    };
+  programs.waybar = {
+    enable = true;
+    settings = import ./waybar.nix;
   };
 
   # Nicely reload system units when changing configs
-- 
cgit v1.2.3-54-g00ecf