Tue Jun 4 11:11:41 PM CEST 2024

home/Aloria.nix

@@ -29,9 +29,24 @@
     name = "Papirus";
     gtk.iconTheme.package = pkgs.papirus-icon-theme;
   };
-  programs.waybar = { settings = { mainBar = { output = "eDP-1"; }; }; };
+
-  home.file."${config.xdg.configHome}/hypr/card".text =
+  # wayland.windowManager.hyprland.settings.env = ["WLR_DRM_DEVICES,/dev/dri/by-path/pci-0000:01:00.0-card"]; # Nvidia
-  # Intel:  /dev/dri/by-path/pci-0000:00:02.0-card
+  wayland.windowManager.hyprland.settings.env = ["WLR_DRM_DEVICES,/dev/dri/by-path/pci-0000:00:02.0-card"]; # Intel
-  # Nvidia: /dev/dri/by-path/pci-0000:01:00.0-card
+  wayland.windowManager.hyprland.settings = {
-  wayland.windowManager.hyprland.settings.env = ["WLR_DRM_DEVICES,/dev/dri/by-path/pci-0000:00:02.0-card"];
+      monitor = [
+          "eDP-1,1920x1080@144,0x0,1"
+          "HDMI-A-2,1920x1080@60,0x-1080,1"
+      ];
+      bind = [
+        ", XF86PowerOff, exec, ${pkgs.rofi}/bin/rofi -show power-menu -modi power-menu:${
+          ./hyprland/files/rofi-power-menu.sh
+        }"
+      ];
+      general.gaps_out = 1;
+  };
+  programs.waybar.settings.mainBar = {
+      output = "eDP-1";
+      height = 28;
+      margin = "0 0 5 0";
+  };
 }

home/Kell.nix

@@ -29,7 +29,7 @@
     name = "Papirus";
     gtk.iconTheme.package = pkgs.papirus-icon-theme;
   };
-  programs.waybar = { settings = { mainBar = { output = "DP-2"; }; }; };
+  programs.waybar.settings.mainBar = { output = "DP-2"; };
   wayland.windowManager.hyprland.settings = {
       monitor = [
         "DP-3,preferred,0x550,1"
@@ -38,4 +38,20 @@
       ];
       input.kb_options = "compose:rctrl, caps:super, altwin:swap_alt_win";
   };
+  programs.waybar.style = ''
+      * {
+          font-size: 18px;
+          font-weight:400;
+      }
+      #tray {
+          padding: 0 14px;
+          margin-left:4px;
+          margin-right:4px;
+          margin-top:2px;
+          margin-bottom:2px;
+      }
+      #workspaces {
+          margin: 4px 9px;
+      }
+  '';
 }

home/hyprland/default.nix

@@ -143,7 +143,7 @@ in {
       input = {
         kb_layout = "us";
         follow_mouse = 1;
-        kb_options = "compose:rctrl";
+        kb_options = pkgs.lib.mkDefault "compose:rctrl";
         numlock_by_default = true;
       };
       binds = { scroll_event_delay = 1; };

home/waybar/default.nix

@@ -7,7 +7,7 @@
     settings = {
       mainBar = {
         layer = "top";
-        height = 35;
+        height = pkgs.lib.mkDefault 35;
         spacing = 4;
         # output = "DP-2"; # Fill in with host-specific config!
         modules-left = [ "wlr/taskbar" ];
@@ -15,12 +15,11 @@
         modules-right = [
           "tray"
           "wireplumber"
+          "battery"
           "cpu#cpu2"
           "cpu"
           "memory"
-          "custom/updates"
           "temperature"
-          "battery"
           "clock"
           "clock#clock2"
         ];
@@ -64,20 +63,13 @@
           tooltip = false;
           interval = 5;
         };
-        "custom/updates" = {
-          exec = ''bash -c "checkupdates | wc -l"'';
-          on-click = ''
-            alacritty -e bash -c "yay ; echo '
-            Done, press any key to exit...' ; read"'';
-          interval = 60;
-          format = "{}   ";
-        };
         memory = {
           interval = 5;
           format = "{used:0.2f}G";
         };
         temperature = {
           hwmon-path = "/sys/class/hwmon/hwmon2/temp1_input";
+          thermal-zone = 6;
           interval = 5;
           critical-threshold = 80;
           format = "{temperatureC}°C";
@@ -89,17 +81,18 @@
           };
           format = "{icon}";
           tooltip-format = "{capacity}% ({time})";
-          format-plugged = "{capacity}% ";
-          format-alt = "{capacity}% {time} {icon}";
           format-icons = [ " " " " " " " " " " ];
+          format-charging = "{capacity}% ";
+          format-full = "{capacity}% ";
+          format-alt = "{capacity}% {time} [{power:.2} W]";
         };
       };
     };
     style = ''
       * {
           /* `otf-font-awesome` is required to be installed for icons */
-          font-size: 18px;
+          font-size: 14px;
-          font-weight:400;
+          font-weight:500;
           font-family: "Roboto Sans", "FontAwesome";
       }
 
@@ -110,10 +103,6 @@
           transition-duration: .5s;
       }
 
-      /* window#waybar.hidden { */
-      /*     opacity: 0.2; */
-      /* } */
-
       button {
           border: none;
           border-radius: 0;
@@ -161,14 +150,12 @@
       #custom-updates,
       #custom-powermode,
       #tray {
-          padding: 0 14px;
+          padding: 0 12px;
           border-radius: 7px;
           color: #ffffff;
           background-color: #1f2430;
-          margin-left:4px;
+          margin-left:2px;
-          margin-right:4px;
+          margin-right:2px;
-          margin-top:2px;
-          margin-bottom:2px;
       }
 
       #clock.clock2,
@@ -205,10 +192,6 @@
           margin-right:0;
       }
 
-      #workspaces {
-          margin: 4px 9px;
-      }
-
       /* If workspaces is the leftmost module, omit left margin */
       .modules-left > widget:first-child > #workspaces {
           margin-left: 0;

home/zsh/files/keys.zsh

@@ -31,7 +31,11 @@ function find_global() {
         for i in "$search_dirs[@]"; do
             if [ -d $i ]; then
                 PATHS="$PATHS\n$i"
-                PATHS+="\n$(fd . $i -t $file_type -d 8)"
+                if [ "$HOSTNAME" = "Mallorea" ]; then
+                    PATHS+="\n$(fd . $i -t $file_type -d 8)"
+                else
+                    PATHS+="\n$(ssh mallorea fd . $i -t $file_type -d 8)"
+                fi
             fi
         done
         echo -e "$PATHS" > $FZY_CACHE