refactor(wrappers): remove wrapping

As much as I prefer wrappers, I feel like it is too much work to set them up because no one likes standards...

hosts/python/users/amadaluzia/configs/foot/foot.ini

@@ -0,0 +1,29 @@
+[main]
+pad=8x8
+font=monospace:size=13
+
+[colors]
+foreground=e5e9f0
+background=2e3440
+regular0=3b4252
+regular1=bf616a
+regular2=a3be8c
+regular3=ebcb8b
+regular4=81a1c1
+regular5=b48ead
+regular6=88c0d0
+regular7=eceff4
+bright0=434c5e
+bright1=bf616a
+bright2=a3be8c
+bright3=ebcb8b
+bright4=81a1c1
+bright5=b48ead
+bright6=88c0d0
+bright7=8fbcbb
+16=d08770
+17=5e81ac
+18=3b4252
+19=434c5e
+20=d8dee9
+21=eceff4

hosts/python/users/amadaluzia/configs/niri/config.kdl

@@ -147,7 +147,7 @@ layout {
         // off
 
         // How many logical pixels the ring extends out from the windows.
-        width 1
+        width 2
 
         // Colors can be set in a variety of ways:
         // - CSS named colors: "red"
@@ -232,13 +232,34 @@ animations {
     // off
 
     // Slow down all animations by this factor. Values below 1 speed them up instead.
-    slowdown 0.9
+    slowdown 0.8
 }
 
 // Window rules let you adjust behavior for individual windows.
 // Find more information on the wiki:
 // https://github.com/YaLTeR/niri/wiki/Configuration:-Window-Rules
 
+layer-rule {
+    shadow {
+        on
+        softness 10
+        spread 1
+        draw-behind-window true
+        color "#00000030"
+    }
+}
+
+window-rule {
+    match is-floating=true
+    shadow {
+        on
+        softness 20
+        spread 10
+        draw-behind-window true
+        color "#00000040"
+    }
+}
+
 // Work around WezTerm's initial configure bug
 // by setting an empty default-column-width.
 window-rule {
@@ -293,7 +314,7 @@ binds {
     Mod+Shift+Slash { show-hotkey-overlay; }
 
     // Suggested binds for running programs: terminal, app launcher, screen locker.
-    Mod+T { spawn "neovide"; }
+    Mod+T { spawn "emacs"; }
     Mod+D { spawn "rofi" "-show" "drun"; }
     // Super+Alt+L { spawn "swaylock"; }
 
@@ -464,6 +485,7 @@ binds {
     Mod+Shift+R { switch-preset-window-height; }
     Mod+Ctrl+R { reset-window-height; }
     Mod+F { maximize-column; }
+    Mod+Ctrl+F { expand-column-to-available-width; }
     Mod+Shift+F { fullscreen-window; }
     Mod+C { center-column; }
 
@@ -485,6 +507,7 @@ binds {
     // Move the focused window between the floating and the tiling layout.
     Mod+V       { toggle-window-floating; }
     Mod+Shift+V { switch-focus-between-floating-and-tiling; }
+    Mod+W { toggle-column-tabbed-display; }
 
     // Actions to switch layouts.
     // Note: if you uncomment these, make sure you do NOT have

hosts/python/users/amadaluzia/configs/waybar/config.jsonc

@@ -0,0 +1,32 @@
+{
+  "position": "top",
+  "height": 0,
+  "spacing": 16,
+  "modules-left": ["mpris"],
+  "modules-center": ["niri/workspaces"],
+  "modules-right": ["wireplumber", "clock"],
+  "mpris": {
+    "format": "{player_icon} {dynamic}",
+    "format-paused": "{status_icon} <i>{dynamic}</i>",
+    "interval": 1,
+    "dynamic-len": 52,
+    "player-icons": {
+      "default": "▶",
+      "mpv": "🎵",
+    },
+    "status-icons": {
+      "paused": "",
+      "paused": "⏸",
+    },
+  },
+  "clock": {
+    "format": " {:%H:%M}",
+    "tooltip-format": "{:%A, %B %d, %Y}",
+  },
+  "wireplumber": {
+    "format": "{icon} {volume}%",
+    "format-muted": "",
+    "on-click": "helvum",
+    "format-icons": ["", "", ""],
+  },
+}

hosts/python/users/amadaluzia/configs/waybar/style.scss

@@ -0,0 +1,73 @@
+// scheme: "Everforest dark, hard"
+// author: "Sainnhe Park (sainnhe@gmail.com)"
+//
+// base00: "2b3339" # Default Background
+// base01: "323c41" # Lighter Background (Used for status bars, line number and folding marks)
+// base02: "503946" # Selection Background
+// base03: "868d80" # Comments, Invisibles, Line Highlighting
+// base04: "d3c6aa" # Dark Foreground (Used for status bars)
+// base05: "d3c6aa" # Default Foreground, Caret, Delimiters, Operators
+// base06: "e9e8d2" # Light Foreground (Not often used)
+// base07: "fff9e8" # Light Background (Not often used)
+// base08: "7fbbb3" # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted
+// base09: "d699b6" # Integers, Boolean, Constants, XML Attributes, Markup Link Url
+// base0A: "83c092" # Classes, Markup Bold, Search Text Background
+// base0B: "dbbc7f" # Strings, Inherited Class, Markup Code, Diff Inserted
+// base0C: "e69875" # Support, Regular Expressions, Escape Characters, Markup Quotes
+// base0D: "a7c080" # Functions, Methods, Attribute IDs, Headings
+// base0E: "e67e80" # Keywords, Storage, Selector, Markup Italic, Diff Changed
+// base0F: "d699b6" # Deprecated, Opening/Closing Embedded Language Tags, e.g. <?php ?>
+
+$base00: #2b3339;
+$base01: #323c41;
+$base02: #503946;
+$base03: #868d80;
+$base04: #d3c6aa;
+$base05: #d3c6aa;
+$base06: #e9e8d2;
+$base07: #fff9e8;
+$base08: #7fbbb3;
+$base09: #d699b6;
+$base0A: #83c092;
+$base0B: #dbbc7f;
+$base0C: #e69875;
+$base0D: #a7c080;
+$base0E: #e67e80;
+$base0F: #d699b6;
+
+* {
+    all: unset;
+    font-size: 15px;
+    color: $base06;
+}
+
+window#waybar {
+    background: $base00;
+}
+
+tooltip {
+    background: $base01;
+}
+
+.modules-left,
+.modules-right {
+    background: $base01;
+    padding: 0px 8px;
+}
+
+.modules-center {
+    background: $base01;
+}
+
+#workspaces button {
+    padding: 6px 16px;
+    transition: 0.2s;
+}
+
+#workspaces button:hover {
+    padding: 6px 24px;
+}
+
+#workspaces button.focused {
+    background: $base02;
+}

hosts/python/users/amadaluzia/configs/waybar/waybar.nix

@@ -0,0 +1,42 @@
+pkgs: let
+  json = pkgs.formats.json {};
+in {
+  config = json.generate "waybar.jsonc" {
+    position = "top";
+    height = 0;
+    spacing = 16;
+    modules-left = ["mpris"];
+    modules-center = ["niri/workspaces"];
+    modules-right = ["wireplumber" "clock"];
+    mpris = {
+      format = "{player_icon} {dynamic}";
+      format-paused = "{status_icon} <i>{dynamic}</i>";
+      interval = 1;
+      dynamic-len = 64;
+      player-icons = {
+        default = "▶";
+        mpv = "🎵";
+      };
+      status_icons = {
+        paused = "⏸";
+      };
+    };
+    clock = {
+      format = " {:%H:%M}";
+      tooltip-format = "{:%A, %B %d, %Y}";
+    };
+    wireplumber = {
+      format = "{icon} {volume}%";
+      format-muted = "";
+      on-click = "helvum";
+      format-icons = ["" "" ""];
+    };
+  };
+
+  style =
+    pkgs.runCommand "waybar.css" {
+      nativeBuildInputs = [pkgs.sass];
+    } ''
+      sass ${./style.scss} > $out
+    '';
+}

hosts/python/users/amadaluzia/default.nix

@@ -3,7 +3,9 @@
   pkgs,
   config,
   ...
-}: {
+}: let
+  waybar = import ./configs/waybar/waybar.nix pkgs;
+in {
   alqueva.users.artur = {
     shell = config.alqueva.shells.nushell.package;
     tmpfiles = {
@@ -18,6 +20,9 @@
       ".config/dunst/" = ./configs/dunst;
       ".config/niri/" = ./configs/niri;
       ".config/rofi/" = ./configs/rofi;
+      ".config/foot" = ./configs/foot;
+      ".config/waybar/config.jsonc" = waybar.config;
+      ".config/waybar/style.css" = waybar.style;
     };
     packages = builtins.attrValues {
       inherit
@@ -38,7 +43,7 @@
         dunst
         gh
         rofi-wayland
-        amadaluzian-foot
+        foot
         signal-desktop
         dino
         ;