fix(ags): set margins

flake.nix

@@ -86,6 +86,21 @@
         };
         modules = [ ./host/Eclipse/configuration.nix ];
       };
+
+      Impreza = nixpkgs.lib.nixosSystem {
+        specialArgs = {
+          pkgs-stable = import nixpkgs-stable {
+            inherit system;
+            config.allowUnfree = true;
+          };
+          pkgs-fixed = import nixpkgs-fixed {
+            inherit system;
+            config.allowUnfree = true;
+          };
+          inherit inputs system;
+        };
+        modules = [ ./host/Impreza/configuration.nix ];
+      };
     };
 
     devShells."${system}".default = let

host/Impreza/configuration.nix

@@ -0,0 +1,27 @@
+{ config, pkgs, pkgs-stable, pkgs-fixed, lib, inputs, ...}: {
+  imports = [
+    ./secrets/secrets.nix
+    ./modules/grub.nix
+
+    (import ../modules/common.nix {
+      inherit lib;
+      inherit inputs;
+      hostname = "Impreza";
+    })
+
+    (import ../../user/common.nix {
+      inherit config;
+      inherit pkgs;
+      inherit pkgs-stable;
+      inherit pkgs-fixed;
+      inherit lib;
+      inherit inputs;
+      name = "chest";
+    })
+  ];
+
+  nixpkgs.config.allowBroken = true;
+  programs.gamemode.enable = true;
+  hardware.bluetooth.enable = true;
+  host.laptop = true;
+}

host/Impreza/hardware-configuration.nix

@@ -0,0 +1,44 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/34e32809-6876-4361-95d8-70a479ea8e19";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/2B65-0D2E";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
+
+    fileSystems."/mnt/D" = {
+    device = "/dev/disk/by-uuid/E030A4DF30A4BDC2";
+    fsType = "ntfs";
+    options = ["umask=0022" "gid=100" "uid=1002"];
+  };
+
+  swapDevices = [ ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

host/Impreza/modules/grub.nix

@@ -0,0 +1,13 @@
+{ pkgs, ... }: let
+   theme = pkgs.fetchFromGitHub {
+    owner = "OliveThePuffin";
+    repo = "yorha-grub-theme";
+    rev = "4d9cd37baf56c4f5510cc4ff61be278f11077c81";
+    hash = "sha256-XVzYDwJM7Q9DvdF4ZOqayjiYpasUeMhAWWcXtnhJ0WQ=";
+   };
+in {
+  boot.loader.grub = {
+    gfxmodeEfi = "1920x1080";
+    theme = "${theme}/yorha-1920x1080";
+  };
+}

host/Impreza/secrets

@@ -0,0 +1 @@
+../Eclipse/secrets

modules/user/packages/drvs/ags/.gitignore

@@ -0,0 +1,2 @@
+accent.css
+colors.scss

modules/user/packages/drvs/ags/style.scss

@@ -3,17 +3,23 @@
 
 $radius: 10px;
 
-%item {
+* {
     all: unset;
+}
+
+%item {
     background: $bg;
     border-radius: $radius;
-    padding: 4px;
+    padding: 6px 8px;
 
-    & + &, .item + & { margin-left: 4px; }
+    & + &, .item + &, & + .item  { margin-left: 4px; }
 
-    label { margin: 0 8px; }
+    icon + label { margin-left: 4px; }
 }
 
+.item + .item { margin-left: 4px; }
+
+
 window.Bar {
     border: none;
     box-shadow: none;
@@ -28,8 +34,6 @@ window.Bar {
 
     .Workspaces  {
         button {
-            all: unset;
-
             &:hover label {
                 background: $surface0;
                 color: $accent;
@@ -59,12 +63,12 @@ window.Bar {
     .Layout.en { color: $accent; }
 
     .SysTray button {
-        all: unset;
+        padding: 4px;
-        padding: 8px;
         border-radius: inherit;
 
         &:hover {
             background: $surface0;
+            border-radius: 4px;
         }
     }
 
@@ -82,16 +86,17 @@ window.Bar {
         }
     }
 
-    .Battery label {
-        padding-left: 0;
-        margin-left: 0;
-    }
-
-    .Time { padding: 0 8px; }
-
-    .AudioSlider icon { margin-left: 8px; }
-
     .Workspaces, .Wifi, .Layout, .Media, .SysTray, .AudioSlider, .Battery, .Time {
         @extend %item;
     }
+
+    .Wifi, .AudioSlider {
+        &, button {
+            &:hover { background-color: $surface0; }
+            &:active {
+                background-color: $accent;
+                color: $bg;
+            }
+        }
+    }
 }

modules/user/packages/drvs/ags/widget/elements/Wifi.tsx

@@ -6,7 +6,9 @@ export default function Wifi() {
     const network = Network.get_default()
     const wifi = bind(network, "wifi")
 
-    return <box visible={wifi.as(Boolean)}>
+    return <box
+            visible={wifi.as(Boolean)}
+            className="item">
         {wifi.as(wifi => wifi && (
             <button
                 className="Wifi"

user/chest/modules/style.nix

@@ -23,7 +23,7 @@
 
     cursor = {
       name = "catppuccin-mocha-peach-cursors";
-      size = 24;
+      size = 16;
       package = pkgs.catppuccin-cursors.mochaPeach;
     };