From 30c546b57fb6a2dbfcb847a6357809cfd76988d4 Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Mon, 20 May 2024 11:41:01 +0200 Subject: [PATCH] Improve wrapper structure --- wrappers/bottom.nix | 5 +- wrappers/default.nix | 4 +- wrappers/hyprlock.nix | 23 ------ wrappers/hyprlock/default.nix | 11 +++ wrappers/hyprlock/hyprlock.conf | 9 +++ wrappers/hyprpaper.nix | 17 ----- wrappers/hyprpaper/default.nix | 11 +++ wrappers/hyprpaper/hyprpaper.conf | 3 + wrappers/kitty.nix | 45 ------------ wrappers/kitty/default.nix | 27 +++++++ wrappers/kitty/kitty.conf | 6 ++ wrappers/marktext.nix | 5 +- wrappers/obsidian.nix | 5 +- wrappers/rofi/default.nix | 10 ++- wrappers/spotify.nix | 5 +- wrappers/waybar.nix | 114 ------------------------------ wrappers/waybar/config.jsonc | 58 +++++++++++++++ wrappers/waybar/default.nix | 13 ++++ wrappers/waybar/style.css | 6 ++ wrappers/webcord.nix | 5 +- 20 files changed, 170 insertions(+), 212 deletions(-) delete mode 100644 wrappers/hyprlock.nix create mode 100644 wrappers/hyprlock/default.nix create mode 100644 wrappers/hyprlock/hyprlock.conf delete mode 100644 wrappers/hyprpaper.nix create mode 100644 wrappers/hyprpaper/default.nix create mode 100644 wrappers/hyprpaper/hyprpaper.conf delete mode 100644 wrappers/kitty.nix create mode 100644 wrappers/kitty/default.nix create mode 100644 wrappers/kitty/kitty.conf delete mode 100644 wrappers/waybar.nix create mode 100644 wrappers/waybar/config.jsonc create mode 100644 wrappers/waybar/default.nix create mode 100644 wrappers/waybar/style.css diff --git a/wrappers/bottom.nix b/wrappers/bottom.nix index 762f12e..81f65c0 100644 --- a/wrappers/bottom.nix +++ b/wrappers/bottom.nix @@ -1,4 +1,7 @@ -{ assembleWrapper, pkgs, ... }: +{ assembleWrapper, moduleArgs, ... }: +let + inherit (moduleArgs) pkgs; +in assembleWrapper { basePackage = pkgs.bottom; flags = [ "--group" ]; diff --git a/wrappers/default.nix b/wrappers/default.nix index 5c4bbee..530c3e6 100644 --- a/wrappers/default.nix +++ b/wrappers/default.nix @@ -3,7 +3,7 @@ pkgs, lib, ... -}: +}@moduleArgs: let assembleWrapper = wrapperConfig: @@ -17,7 +17,7 @@ in (lib.filterAttrs (name: value: name != "default.nix")) (lib.concatMapAttrs ( name: _: { - ${lib.removeSuffix ".nix" name} = import ./${name} { inherit assembleWrapper pkgs lib; }; + ${lib.removeSuffix ".nix" name} = import ./${name} { inherit assembleWrapper moduleArgs; }; } )) ]; diff --git a/wrappers/hyprlock.nix b/wrappers/hyprlock.nix deleted file mode 100644 index db1b4f4..0000000 --- a/wrappers/hyprlock.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ assembleWrapper, pkgs, ... }: -assembleWrapper { - basePackage = pkgs.hyprlock; - - flags = - let - hyprlock-config = pkgs.writeText "hyprlock-config" '' - background { - monitor = - path = screenshot - blur_size = 4 - blur_passes = 1 - } - input-field { - monitor = - } - ''; - in - [ - "--config" - hyprlock-config - ]; -} diff --git a/wrappers/hyprlock/default.nix b/wrappers/hyprlock/default.nix new file mode 100644 index 0000000..db9645a --- /dev/null +++ b/wrappers/hyprlock/default.nix @@ -0,0 +1,11 @@ +{ assembleWrapper, moduleArgs, ... }: +let + inherit (moduleArgs) pkgs; +in +assembleWrapper { + basePackage = pkgs.hyprlock; + flags = [ + "--config" + ./hyprlock.conf + ]; +} diff --git a/wrappers/hyprlock/hyprlock.conf b/wrappers/hyprlock/hyprlock.conf new file mode 100644 index 0000000..4819188 --- /dev/null +++ b/wrappers/hyprlock/hyprlock.conf @@ -0,0 +1,9 @@ +background { + monitor = + path = screenshot + blur_size = 4 + blur_passes = 1 +} +input-field { + monitor = +} \ No newline at end of file diff --git a/wrappers/hyprpaper.nix b/wrappers/hyprpaper.nix deleted file mode 100644 index 0c4b62b..0000000 --- a/wrappers/hyprpaper.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ assembleWrapper, pkgs, ... }: -assembleWrapper { - basePackage = pkgs.hyprpaper; - - flags = - let - hyprpaper-config = pkgs.writeText "hyprpaper-config" '' - preload = ~/Pictures/.wallpaper - wallpaper = , ~/Pictures/.wallpaper - splash = false - ''; - in - [ - "--config" - hyprpaper-config - ]; -} diff --git a/wrappers/hyprpaper/default.nix b/wrappers/hyprpaper/default.nix new file mode 100644 index 0000000..5634ea0 --- /dev/null +++ b/wrappers/hyprpaper/default.nix @@ -0,0 +1,11 @@ +{ assembleWrapper, moduleArgs, ... }: +let + inherit (moduleArgs) pkgs; +in +assembleWrapper { + basePackage = pkgs.hyprpaper; + flags = [ + "--config" + ./hyprpaper.conf + ]; +} diff --git a/wrappers/hyprpaper/hyprpaper.conf b/wrappers/hyprpaper/hyprpaper.conf new file mode 100644 index 0000000..20d7e77 --- /dev/null +++ b/wrappers/hyprpaper/hyprpaper.conf @@ -0,0 +1,3 @@ +preload = ~/Pictures/.wallpaper +wallpaper = , ~/Pictures/.wallpaper +splash = false \ No newline at end of file diff --git a/wrappers/kitty.nix b/wrappers/kitty.nix deleted file mode 100644 index 0e66530..0000000 --- a/wrappers/kitty.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - assembleWrapper, - pkgs, - lib, - ... -}: -{ - theme ? "dark", -}: -assembleWrapper { - basePackage = pkgs.kitty; - - flags = - let - toKittyConfig = lib.generators.toKeyValue { - mkKeyValue = - key: value: - let - value' = (if lib.isBool value then lib.hm.booleans.yesNo value else toString value); - in - "${key} ${value'}"; - }; - kitty-config = pkgs.writeText "kitty-config" (toKittyConfig { - font_family = "JetBrainsMono Nerd Font"; - confirm_os_window_close = 0; - background_opacity = "0.85"; - enable_audio_bell = false; - update_check_interval = 0; - cursor_shape = "beam"; - }); - kitty-theme = pkgs.writeText "kitty-theme" "include ${pkgs.kitty-themes}/share/kitty-themes/themes/${ - { - dark = "default.conf"; - light = "GitHub_Light.conf"; - } - .${theme} - }"; - in - [ - "--config" - kitty-config - "--config" - kitty-theme - ]; -} diff --git a/wrappers/kitty/default.nix b/wrappers/kitty/default.nix new file mode 100644 index 0000000..4232dd5 --- /dev/null +++ b/wrappers/kitty/default.nix @@ -0,0 +1,27 @@ +{ assembleWrapper, moduleArgs, ... }: +let + inherit (moduleArgs) pkgs; +in +{ + theme ? "dark", +}: +assembleWrapper { + basePackage = pkgs.kitty; + + flags = + let + theme-file = + { + dark = "default.conf"; + light = "GitHub_Light.conf"; + } + .${theme}; + kitty-theme = pkgs.writeText "kitty-theme" "include ${pkgs.kitty-themes}/share/kitty-themes/themes/${theme-file}}"; + in + [ + "--config" + ./kitty.conf + "--config" + kitty-theme + ]; +} diff --git a/wrappers/kitty/kitty.conf b/wrappers/kitty/kitty.conf new file mode 100644 index 0000000..7adedd9 --- /dev/null +++ b/wrappers/kitty/kitty.conf @@ -0,0 +1,6 @@ +font_family JetBrainsMono Nerd Font +background_opacity 0.85 +cursor_shape beam +confirm_os_window_close 0 +enable_audio_bell no +update_check_interval 0 \ No newline at end of file diff --git a/wrappers/marktext.nix b/wrappers/marktext.nix index 874c7df..8b05749 100644 --- a/wrappers/marktext.nix +++ b/wrappers/marktext.nix @@ -1,4 +1,7 @@ -{ assembleWrapper, pkgs, ... }: +{ assembleWrapper, moduleArgs, ... }: +let + inherit (moduleArgs) pkgs; +in assembleWrapper { basePackage = pkgs.marktext; flags = [ "--disable-gpu" ]; diff --git a/wrappers/obsidian.nix b/wrappers/obsidian.nix index 7fe36e0..1772fc7 100644 --- a/wrappers/obsidian.nix +++ b/wrappers/obsidian.nix @@ -1,4 +1,7 @@ -{ assembleWrapper, pkgs, ... }: +{ assembleWrapper, moduleArgs, ... }: +let + inherit (moduleArgs) pkgs; +in assembleWrapper { basePackage = pkgs.obsidian; flags = [ "--disable-gpu" ]; diff --git a/wrappers/rofi/default.nix b/wrappers/rofi/default.nix index 55cd0de..cbf9082 100644 --- a/wrappers/rofi/default.nix +++ b/wrappers/rofi/default.nix @@ -1,9 +1,7 @@ -{ - assembleWrapper, - pkgs, - lib, - ... -}: +{ assembleWrapper, moduleArgs, ... }: +let + inherit (moduleArgs) pkgs; +in { theme ? "dark", }: diff --git a/wrappers/spotify.nix b/wrappers/spotify.nix index bbd4084..89fb8c9 100644 --- a/wrappers/spotify.nix +++ b/wrappers/spotify.nix @@ -1,4 +1,7 @@ -{ assembleWrapper, pkgs, ... }: +{ assembleWrapper, moduleArgs, ... }: +let + inherit (moduleArgs) pkgs; +in assembleWrapper { basePackage = pkgs.spotify; flags = [ "--disable-gpu" ]; diff --git a/wrappers/waybar.nix b/wrappers/waybar.nix deleted file mode 100644 index 53410a8..0000000 --- a/wrappers/waybar.nix +++ /dev/null @@ -1,114 +0,0 @@ -{ assembleWrapper, pkgs, ... }: -assembleWrapper { - basePackage = pkgs.waybar; - - flags = - let - waybar-config = (pkgs.formats.json { }).generate "waybar-config" { - layer = "top"; - position = "bottom"; - spacing = 10; - - modules-left = [ "clock" ]; - modules-center = [ "hyprland/workspaces" ]; - modules-right = [ - "tray" - "network" - "wireplumber" - "backlight" - "battery" - ]; - - "hyprland/workspaces" = { - active-only = false; - all-outputs = true; - }; - - clock = { - format = " {:%H.%M}"; - tooltip-format = "{:%d.%m.%Y}"; - }; - - network = { - interval = 10; - format = ""; - - format-wifi = "{icon}"; - format-icons = [ - "󰤟" - "󰤢" - "󰤥" - "󰤨" - ]; - tooltip-format-wifi = "{essid} 󰇚 {bandwidthDownBits} 󰕒 {bandwidthUpBits}"; - - format-ethernet = "󰌗"; - tooltip-format-ethernet = "󰇚 {bandwidthDownBits} 󰕒 {bandwidthUpBits}"; - - format-disconnected = "󰪎"; - tooltip-format-disconnected = "Disconnected"; - }; - - wireplumber = { - format = "{icon} {volume}%"; - format-muted = "󰝟"; - format-icons = [ - "󰕿" - "󰖀" - "󰕾" - ]; - scroll-step = "5"; - }; - - tray = { - icon-size = 20; - spacing = 6; - }; - - backlight = { - device = "amdgpu_bl1"; - format = "{icon} {percent}%"; - format-icons = [ - "󰃞" - "󰃟" - "󰃠" - ]; - }; - - battery = { - states = { - warning = 15; - critical = 5; - }; - format = "{icon} {capacity}%"; - format-icons = [ - "󰂎" - "󰁺" - "󰁻" - "󰁼" - "󰁽" - "󰁾" - "󰁿" - "󰂀" - "󰂁" - "󰂂" - "󰁹" - ]; - }; - }; - waybar-style = pkgs.writeText "waybar-style" '' - * { - border: none; - border-radius: 0px; - font-family: "Open Sans, Symbols Nerd Font Mono"; - font-size: 15px; - } - ''; - in - [ - "--config" - waybar-config - "--style" - waybar-style - ]; -} diff --git a/wrappers/waybar/config.jsonc b/wrappers/waybar/config.jsonc new file mode 100644 index 0000000..475f9fc --- /dev/null +++ b/wrappers/waybar/config.jsonc @@ -0,0 +1,58 @@ +{ + "layer": "top", + "position": "bottom", + "spacing": 10, + + "modules-left": ["clock"], + "modules-center": ["hyprland/workspaces"], + "modules-right": ["tray", "network", "wireplumber", "backlight", "battery"], + + "clock": { + "format": " {:%H.%M}", + "tooltip-format": "{:%d.%m.%Y}" + }, + + "hyprland/workspaces": { + "active-only": false, + "all-outputs": true + }, + + "tray": { + "icon-size": 20, + "spacing": 6 + }, + + "network": { + "format": "", + "format-disconnected": "󰪎", + "format-ethernet": "󰌗", + "format-icons": ["󰤟", "󰤢", "󰤥", "󰤨"], + "format-wifi": "{icon}", + "interval": 10, + "tooltip-format-disconnected": "Disconnected", + "tooltip-format-ethernet": "󰇚 {bandwidthDownBits} 󰕒 {bandwidthUpBits}", + "tooltip-format-wifi": "{essid} 󰇚 {bandwidthDownBits} 󰕒 {bandwidthUpBits}" + }, + + "wireplumber": { + "format": "{icon} {volume}%", + "format-icons": ["󰕿", "󰖀", "󰕾"], + "format-muted": "󰝟", + "scroll-step": "5" + }, + + "backlight": { + "device": "amdgpu_bl1", + "format": "{icon} {percent}%", + "format-icons": ["󰃞", "󰃟", "󰃠"] + }, + "battery": { + "format": "{icon} {capacity}%", + "format-icons": ["󰂎", "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"], + "states": { + "critical": 5, + "warning": 15 + } + } +} + \ No newline at end of file diff --git a/wrappers/waybar/default.nix b/wrappers/waybar/default.nix new file mode 100644 index 0000000..c714ba3 --- /dev/null +++ b/wrappers/waybar/default.nix @@ -0,0 +1,13 @@ +{ assembleWrapper, moduleArgs, ... }: +let + inherit (moduleArgs) pkgs; +in +assembleWrapper { + basePackage = pkgs.waybar; + flags = [ + "--config" + ./config.jsonc + "--style" + ./style.css + ]; +} diff --git a/wrappers/waybar/style.css b/wrappers/waybar/style.css new file mode 100644 index 0000000..189e5af --- /dev/null +++ b/wrappers/waybar/style.css @@ -0,0 +1,6 @@ +* { + border: none; + border-radius: 0px; + font-family: "Open Sans, Symbols Nerd Font Mono"; + font-size: 15px; +} \ No newline at end of file diff --git a/wrappers/webcord.nix b/wrappers/webcord.nix index b903478..89f5d37 100644 --- a/wrappers/webcord.nix +++ b/wrappers/webcord.nix @@ -1,4 +1,7 @@ -{ assembleWrapper, pkgs, ... }: +{ assembleWrapper, moduleArgs, ... }: +let + inherit (moduleArgs) pkgs; +in assembleWrapper { basePackage = pkgs.webcord; flags = [ "--disable-gpu" ];