-
-
Notifications
You must be signed in to change notification settings - Fork 28
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
14 changed files
with
335 additions
and
461 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,5 +6,6 @@ | |
| ./dunst.nix | ||
| ./gtk.nix | ||
| ./hyprland | ||
| ./waybar | ||
| ]; | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,219 +1,131 @@ | ||
| { | ||
| pkgs, | ||
| lib, | ||
| config, | ||
| theme, | ||
| ... | ||
| }: let | ||
| mullvad-status = | ||
| pkgs.writeShellScriptBin "mullvad-status" | ||
| '' | ||
| #!/bin/sh | ||
| mullvad status | awk '{print $1;}' | ||
| { pkgs, lib, ... }: | ||
| with lib; | ||
| let | ||
| waybar-wttr = pkgs.stdenv.mkDerivation { | ||
| name = "waybar-wttr"; | ||
| buildInputs = [ | ||
| (pkgs.python39.withPackages | ||
| (pythonPackages: with pythonPackages; [ requests ])) | ||
| ]; | ||
| unpackPhase = "true"; | ||
| installPhase = '' | ||
| mkdir -p $out/bin | ||
| cp ${./waybar-wttr.py} $out/bin/waybar-wttr | ||
| chmod +x $out/bin/waybar-wttr | ||
| ''; | ||
| }; | ||
|
|
||
| in { | ||
| xdg.configFile."waybar/style.css".text = import ./style.nix {inherit theme;}; | ||
| programs.waybar = { | ||
| enable = true; | ||
| package = pkgs.waybar; | ||
| settings = { | ||
| mainBar = { | ||
| layer = "top"; | ||
| position = "top"; | ||
| height = 38; | ||
| spacing = 6; | ||
| fixed-center = false; | ||
| margin-left = null; | ||
| margin-top = null; | ||
| margin-bottom = null; | ||
| margin-right = null; | ||
| exclusive = true; | ||
| modules-left = [ | ||
| "custom/search" | ||
| "hyprland/workspaces" | ||
| "custom/lock" | ||
| "backlight" | ||
| "battery" | ||
| ]; | ||
| modules-right = ["cpu" "memory" "custom/weather" "pulseaudio" "network" "clock" "custom/power"]; | ||
| "hyprland/workspaces" = { | ||
|
|
||
| xdg.configFile."waybar/style.css".text = import ./style.nix; | ||
| home.packages = [ waybar-wttr ]; | ||
| programs.waybar = { | ||
| enable = true; | ||
| settings = { | ||
| mainBar = { | ||
| layer = "top"; | ||
| position = "left"; | ||
| width = 57; | ||
| spacing = 7; | ||
| modules-left = [ | ||
| "custom/search" | ||
| "hyprland/workspaces" | ||
| "custom/lock" | ||
| "custom/weather" | ||
| "backlight" | ||
| "battery" | ||
| ]; | ||
| modules-center = [ ]; | ||
| modules-right = [ "pulseaudio" "network" "clock" "custom/power" ]; | ||
| "hyprland/workspaces" = { | ||
| on-click = "activate"; | ||
| format = "{icon}"; | ||
| active-only = false; | ||
| format-icons = { | ||
| "1" = ""; | ||
| "2" = ""; | ||
| "3" = ""; | ||
| "4" = ""; | ||
| "5" = ""; | ||
| "6" = ""; | ||
| "7" = ""; | ||
| "8" = ""; | ||
| "9" = ""; | ||
| "10" = ""; | ||
| "1" = "一"; | ||
| "2" = "二"; | ||
| "3" = "三"; | ||
| "4" = "四"; | ||
| "5" = "五"; | ||
| "6" = "六"; | ||
| "7" = "七"; | ||
| "8" = "八"; | ||
| "9" = "九"; | ||
| "10" = "十"; | ||
| }; | ||
|
|
||
| persistent_workspaces = { | ||
| "*" = 5; | ||
| }; | ||
| }; | ||
| "custom/search" = { | ||
| format = " "; | ||
| tooltip = false; | ||
| on-click = "sh -c 'run-as-service $(tofi-drun)'"; | ||
| }; | ||
| }; | ||
| "custom/search" = { | ||
| format = " "; | ||
| tooltip = false; | ||
| on-click = "killall rofi || rofi -show drun"; | ||
| }; | ||
|
|
||
| "custom/weather" = let | ||
| weather = pkgs.stdenv.mkDerivation { | ||
| name = "waybar-wttr"; | ||
| buildInputs = [ | ||
| (pkgs.python39.withPackages | ||
| (pythonPackages: with pythonPackages; [requests pyquery])) | ||
| ]; | ||
| unpackPhase = "true"; | ||
| installPhase = '' | ||
| mkdir -p $out/bin | ||
| cp ${./weather.py} $out/bin/weather | ||
| chmod +x $out/bin/weather | ||
| ''; | ||
| "custom/weather" = { | ||
| format = "{}"; | ||
| tooltip = true; | ||
| interval = 3600; | ||
| exec = "waybar-wttr"; | ||
| return-type = "json"; | ||
| }; | ||
| in { | ||
| format = "{}"; | ||
| tooltip = true; | ||
| interval = 30; | ||
| exec = "${weather}/bin/weather"; | ||
| return-type = "json"; | ||
| }; | ||
| "custom/crypto" = let | ||
| crypto = pkgs.stdenv.mkDerivation { | ||
| name = "waybar-wttr"; | ||
| buildInputs = [ | ||
| (pkgs.python39.withPackages | ||
| (pythonPackages: with pythonPackages; [requests])) | ||
| ]; | ||
| unpackPhase = "true"; | ||
| installPhase = '' | ||
| mkdir -p $out/bin | ||
| cp ${./crypto.py} $out/bin/crypto | ||
| chmod +x $out/bin/crypto | ||
| ''; | ||
| "custom/lock" = { | ||
| tooltip = false; | ||
| on-click = "sh -c '(sleep 0.5s; swaylock)' & disown"; | ||
| format = ""; | ||
| }; | ||
| in { | ||
| format = "{}"; | ||
| tooltip = true; | ||
| interval = 30; | ||
| exec = "${crypto}/bin/crypto"; | ||
| return-type = "json"; | ||
| }; | ||
| "custom/vpn" = { | ||
| format = " VPN {}"; | ||
| tooltip = true; | ||
| interval = 1; | ||
| exec = "${lib.getBin mullvad-status}/mullvad-status"; | ||
| }; | ||
| "custom/lock" = { | ||
| tooltip = false; | ||
| on-click = "sh -c '(sleep 0.5s; ${pkgs.gtklock}/bin/gtklock)' & disown"; | ||
| format = ""; | ||
| }; | ||
| "custom/swallow" = { | ||
| tooltip = false; | ||
| on-click = let | ||
| hyprctl = config.wayland.windowManager.hyprland.package + "/bin/hyprctl"; | ||
| notify-send = pkgs.libnotify + "/bin/notify-send"; | ||
| rg = pkgs.ripgrep + "/bin/rg"; | ||
| in | ||
| pkgs.writeShellScript "waybar-swallow" '' | ||
| #!/bin/sh | ||
| if ${hyprctl} getoption misc:enable_swallow | ${rg}/bin/rg -q "int: 1"; then | ||
| ${hyprctl} keyword misc:enable_swallow false >/dev/null && | ||
| ${notify-send} "Hyprland" "Turned off swallowing" | ||
| else | ||
| ${hyprctl} keyword misc:enable_swallow true >/dev/null && | ||
| ${notify-send} "Hyprland" "Turned on swallowing" | ||
| fi | ||
| ''; | ||
| format = ""; | ||
| }; | ||
| "custom/power" = { | ||
| tooltip = false; | ||
| # TODO | ||
| format = ""; | ||
| }; | ||
| clock = { | ||
| format = "{:%H:%M}"; | ||
| tooltip-format = '' | ||
| <big>{:%Y %B}</big> | ||
| <tt><small>{calendar}</small></tt>''; | ||
| calendar = { | ||
| mode = "year"; | ||
| mode-mon-col = 3; | ||
| weeks-pos = "right"; | ||
| on-scroll = 1; | ||
| on-click-right = "mode"; | ||
| format = { | ||
| months = "<span color='#f5c2e7'><b>{}</b></span>"; | ||
| days = "<span color='#cdd6f4'><b>{}</b></span>"; | ||
| weeks = "<span color='#cba6f7'><b>T{:%U}</b></span>"; | ||
| weekdays = "<span color='#eba0ac'><b>{}</b></span>"; | ||
| today = "<span color='#a6e3a1'><b><u>{}</u></b></span>"; | ||
| }; | ||
| actions = { | ||
| on-click-right = "mode"; | ||
| on-click-forward = "tz_up"; | ||
| on-click-backward = "tz_down"; | ||
| on-scroll-up = "shift_up"; | ||
| on-scroll-down = "shift_down"; | ||
| }; | ||
| "custom/power" = { | ||
| tooltip = false; | ||
| on-click = "wlogout &"; | ||
| format = ""; | ||
| }; | ||
| }; | ||
| backlight = { | ||
| format = "{icon} {percent}%"; | ||
| format-icons = ["" "" "" "" "" "" "" "" ""]; | ||
| }; | ||
| memory = { | ||
| interval = 2; | ||
| format = " {}%"; | ||
| max-length = 10; | ||
| }; | ||
| cpu = { | ||
| interval = 2; | ||
| format = " {}%"; | ||
| max-length = 10; | ||
| }; | ||
| battery = { | ||
| clock = { | ||
| format = '' | ||
| {:%H | ||
| %M}''; | ||
| tooltip-format = '' | ||
| <big>{:%Y %B}</big> | ||
| <tt><small>{calendar}</small></tt>''; | ||
| }; | ||
| backlight = { | ||
| format = "{icon}"; | ||
| format-icons = [ "" "" "" "" "" "" "" "" "" ]; | ||
| }; | ||
| battery = { | ||
| states = { | ||
| warning = 30; | ||
| critical = 15; | ||
| }; | ||
| format = "{icon} {capacity}% {power}"; | ||
| format-charging = "{icon} {capacity}% {power}"; | ||
| format-alt = "{icon} {capacity}%"; | ||
| format = "{icon}"; | ||
| format-charging = "{icon}\n"; | ||
| tooltip-format = "{timeTo} {capacity}% {power}"; | ||
| format-icons = ["" "" "" "" "" "" "" "" "" "" ""]; | ||
| }; | ||
| network = let | ||
| nm-editor = "${pkgs.networkmanagerapplet}/bin/nm-connection-editor"; | ||
| in { | ||
| format-wifi = " {signalStrength}%"; | ||
| format-ethernet = ""; | ||
| format-alt = ""; | ||
| format-disconnected = ""; | ||
| tooltip-format = "{ipaddr}/{ifname} via {gwaddr} ({signalStrength}%)"; | ||
| on-click-right = "${nm-editor}"; | ||
| }; | ||
| pulseaudio = { | ||
| network = { | ||
| format-wifi = ""; | ||
| format-ethernet = ""; | ||
| format-alt = ""; | ||
| format-disconnected = ""; | ||
| tooltip-format = | ||
| "{ipaddr}/{ifname} via {gwaddr} ({signalStrength}%)"; | ||
| }; | ||
| pulseaudio = { | ||
| scroll-step = 5; | ||
| tooltip = true; | ||
| tooltip-format = "{volume}% {format_source}"; | ||
| on-click = "${pkgs.killall}/bin/killall pavucontrol || ${pkgs.pavucontrol}/bin/pavucontrol"; | ||
| format = "{icon} {volume}%"; | ||
| format = " {icon}\n{volume}%"; | ||
| format-bluetooth = " {icon} {volume}%"; | ||
| format-muted = " "; | ||
| format-icons = { | ||
| default = ["" "" " "]; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.