style: adjust waybar padding

flake.nix

@@ -43,22 +43,19 @@
     }@inputs: rec {
       formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt;
       nixosConfigurations = {
-        nixos = nixpkgs.lib.nixosSystem {
+        demeter = nixpkgs.lib.nixosSystem {
           specialArgs = { inherit inputs; };
           system = "x86_64-linux";
           modules = [
             ./hosts/nixos
-            ./modules/nixos/gaming.nix
+            ./modules/nixos/gaming
-            ./modules/nixos/audio.nix
+            ./modules/nixos/audio
-            ./modules/nixos/networking.nix
+            ./modules/nixos/networking
-            ./modules/common/fonts.nix
+            ./modules/common/fonts
 
             catppuccin.nixosModules.catppuccin
-
             lix-module.nixosModules.default
-
             lanzaboote.nixosModules.lanzaboote
-
             home-manager.nixosModules.home-manager
             {
               home-manager.useGlobalPkgs = true;
@@ -66,11 +63,10 @@
               home-manager.backupFileExtension = "backup";
               home-manager.users.youwen = {
                 imports = [
-                  # ./users/youwen/linux/linux-home.nix
+                  ./users/youwen/linux/desktop
-                  ./users/youwen/linux/desktop.nix
+                  ./users/youwen/linux/packages/x86_64
-                  ./users/youwen/linux/programs.nix
+                  ./users/youwen/linux/programs
-                  ./users/youwen/common/core.nix
+                  ./users/youwen/common
-                  ./users/youwen/linux/catppuccin.nix
                   inputs.catppuccin.homeManagerModules.catppuccin
                 ];
               };

hosts/callisto/default.nix

@@ -23,6 +23,8 @@
     options hid_apple iso_layout=0
   '';
 
+  boot.kernelParams = [ "apple_dcp.show_notch=1" ];
+
   networking.hostName = "callisto"; # Define your hostname.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 

hosts/nixos/default.nix

@@ -13,29 +13,22 @@
   boot.loader = {
     efi.canTouchEfiVariables = true;
     timeout = 15;
-    systemd-boot = {
-      enable = true;
-      consoleMode = "auto";
-    };
-  };
-
-  environment.systemPackages = [
-    # For debugging and troubleshooting Secure Boot.
-    pkgs.sbctl
-  ];
-
     # Lanzaboote currently replaces the systemd-boot module.
     # This setting is usually set to true in configuration.nix
     # generated at installation time. So we force it to false
     # for now.
-  boot.loader.systemd-boot.enable = lib.mkForce false;
+    systemd-boot = {
+      enable = false;
+      consoleMode = "auto";
+    };
+  };
 
   boot.lanzaboote = {
     enable = true;
     pkiBundle = "/etc/secureboot";
   };
 
-  networking.hostName = "nixos"; # Define your hostname.
+  networking.hostName = "demeter"; # Define your hostname.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
   # select kernel

users/youwen/common/default.nix

@@ -1,3 +1 @@
-{
+{ imports = [ ./core.nix ]; }
-  imports = [ ./core.nix ];
-}

users/youwen/darwin/darwin-home.nix

@@ -19,7 +19,7 @@
   #     xxx
   # '';
 
-  home.file.".config/neofetch/config.conf".source = ../common/neofetch.conf
+  home.file.".config/neofetch/config.conf".source = ../common/neofetch.conf;
 
   # Packages that should be installed to the user profile.
   home.packages = with pkgs; [

users/youwen/linux/desktop/default.nix

@@ -1,4 +1,10 @@
 {
-  imports = [ ../theming ../home.nix ../programs ../hyprland/desktop ../waybar ];
+  imports = [
+    ../theming
+    ../home.nix
+    ../programs
+    ../hyprland/desktop
+    ../waybar/desktop
+  ];
 }
 

users/youwen/linux/hyprland/desktop/default.nix

@@ -1,3 +1 @@
-{
+{ imports = [ ../common.nix ]; }
-  imports = [ ../common.nix ./desktop-only.nix ];
-}

users/youwen/linux/hyprland/desktop/desktop-only.nix

@@ -1 +0,0 @@
-{ }

users/youwen/linux/hyprland/laptop/default.nix

@@ -1,3 +1,18 @@
+{ lib, ... }:
 { 
-  imports = [ ../common.nix ./laptop-only.nix ];
+  imports = [ ../common.nix ]; 
+  wayland.windowManager.hyprland.settings.input.touchpad = {
+    natural_scroll = true;
+    disable_while_typing = true;
+    clickfinger_behavior = true;
+    tap-to-click = false;
+    scroll_factor = 0.5;
+  };
+  wayland.windowManager.hyprland.settings.general.sensitivity = lib.mkForce 1.0;
+  wayland.windowManager.hyprland.settings.env = [
+    "HYPRCURSOR_THEME,Bibata-Modern-Ice"
+    "HYPRCURSOR_SIZE,24"
+    "XCURSOR_THEME,Bibata-Modern-Ice"
+    "XCURSOR_SIZE,24"
+  ];
 }

users/youwen/linux/hyprland/laptop/laptop-only.nix

@@ -1 +0,0 @@
-{ }

users/youwen/linux/laptop/default.nix

@@ -1,4 +1,5 @@
 {
-  imports = [ ../theming ../home.nix ../programs ../hyprland/laptop ../waybar ];
+  imports =
+    [ ../theming ../home.nix ../programs ../hyprland/laptop ../waybar/laptop ];
 }
 

users/youwen/linux/packages/common-packages.nix

@@ -1,4 +1,5 @@
-pkgs: with pkgs; [
+pkgs:
+with pkgs; [
   neofetch
 
   # archives

users/youwen/linux/packages/x86_64/default.nix

@@ -1,10 +1,12 @@
 { pkgs, ... }:
 let createCommon = import ../common-packages.nix;
-in { home.packages = ((createCommon pkgs) ++ with pkgs; [
+in {
+  home.packages = ((createCommon pkgs) ++ (with pkgs; [
     spotify
     bitwarden-desktop
     modrinth-app
     lutris
     wine
-]);
+    sbctl
+  ]));
 }

users/youwen/linux/theming/default.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }: {
-{
   imports = [ ./catppuccin.nix ];
 
   gtk = {

users/youwen/linux/waybar/laptop/default.nix

@@ -0,0 +1,93 @@
+{
+  programs.waybar = {
+    enable = true;
+    settings = {
+      mainBar = {
+        layer = "top";
+        position = "top";
+        height = 24;
+        # width = 1000;
+        reload-style-on-change = true;
+        margin = "5px 0px 0px 0px";
+        modules-left =
+          [ "hyprland/window" "hyprland/workspaces" "network" "clock" ];
+        modules-right =
+          [ "group/hardware" "backlight" "group/adjustable" "custom/weather" ];
+        # modules-center = [ "network" "group/hardware" "clock" ];
+        "hyprland/workspaces" = {
+          active-only = false;
+          all-outputs = false;
+          format = "{icon}";
+          persistent-workspaces = {
+            eDP-1 = [ 1 ];
+            DP-1 = [ 2 3 4 5 ];
+          };
+        };
+        "group/hardware" = {
+          orientation = "inherit";
+          modules = [ "cpu" "battery" ];
+        };
+        "group/adjustable" = {
+          orientation = "inherit";
+          drawer = {
+            transition-duration = 500;
+            transition-left-to-right = true;
+          };
+          modules = [ "pulseaudio" "mpris" ];
+        };
+        "custom/weather" = {
+          orientation = "horizontal";
+          exec = ''curl wttr.in/?format="%l:%20%t"'';
+          interval = 10;
+        };
+        cpu = {
+          interval = 10;
+          format = "{usage}%  ";
+        };
+        memory = {
+          interval = 10;
+          format = "{percentage}%  ";
+        };
+        # mpris = {
+        #   format-playing = "    {title}  ";
+        #   format-paused = " 󰏤 {title}  ";
+        #   format-stopped = "Nothing Playing";
+        # };
+        tray = { spacing = 10; };
+        clock = { format = "{:%a %b %d, %I:%M %p} "; };
+        backlight = {
+          device = "intel_backlight";
+          format = "{percent}% {icon}";
+          format-icons = [ "󰃞" "󰃠" ];
+        };
+        battery = {
+          states = {
+            good = 95;
+            warning = 20;
+            critical = 10;
+          };
+          format = "{capacity}% {icon}";
+          format-icons = [ "󰁻" "󰁽" "󰁿" "󰂀" "󰁹" ];
+        };
+        "hyprland/window" = { format = "{class}"; };
+        network = {
+          format-wifi = "{essid} ";
+          format-linked = "{ifname} (No IP) ";
+          format-disconnected = "Disconnected ⚠";
+          format-alt = "{ifname}: {ipaddr}/{cidr}";
+        };
+        pulseaudio = {
+          format = "{volume}% {icon}  {format_source}";
+          format-bluetooth = "{volume}% {icon}  {format_source}";
+          format-bluetooth-muted = " {icon} {format_source}";
+          format-muted = " {format_source}";
+          format-source = "{volume}% ";
+          format-source-muted = "";
+          format-icons = { default = [ "" "" "" ]; };
+        };
+      };
+    };
+    style = ./waybar.css;
+    systemd.enable = true;
+  };
+}

users/youwen/linux/waybar/laptop/waybar.css

@@ -0,0 +1,108 @@
+* {
+  font-size: 12px;
+}
+
+window#waybar {
+  border-bottom: 0px solid #ffffff;
+  background: transparent;
+  transition-property: none;
+  transition-duration: 0s;
+}
+
+#workspaces {
+  background: #24273a;
+  padding: 0px 5px 0px 5px;
+  margin: 0px 0px 0px 2px;
+  border-radius: 5px;
+}
+
+#workspaces {
+  background: #24273a;
+  padding: 0px 5px 0px 5px;
+  margin: 0px 0px 0px 2px;
+  border-radius: 5px;
+}
+
+#workspaces button,
+#workspaces button:hover {
+  padding: 0;
+  background-color: #24273a;
+  /* color: @color4; */
+}
+#workspaces button.active,
+#workspaces button:hover {
+  /* color: @color8; */
+}
+
+#clock,
+#pulseaudio,
+#network,
+#battery,
+#tray,
+#mpris,
+#cpu,
+#memory,
+#temperature,
+#custom-weather,
+#window,
+#backlight {
+  background-color: #24273a;
+  /* color: @color4; */
+  opacity: 1;
+  border-radius: 5px;
+  padding: 1px 10px 1px 10px;
+  margin: 0px 5px 0px 0px;
+}
+#backlight {
+  margin-right: 0px;
+  padding-right: 3px;
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+}
+#network {
+  margin-left: 15px;
+  padding-right: 15px;
+}
+#mpris {
+  padding-left: 0px;
+  margin-left: 0px;
+  margin-right: 5px;
+  padding-right: 0px;
+}
+#pulseaudio {
+  padding-left: 5px;
+  padding-right: 5px;
+  margin-left: 0px;
+  margin-right: 5px;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+}
+#memory,
+#cpu {
+  padding-right: 2px;
+  border-top-right-radius: 0px; 
+  border-bottom-right-radius: 0px; 
+  border-right-width: 0px; 
+}
+#memory,
+#battery {
+  margin-left: 0px;
+  padding-left: 2px;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+  border-left-width: 0px;
+}
+#cpu {
+  margin-right: 0px;
+}
+#battery {
+  padding-right: 13px;
+}
+#custom-weather {
+  margin-right: 10px;
+}
+
+#window {
+  margin-right: 10px;
+  margin-left: 10px;
+}