Update sway config

jaci/dotfiles/waybar/style.css

@@ -27,6 +27,7 @@
   background: transparent;
   color: @egg_shell;
 }
+
 #taskbar button {
   padding-left: 3px;
   padding-right: 3px;
@@ -50,6 +51,7 @@
   border-radius: 25px;
   padding: 0px 10px 0px 10px;
 }
+
 /* Every modules */
 #clock,
 #cpu,

nate/dotfiles/mako/config

@@ -1,19 +1,19 @@
-font=UbuntuMono 12.5
+font=Overpass Nerd Font 20
 
-background-color=#404552
+background-color=#24273a
-text-color=#e5e9f0
+text-color=#cad3f5
-width=315
+width=630
-height=200
+height=400
 padding=10
-margin=10
+margin=20
 progress-color=over #eceff480
 icon-path=/usr/share/icons/Arc-X-D
-max-icon-size=70
+max-icon-size=140
 layer=overlay
 
 border-size=5
-border-radius=0
+border-radius=8
-border-color=#5294e2
+border-color=#b7bdf8
 
 default-timeout=5000
 

nate/dotfiles/sway/config.d/default

@@ -225,7 +225,7 @@ bindsym $mod+r mode "resize"
 #
 # Screenshots
 #
-    bindsym $mod+Shift+p exec /usr/share/sway/scripts/grimshot --notify save output
+    bindsym $mod+Shift+p exec ~/.config/sway/scripts/screenshot.sh clipboard
     bindsym $mod+p exec ~/.config/sway/scripts/screenshot.sh
 #
 # Keybindings List

nate/dotfiles/sway/config.d/output

@@ -9,5 +9,5 @@
 # Wacom Tablet - Example
 #   input "1386:884:Wacom_Intuos_S_Pad" map_to_output HDMI-A-1
 #   input "1386:884:Wacom_Intuos_S_Pen" map_to_output HDMI-A-1
-output DP-3 resolution 2560x1440@164.956Hz position 0,0
+output DP-3 resolution 3840x2160@240.084Hz position 0,0
 output * adaptive_sync off

nate/dotfiles/sway/config.d/theme

@@ -41,8 +41,8 @@ font pango:Overpass Nerd Font 12
 smart_borders on
 
 # Set wallpaper:
-#exec_always swaybg -i /home/nate/.config/sway/wallpapers/ign-0000.png
+exec_always swaybg -i /home/nate/.config/sway/wallpapers/nix-black-4k.png
-exec_always /home/nate/.config/sway/scripts/background.sh
+# exec_always /home/nate/.config/sway/scripts/background.sh
 
 # Title format for windows
 for_window [shell="xdg_shell"] title_format "%title (%app_id)"

nate/dotfiles/sway/scripts/screenshot.sh

@@ -4,6 +4,20 @@ entries="Active Screen Output Area Window"
  
 selected=$(printf '%s\n' $entries | wofi --style=$HOME/.config/wofi/style.widgets.css --conf=$HOME/.config/wofi/config.screenshot | awk '{print tolower($1)}')
 
+if [ "$1" == "clipboard" ]; then
+  case $selected in
+    active)
+      grimshot --notify copy active;;
+    screen)
+      grimshot --notify copy screen;;
+    output)
+      grimshot --notify copy output;;
+    area)
+      grimshot --notify copy area;;
+    window)
+      grimshot --notify copy window;;
+  esac
+else 
   case $selected in
     active)
       grimshot --notify save active;;
@@ -16,3 +30,4 @@ case $selected in
     window)
       grimshot --notify save window;;
   esac
+fi

nate/dotfiles/waybar/config

@@ -2,13 +2,13 @@
 {
     "layer": "top",
     "position": "top",
-    "margin-top": 8,
+    "margin-top": 3,
     "margin-left": 10,
     "margin-right": 10,
-    "margin-bottom": 8,
+    "margin-bottom": 3,
 
     // If height property would be not present, it'd be calculated dynamically
-    "height": 30,
+    "height": 60,
 
     "modules-left": [
         "custom/launcher",
@@ -17,6 +17,13 @@
     ],
  
     "modules-center": [
+        "custom/signal",
+        "custom/steam",
+        "custom/spotify",
+        "custom/firefox",
+        "custom/slack",
+        "custom/files",
+        "custom/pomo",
     ],
 
     "modules-right": [
@@ -25,12 +32,11 @@
         "memory",
         "cpu",
         "pulseaudio",
-        "custom/spotify",
         "custom/keyboard-layout",
         "battery",
         //"custom/PBPbattery",
-        "backlight#icon",
+        // "backlight#icon",
-        "backlight#value",
+        // "backlight#value",
         "clock",
         "tray",
         //"custom/weather",
@@ -173,6 +179,12 @@
         "interval": 600,
     },
 
+    // "custom/temp": {
+    //     "exec": "notify-send \"temp thing\"",
+    //     "interval": "once",
+    //     "signal": 8,
+    // },
+
     "tray": {
         "icon-size": 18,
         "spacing":10,
@@ -191,28 +203,54 @@
          "on-scroll-up": "brightnessctl -c backlight set +1%"
     },
 
-    "custom/firefox": {
+   "custom/signal": {
-        "format": " ",
+        "format": "  ",
-        "on-click": "exec firefox",
+        "on-click": "exec signal",
-        "tooltip": false
+        "tooltip": false,
+    },
+
+    "custom/steam": {
+        "format": "  ",
+        "on-click": "exec steam",
+        "tooltip": false,
     },
 
     "custom/spotify": {
         "format": "  ",
         "on-click": "foot -e 'ncspot'",
-        "tooltip": false
+        "tooltip": false,
     },
 
-    "custom/terminal": {
+    "custom/firefox": {
-        "format": " ",
+        "format": "  ",
-        "on-click": "exec foot",
+        "on-click": "exec firefox",
-        "tooltip": false
+        "tooltip": false,
     },
 
+
+    "custom/slack": {
+        "format": "  ",
+        "on-click": "slack",
+        "tooltip": false,
+        "exec if": "pgrep slack"
+    },
+
+
    "custom/files": {
-        "format": " ",
+        "format": " 󰉋 ",
         "on-click": "exec thunar",
-        "tooltip": false
+        "tooltip": false,
+    },
+
+
+    "custom/pomo": {
+        "format": " {} ",
+        "exec": "/home/nate/source/pomozoro/zig-out/bin/pomozoro",
+        "return-type": "json",
+        "on-click": "echo 's' > ~/.local/share/pomozoro/pomopipe",
+        "on-click-right": "echo 'p' > ~/.local/share/pomozoro/pomopipe",
+        "on-click-middle": "echo 'r' > ~/.local/share/pomozoro/pomopipe",
+        // "signal": 8,
     },
 
     "custom/launcher": {

nate/dotfiles/waybar/style.css

@@ -6,50 +6,63 @@
  *
  * =========================================================================== */
 
+@define-color rosewater #f4dbd6;
+@define-color flamingo #f0c6c6;
+@define-color pink #f5bde6;
+@define-color mauve #c6a0f6;
+@define-color red #ed8796;
+@define-color maroon #ee99a0;
+@define-color peach #f5a97f;
+@define-color yellow #eed49f;
+@define-color green #a6da95;
+@define-color teal #8bd5ca;
+@define-color sky #91d7e3;
+@define-color sapphire #7dc4e4;
+@define-color blue #8aadf4;
+@define-color lavender #b7bdf8;
+@define-color text #cad3f5;
+@define-color subtext1 #b8c0e0;
+@define-color subtext0 #a5adcb;
+@define-color overlay2 #939ab7;
+@define-color overlay1 #8087a2;
+@define-color overlay0 #6e738d;
+@define-color surface2 #5b6078;
+@define-color surface1 #494d64;
+@define-color surface0 #363a4f;
+@define-color base #24273a;
+@define-color mantle #1e2030;
+@define-color crust #181926;
+
+
 /* -----------------------------------------------------------------------------
  * Keyframes
  * -------------------------------------------------------------------------- */
-
-/*
-Nordic Color Scheme
-*/
-@define-color nord2         #434c5e;
-@define-color nord3         #4c566a;
-@define-color nord4         #d8dee9;
-@define-color nord8         #88c0d0;
-@define-color nord9         #81a1c1;
-@define-color nord_cyan     #8fbcbb;
-@define-color nord_orange   #d08770;
-@define-color nord_red      #bf616a;
-@define-color nord_green    #a3be8c;
-@define-color nord_yellow   #ebcb8b;
-
 @keyframes blink-warning {
   70% {
-        color: white;
+    color: @overlay0;
   }
 
   to {
-        color: white;
+    color: @overlay0;
-        background-color: @nord_orange;
+    background-color: @crust;
   }
 }
 
 @keyframes blink-critical {
   70% {
-      color: white;
+    color: @overlay2;
   }
 
   to {
-        color: white;
+    color: @overlay2;
-        background-color: @nord_red;
+    background-color: @base;
   }
 }
 
+
 /* -----------------------------------------------------------------------------
  * Base styles
  * -------------------------------------------------------------------------- */
-
 /* Reset all styles */
 * {
   border: none;
@@ -62,11 +75,41 @@ Nordic Color Scheme
 /* The whole bar */
 #waybar {
   background: transparent;
-    color: @nord4;
+  background-color: transparent;
-    background-color: @nord3;
   font-family: Overpass Nerd Font;
-    font-size: 16px;
+  font-size: 20px;
-    border-radius: 15px;
+  color: @text;
+}
+
+#taskbar {
+  background: transparent;
+}
+
+#taskbar button {
+  padding-left: 3px;
+  padding-right: 3px;
+  margin-left: 3px;
+  margin-right: 3px;
+  color: transparent;
+  border-bottom: 2px solid;
+}
+
+#taskbar button.active {
+  color: @lavender;
+}
+
+.modules-left,
+.modules-right,
+.modules-center {
+  /* margin: 8px 8px 1px 8px; */
+  background: transparent;
+  /* color: @; */
+  background-color: @base;
+  border-radius: 25px;
+  padding: 0px 10px 0px 10px;
+  border-style: solid;
+  border-width: 3px;
+  border-color: @surface0;
 }
 
 /* Every modules */
@@ -99,11 +142,11 @@ Nordic Color Scheme
 }
 
 #battery.warning {
-    color: @nord_orange;
+  color: @flamingo;
 }
 
 #battery.critical {
-    color: @nord_red;
+  color: @red;
 }
 
 #battery.warning.discharging {
@@ -117,11 +160,11 @@ Nordic Color Scheme
 }
 
 #cpu.warning {
-    color: @nord_orange;
+  color: @flamingo;
 }
 
 #cpu.critical {
-    color: @nord_red;
+  color: @red;
 }
 
 #memory {
@@ -131,11 +174,11 @@ Nordic Color Scheme
 }
 
 #memory.warning {
-    color: @nord_orange;
+  color: @flamingo;
 }
 
 #memory.critical {
-    color: @nord_red;
+  color: @red;
   animation-name: blink-critical;
   animation-duration: 2s;
   padding-left: 5px;
@@ -143,15 +186,16 @@ Nordic Color Scheme
 }
 
 #mode {
-    background: @nord8;
+  background: @overlay0;
   border-bottom: 3px transparent;
-    color:white;
+  color: @text;
   margin-left: 5px;
-    padding: 7px;
+  margin-right: 5px;
+  border-radius: 20px;
 }
 
 #network.disconnected {
-    color: @nord_orange;
+  color: @flamingo;
 }
 
 #pulseaudio {
@@ -159,12 +203,11 @@ Nordic Color Scheme
 }
 
 #pulseaudio.muted {
-
+  color: @sky;
-    color: @nord_cyan;
 }
 
 #temperature.critical {
-    color: @nord_red;
+  color: @red;
 }
 
 #window {
@@ -182,29 +225,81 @@ Nordic Color Scheme
 }
 
 #custom-launcher {
-    color: @nord9;
+  color: @lavenderblush;
+}
+
+/* @define-color rosewater #f4dbd6; */
+/* @define-color flamingo #f0c6c6; */
+/* @define-color pink #f5bde6; */
+/* @define-color mauve #c6a0f6; */
+/* @define-color red #ed8796; */
+/* @define-color maroon #ee99a0; */
+/* @define-color peach #f5a97f; */
+/* @define-color yellow #eed49f; */
+/* @define-color green #a6da95; */
+/* @define-color teal #8bd5ca; */
+/* @define-color sky #91d7e3; */
+/* @define-color sapphire #7dc4e4; */
+/* @define-color blue #8aadf4; */
+/* @define-color lavender #b7bdf8; */
+
+
+#custom-signal {
+  color: @lavender;
+  padding: 0px 5px 0px 5px;
+}
+
+#custom-steam {
+  color: @teal;
+  padding: 0px 5px 0px 5px;
 }
 
 #custom-spotify {
-    color: @nord_green;
+  color: @green;
+  padding: 0px 5px 0px 5px;
 }
 
+#custom-firefox {
+  color: @yellow;
+  padding: 0px 5px 0px 5px;
+}
+
+#custom-slack {
+  color: @peach;
+  padding: 0px 5px 0px 5px;
+}
+
+#custom-files {
+  color: @pink;
+  padding: 0px 5px 0px 5px;
+}
+
+#custom-pomo {
+  color: @red;
+  padding: 0px 5px 0px 5px;
+}
+
+#wiggle {
+  animation-name: blink-warning;
+}
+
+
 #workspaces button.focused {
-    border-bottom: 3px solid  @nord_green;
+  border-bottom: 3px solid @green;
   margin-bottom: 1px;
   padding-left: 0;
 }
 
 #workspaces button.urgent {
-    border-color: @nord2;
+  border-color: @lavender;
-    color: @nord_yellow;
+  color: @yellow;
 }
 
 #custom-power {
   margin-left: 15px;
   margin-right: 15px;
   font-size: 15px;
-    color: @nord_orange;
+  color: @flamingo;
 }
 
 #custom-launcher {

nate/modules/home-manager/home.nix

@@ -107,6 +107,8 @@
     neofetch
     # Normies
     unzip
+    llpp
+    nmap
 
     #
     # Photo / Video
@@ -144,6 +146,7 @@
     libsForQt5.qtstyleplugin-kvantum
     libsForQt5.qt5ct
     # Install fonts
+    lato
     (nerdfonts.override { fonts = [ "Hermit" "Overpass" ]; })
     recursive
   ];

nate/modules/sway/sway_conf.nix

@@ -75,7 +75,8 @@
                 syncthingtray
                 swaylock
                 swayidle
-                swww
+                swaybg
+                # swww
                 tailscale-systray
                 wl-clipboard
                 waybar
@@ -165,7 +166,7 @@
           };
         };
 
-        services.xserver.videoDrivers = [ "amdgpu" ];
+        # services.xserver.videoDrivers = [ "amdgpu" ];
         # Enable HIP
         systemd.tmpfiles.rules = [
             "L+    /opt/rocm/hip   -    -    -     -    ${pkgs.rocmPackages.clr}"
@@ -174,13 +175,12 @@
         hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot
         hardware.opengl = {
             # Mesa
-            enable = true;
+            # enable = true;
             # Vulkan
-            driSupport = true;
+            # driSupport = true;
             # Rocm support and vulkan drivers
             extraPackages = with pkgs; [
                 rocmPackages.clr.icd
-                amdvlk
             ];
         };
     };