pixelifytica/nixos
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Move waybar to separate repo, add to Makefile

Browse source
This commit is contained in:
Evie Litherland-Smith 2023-05-25 09:31:56 +01:00
parent b503bbccc8
commit 497b9d13f8
7 changed files with 9 additions and 359 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Makefile
View file

@ -2,12 +2,13 @@ $(eval HOSTNAME=$(shell hostname))
NIXOS_REPO := https://git.xenia.me.uk/xenia/nixos.git NIXOS_REPO := https://git.xenia.me.uk/xenia/nixos.git
NVIM_REPO := https://git.xenia.me.uk/xenia/nvim.git NVIM_REPO := https://git.xenia.me.uk/xenia/nvim.git
HYPR_REPO := https://git.xenia.me.uk/xenia/hyprland.git HYPR_REPO := https://git.xenia.me.uk/xenia/hyprland.git
WAYBAR_REPO := https://git.xenia.me.uk/xenia/waybar.git
HOMEMANAGER_CONFIG := $(PWD)/home/$(HOSTNAME)/$(USER).nix HOMEMANAGER_CONFIG := $(PWD)/home/$(HOSTNAME)/$(USER).nix
CONFIG_DIR := $(if $(XDG_CONFIG_HOME), $(XDG_CONFIG_HOME), $(HOME)/.config) CONFIG_DIR := $(if $(XDG_CONFIG_HOME), $(XDG_CONFIG_HOME), $(HOME)/.config)
BIN_DIR := $(HOME)/.local/bin BIN_DIR := $(HOME)/.local/bin
HOMEMANAGER_CONFIG_DIR := $(CONFIG_DIR)/home-manager HOMEMANAGER_CONFIG_DIR := $(CONFIG_DIR)/home-manager
.PHONY: default all clean nixos home nvim hypr .PHONY: default all clean nixos home nvim hypr waybar
default: default:
[ -e /etc/nixos/ ] && make nixos || make home [ -e /etc/nixos/ ] && make nixos || make home
@ -17,7 +18,7 @@ all: default nvim
clean: clean:
[ -e $(HOMEMANAGER_CONFIG_DIR) ] && rm -rf $(HOMEMANAGER_CONFIG_DIR) [ -e $(HOMEMANAGER_CONFIG_DIR) ] && rm -rf $(HOMEMANAGER_CONFIG_DIR)
nixos: /etc/nixos/config hypr nixos: /etc/nixos/config hypr waybar
home: $(HOMEMANAGER_CONFIG_DIR)/home.nix home: $(HOMEMANAGER_CONFIG_DIR)/home.nix
@ -25,6 +26,8 @@ nvim: $(CONFIG_DIR)/nvim
hypr: $(CONFIG_DIR)/hypr hypr: $(CONFIG_DIR)/hypr
waybar: $(CONFIG_DIR)/waybar
/nix: /nix:
command -v nix > /dev/null || echo "Install nix package manager before continuing"; exit 1 command -v nix > /dev/null || echo "Install nix package manager before continuing"; exit 1
@ -43,3 +46,6 @@ $(CONFIG_DIR)/nvim: $(CONFIG_DIR)
$(CONFIG_DIR)/hypr: $(CONFIG_DIR) $(CONFIG_DIR)/hypr: $(CONFIG_DIR)
git clone $(HYPR_REPO) $@ git clone $(HYPR_REPO) $@
$(CONFIG_DIR)/waybar: $(CONFIG_DIR)
git clone $(WAYBAR_REPO) $@

6
home/Vanguard/xenia.nix
View file

@ -22,16 +22,13 @@
exec-once = steam & discord & qbittorrent exec-once = steam & discord & qbittorrent
''; '';
programs.waybar = { programs.waybar = {
style = ''
@import 'common.css';
'';
settings = { settings = {
main = { main = {
"include" = [ "include" = [
"~/.config/waybar/modules.json" "~/.config/waybar/modules.json"
"~/.config/waybar/layout.json" "~/.config/waybar/layout.json"
]; ];
"modules-left" = ["custom/launcher" "cpu" "memory" "temperature"]; "modules-left" = ["cpu" "memory" "temperature"];
"modules-center" = ["wlr/workspaces"]; "modules-center" = ["wlr/workspaces"];
"modules-right" = [ "modules-right" = [
"pulseaudio" "pulseaudio"
@ -42,7 +39,6 @@
"battery#bat2" "battery#bat2"
"clock" "clock"
"tray" "tray"
"custom/power"
]; ];
}; };
}; };

130
home/desktop/config/waybar/common.css
View file

@ -1,130 +0,0 @@
@import 'macchiato.css';
* {
border: none;
border-radius: 10px;
font-family: "FiraCode Nerd Font";
font-size: 16px;
}
window#waybar {
background: transparent;
}
window#waybar.hidden {
opacity: 0.2;
}
#window {
margin-top: 6px;
padding-left: 10px;
padding-right: 10px;
border-radius: 10px;
transition: none;
color: transparent;
background: transparent;
}
#workspaces {
margin-top: 6px;
margin-left: 12px;
font-size: 4px;
margin-bottom: 0px;
border-radius: 10px;
background: @maroon;
transition: none;
}
#workspaces button {
transition: none;
color: @overlay0;
box-shadow: inset 0 -3px transparent;
font-size: 20px;
border-radius: 2px;
}
#workspaces button.active,
#workspaces button.focused {
color: @base;
}
#workspaces button:hover {
transition: none;
box-shadow: inherit;
text-shadow: inherit;
color: @base;
border-color: #e8a2af;
color: @base;
}
#workspaces button.focused:hover {
color: @base;
}
#custom-launcher,
#cpu,
#memory,
#temperature,
#pulseaudio,
#bluetooth,
#network,
#backlight,
#battery,
#clock,
#tray,
#custom-power {
margin-top: 0px;
margin-left: 0px;
padding-left: 10px;
padding-right: 10px;
margin-bottom: 0px;
border-radius: 10px;
transition: none;
color: @crust;
background: @lavender;
}
#cpu {
background: @pink;
}
#memory {
background: @mauve;
}
#temperature {
background: @red;
}
#pulseaudio {
background: @yellow;
}
#bluetooth {
background: @green;
}
#network {
background: @teal;
}
#backlight {
background: @sky;
}
#battery {
background: @sapphire;
}
#battery.charging,
#battery.plugged {
background-color: @sapphire;
}
#battery.critical:not(.charging) {
background-color: @sapphire;
animation-name: blink;
animation-duration: 0.5s;
animation-timing-function: linear;
animation-iteration-count: infinite;
animation-direction: alternate;
}
@keyframes blink {
to {
color: @red;
}
}
#clock {
background: @blue;
}
#tray,
#custom-launcher,
#custom-power {
font-size: 20px;
}

11
home/desktop/config/waybar/layout.json
View file

@ -1,11 +0,0 @@
{
"layer": "top",
"position": "top",
"spacing": 10,
"margin-top": 10,
"margin-left": 20,
"margin-right": 20,
"margin-bottom": 5,
}
// vim: ft=json

37
home/desktop/config/waybar/macchiato.css
View file

@ -1,37 +0,0 @@
/*
*
* Catppuccin Macchiato palette
* Maintainer: rubyowo
*
*/
@define-color base #24273a;
@define-color mantle #1e2030;
@define-color crust #181926;
@define-color text #cad3f5;
@define-color subtext0 #a5adcb;
@define-color subtext1 #b8c0e0;
@define-color surface0 #363a4f;
@define-color surface1 #494d64;
@define-color surface2 #5b6078;
@define-color overlay0 #6e738d;
@define-color overlay1 #8087a2;
@define-color overlay2 #939ab7;
@define-color blue #8aadf4;
@define-color lavender #b7bdf8;
@define-color sapphire #7dc4e4;
@define-color sky #91d7e3;
@define-color teal #8bd5ca;
@define-color green #a6da95;
@define-color yellow #eed49f;
@define-color peach #f5a97f;
@define-color maroon #ee99a0;
@define-color red #ed8796;
@define-color mauve #c6a0f6;
@define-color pink #f5bde6;
@define-color flamingo #f0c6c6;
@define-color rosewater #f4dbd6;

170
home/desktop/config/waybar/modules.json
View file

@ -1,170 +0,0 @@
{
"custom/launcher": {
"format": "󰀻",
"on-click": "rofi -show drun"
},
"keyboard-state": {
"numlock": true,
"capslock": true,
"format": "{name} {icon}",
"format-icons": {
"locked": "",
"unlocked": ""
}
},
"tray": {
"spacing": 10
},
"clock": {
"timezone": "Europe/London",
"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
"format-alt": "{:%Y-%m-%d}"
},
"cpu": {
"format": "{usage}% 󰻠",
"tooltip": false
},
"memory": {
"format": "{}% 󰍛"
},
"temperature": {
"critical-threshold": 80,
"format": "{temperatureC}°C {icon}",
"format-icons": [
"󱃃",
"󰔏",
"󱃂"
]
},
"backlight": {
"format": "{percent}% {icon}",
"format-icons": [
"",
"",
"",
"",
"",
"",
"",
"",
""
]
},
"battery": {
"states": {
"warning": 30,
"critical": 15
},
"format": "{capacity}% {icon}",
"format-charging": "{capacity}% 󰂄",
"format-plugged": "{capacity}% 󰚥",
"format-alt": "{time} {icon}",
"format-icons": [
"󱃍",
"󰁺",
"󰁻",
"󰁼",
"󰁽",
"󰁾",
"󰁿",
"󰂀",
"󰂁",
"󰂂",
"󰁹"
]
},
"battery#bat2": {
"bat": "BAT2"
},
"network": {
"format-wifi": "{essid} ({signalStrength}%) 󰖩",
"format-ethernet": "Connected 󰈁",
"tooltip-format": "{ifname}",
"format-linked": "{ifname} (No IP) 󰈁",
"format-disconnected": "Disconnected 󰈂",
"format-alt": "{ifname}: {ipaddr}/{cidr}"
},
"bluetooth": {
"format": "󰂯 {status}",
"format-disabled": "󰂲 {status}",
"format-off": "󰂲 {status}",
"format-on": "󰂯 {status}",
"format-connected": "󰂱 {device_alias}",
"on-click": "blueman-manager"
},
"pulseaudio": {
"scroll-step": 5,
"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": {
"headphone": "󰋋",
"hands-free": "󰥰",
"headset": "󰋎",
"phone": "󰏲",
"portable": "󰏳",
"car": "󰄍",
"default": [
"󰕿",
"󰖀",
"󰕾"
]
},
"on-click": "pavucontrol"
},
"custom/power": {
"format": "󰐥",
"on-click": "powermenu"
},
"wlr/workspaces": {
"on-click": "activate",
"disable-scroll": true,
"all-outputs": false,
"sort-by-number": true,
"format": "{name}:{icon}",
"format-icons": {
"1": "󰅴",
"2": "󰈹",
"3": "󰻞",
"4": "󱋖",
"5": "󰓓",
"urgent": "",
"focused": "",
"default": ""
},
"persistent_workspaces": {
"1": [],
"2": [],
"3": [],
"4": [],
"5": []
}
},
"sway/workspaces": {
"on-click": "activate",
"disable-scroll": true,
"all-outputs": false,
"sort-by-number": true,
"format": "{name}:{icon}",
"format-icons": {
"1": "󰅴",
"2": "󰈹",
"3": "󰻞",
"4": "󱋖",
"5": "󰓓",
"urgent": "",
"focused": "",
"default": ""
},
"persistent_workspaces": {
"1": [],
"2": [],
"3": [],
"4": [],
"5": []
}
}
}

4
home/desktop/waybar.nix
View file

@ -3,9 +3,5 @@
(nerdfonts.override {fonts = ["FiraCode"];}) (nerdfonts.override {fonts = ["FiraCode"];})
bluez bluez
]; ];
xdg.configFile."waybar" = {
source = ./config/waybar;
recursive = true;
};
programs.waybar.enable = true; programs.waybar.enable = true;
} }