feat: modified AGS bar styling

This commit is contained in:
Zhongheng Liu 2024-08-22 11:24:52 +08:00
commit 9fec340586
No known key found for this signature in database
13 changed files with 238 additions and 184 deletions

View file

@ -27,6 +27,7 @@
myEmail = "z.liu@outlook.com.gr"; myEmail = "z.liu@outlook.com.gr";
myAutostartCommands = [ myAutostartCommands = [
"fcitx5" "fcitx5"
"${pkgs.udiskie}/bin/udiskie"
]; ];
myConfigLocation = "/home/${myUserName}/nix-conf"; myConfigLocation = "/home/${myUserName}/nix-conf";
}; };

View file

@ -12,4 +12,4 @@ if you do not want typechecking only suggestions
``` ```
types are symlinked to: types are symlinked to:
/nix/store/1yw1cklb7s6snf7x2ahrbgkbs1vgrfyk-ags-1.8.2/share/com.github.Aylur.ags/types /home/stvnliu/.nix-profile/share/com.github.Aylur.ags/types

View file

@ -1,219 +1,223 @@
const hyprland = await Service.import("hyprland") const hyprland = await Service.import("hyprland")
const notifications = await Service.import("notifications") // const notifications = await Service.import("notifications")
const mpris = await Service.import("mpris") const mpris = await Service.import("mpris")
const audio = await Service.import("audio") const audio = await Service.import("audio")
const battery = await Service.import("battery") const battery = await Service.import("battery")
const systemtray = await Service.import("systemtray") const systemtray = await Service.import("systemtray")
const date = Variable("", { const date = Variable("", {
poll: [1000, 'date "+%H:%M:%S %b %e."'], poll: [1000, 'date "+%H:%M:%S %b %e."'],
}) })
// widgets can be only assigned as a child in one container // widgets can be only assigned as a child in one container
// so to make a reuseable widget, make it a function // so to make a reuseable widget, make it a function
// then you can simply instantiate one by calling it // then you can simply instantiate one by calling it
const focusedTitle = Widget.Label({
label: hyprland.active.client.bind('title'),
visible: hyprland.active.client.bind('address')
.as(addr => addr !== "0x"),
})
function Workspaces() { const dispatch = ws => hyprland.messageAsync(`dispatch workspace ${ws}`);
const activeId = hyprland.active.workspace.bind("id")
const workspaces = hyprland.bind("workspaces")
.as(ws => ws.map(({ id }) => Widget.Button({
on_clicked: () => hyprland.messageAsync(`dispatch workspace ${id}`),
child: Widget.Label(`${id}`),
class_name: activeId.as(i => `${i === id ? "focused" : ""}`),
})))
return Widget.Box({
class_name: "workspaces",
children: workspaces,
})
}
const Workspaces = () => Widget.EventBox({
onScrollUp: () => dispatch('+1'),
onScrollDown: () => dispatch('-1'),
child: Widget.Box({
children: Array.from({ length: 10 }, (_, i) => i + 1).map(i => Widget.Button({
attribute: i,
label: `${i}`,
onClicked: () => dispatch(i),
})),
// remove this setup hook if you want fixed number of buttons
setup: self => self.hook(hyprland, () => self.children.forEach(btn => {
btn.visible = hyprland.workspaces.some(ws => ws.id === btn.attribute);
})),
}),
})
function ClientTitle() { function ClientTitle() {
return Widget.Label({ return Widget.Label({
class_name: "client-title", class_name: "client-title",
label: hyprland.active.client.bind("title"), label: hyprland.active.client.bind("title"),
}) })
} }
function Clock() { function Clock() {
return Widget.Label({ return Widget.Label({
class_name: "clock", class_name: "clock",
label: date.bind(), label: date.bind(),
}) })
} }
// we don't need dunst or any other notification daemon // we don't need dunst or any other notification daemon
// because the Notifications module is a notification daemon itself // because the Notifications module is a notification daemon itself
function Notification() { /*function Notification() {
const popups = notifications.bind("popups") const popups = notifications.bind("popups")
return Widget.Box({ return Widget.Box({
class_name: "notification", class_name: "notification",
visible: popups.as(p => p.length > 0), visible: popups.as(p => p.length > 0),
children: [ children: [
Widget.Icon({ Widget.Icon({
icon: "preferences-system-notifications-symbolic", icon: "preferences-system-notifications-symbolic",
}), }),
Widget.Label({ Widget.Label({
label: popups.as(p => p[0]?.summary || ""), label: popups.as(p => p[0]?.summary || ""),
}), }),
], ],
}) })
} }*/
function Media() { function Media() {
const label = Utils.watch("", mpris, "player-changed", () => { const label = Utils.watch("", mpris, "player-changed", () => {
if (mpris.players[0]) { if (mpris.players[0]) {
const { track_artists, track_title } = mpris.players[0] const { track_artists, track_title } = mpris.players[0]
return `${track_artists.join(", ")} - ${track_title}` return `${track_artists.join(", ")} - ${track_title}`
} else { } else {
return "Nothing is playing" return "Nothing is playing"
} }
}) })
return Widget.Button({ return Widget.Button({
class_name: "media", class_name: "media",
on_primary_click: () => mpris.getPlayer("")?.playPause(), on_primary_click: () => mpris.getPlayer("")?.playPause(),
on_scroll_up: () => mpris.getPlayer("")?.next(), on_scroll_up: () => mpris.getPlayer("")?.next(),
on_scroll_down: () => mpris.getPlayer("")?.previous(), on_scroll_down: () => mpris.getPlayer("")?.previous(),
child: Widget.Label({ label }), child: Widget.Label({ label }),
}) })
} }
function Volume() { function Volume() {
const icons = { const icons = {
101: "overamplified", 101: "overamplified",
67: "high", 67: "high",
34: "medium", 34: "medium",
1: "low", 1: "low",
0: "muted", 0: "muted",
} }
function getIcon() { function getIcon() {
const icon = audio.speaker.is_muted ? 0 : [101, 67, 34, 1, 0].find( const icon = audio.speaker.is_muted ? 0 : [101, 67, 34, 1, 0].find(
threshold => threshold <= audio.speaker.volume * 100) threshold => threshold <= audio.speaker.volume * 100)
return `audio-volume-${icons[icon]}-symbolic` return `audio-volume-${icons[icon]}-symbolic`
} }
const icon = Widget.Icon({ const icon = Widget.Icon({
icon: Utils.watch(getIcon(), audio.speaker, getIcon), icon: Utils.watch(getIcon(), audio.speaker, getIcon),
}) })
const slider = Widget.Slider({ const slider = Widget.Slider({
hexpand: true, hexpand: true,
draw_value: false, draw_value: false,
on_change: ({ value }) => audio.speaker.volume = value, on_change: ({ value }) => audio.speaker.volume = value,
setup: self => self.hook(audio.speaker, () => { setup: self => self.hook(audio.speaker, () => {
self.value = audio.speaker.volume || 0 self.value = audio.speaker.volume || 0
}), }),
}) })
return Widget.Box({ return Widget.Box({
class_name: "volume", class_name: "volume",
css: "min-width: 180px", css: "min-width: 180px",
children: [icon, slider], children: [icon, slider],
}) })
} }
function BatteryLabel() { function BatteryLabel() {
const value = battery.bind("percent").as(p => p > 0 ? p / 100 : 0) const value = battery.bind("percent").as(p => p > 0 ? p / 100 : 0)
const icon = battery.bind("percent").as(p => const icon = battery.bind("percent").as(p =>
`battery-level-${Math.floor(p / 10) * 10}-symbolic`) `battery-level-${Math.floor(p / 10) * 10}-symbolic`)
return Widget.Box({ return Widget.Box({
class_name: "battery", class_name: "battery",
visible: battery.bind("available"), visible: battery.bind("available"),
children: [ children: [
Widget.Icon({ icon }), Widget.Icon({ icon }),
Widget.LevelBar({ Widget.LevelBar({
widthRequest: 140, widthRequest: 140,
vpack: "center", vpack: "center",
value, value,
}), }),
], ],
}) })
} }
function SysTray() { function SysTray() {
const items = systemtray.bind("items") const items = systemtray.bind("items")
.as(items => items.map(item => Widget.Button({ .as(items => items.map(item => Widget.Button({
child: Widget.Icon({ icon: item.bind("icon") }), child: Widget.Icon({ icon: item.bind("icon") }),
on_primary_click: (_, event) => item.activate(event), on_primary_click: (_, event) => item.activate(event),
on_secondary_click: (_, event) => item.openMenu(event), on_secondary_click: (_, event) => item.openMenu(event),
tooltip_markup: item.bind("tooltip_markup"), tooltip_markup: item.bind("tooltip_markup"),
}))) })))
return Widget.Box({ return Widget.Box({
children: items, children: items,
}) })
} }
// layout of the bar // layout of the bar
function Left() { function Left() {
return Widget.Box({ return Widget.Box({
spacing: 8, spacing: 8,
children: [ children: [
Workspaces(), Workspaces(),
ClientTitle(), ClientTitle(),
], ],
}) })
} }
function Center() { function Center() {
return Widget.Box({ return Widget.Box({
spacing: 8, spacing: 8,
children: [ children: [
Media(), Clock(),
Notification(), ],
], })
})
} }
function Right() { function Right() {
return Widget.Box({ return Widget.Box({
hpack: "end", hpack: "end",
spacing: 8, spacing: 8,
children: [ children: [
Volume(), Volume(),
BatteryLabel(), BatteryLabel(),
Clock(), SysTray(),
SysTray(), ],
], })
})
} }
function Bar(monitor = 0) { function Bar(monitor = 0) {
return Widget.Window({ return Widget.Window({
name: `bar-${monitor}`, // name has to be unique name: `bar-${monitor}`, // name has to be unique
class_name: "bar", class_name: "bar",
monitor, monitor,
anchor: ["top", "left", "right"], anchor: ["top", "left", "right"],
exclusivity: "exclusive", exclusivity: "exclusive",
child: Widget.CenterBox({ child: Widget.CenterBox({
start_widget: Left(), start_widget: Left(),
center_widget: Center(), center_widget: Center(),
end_widget: Right(), end_widget: Right(),
}), }),
}) })
} }
App.config({ App.config({
style: "./style.css", style: "./style.css",
windows: [ windows: [
Bar(), Bar(),
// you can call it, for each monitor // you can call it, for each monitor
// Bar(0), // Bar(0),
// Bar(1) // Bar(1)
], ],
}) })
export { } export { }

View file

@ -1 +1 @@
/nix/store/1yw1cklb7s6snf7x2ahrbgkbs1vgrfyk-ags-1.8.2/share/com.github.Aylur.ags/types /home/stvnliu/.nix-profile/share/com.github.Aylur.ags/types

View file

@ -4,7 +4,15 @@
... ...
}: { }: {
config = { config = {
#home.packages = with pkgs; [ ags ]; home.file = {
myAutostartCommands = ["${pkgs.ags}/bin/ags"]; "${config.xdg.configHome}/ags" = {
source = ./config;
};
};
home.packages = with pkgs; [ags];
myAutostartCommands = [
#"${pkgs.ags}/bin/ags --init"
#"${pkgs.ags}/bin/ags"
];
}; };
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 187 KiB

After

Width:  |  Height:  |  Size: 779 KiB

Before After
Before After

View file

@ -17,11 +17,12 @@
./hypr ./hypr
./shells ./shells
../../common/variables.nix ../../common/variables.nix
#./mako.nix ./mako.nix
./wechat ./wechat
./editors.nix ./editors.nix
./gtk.nix ./gtk.nix
./ags ./ags
./xdg.nix
]; ];
nixpkgs = { nixpkgs = {
@ -57,18 +58,6 @@
# copy wallpaper from assets # copy wallpaper from assets
file = {"wallpaper.png".source = ./assets/gruvbox-wallpaper.png;}; file = {"wallpaper.png".source = ./assets/gruvbox-wallpaper.png;};
}; };
#programs.neovim = {
# enable = true;
# viAlias = true;
# vimAlias = true;
# extraConfig = ''
# set number
# '';
#};
programs.thunderbird = {
enable = true;
profiles.default = {isDefault = true;};
};
home.packages = with pkgs; [ home.packages = with pkgs; [
protonvpn-gui protonvpn-gui
devenv devenv
@ -80,34 +69,48 @@
qq qq
libreoffice libreoffice
discord discord
zathura #zathura
kdePackages.okular
shotwell shotwell
mpv mpv
kdenlive kdenlive
obsidian obsidian
pcmanfm
udiskie
android-file-transfer
usbutils
mtpfs
teams-for-linux
sxiv
]; ];
myAutostartCommands = [ myAutostartCommands = [
"${pkgs.clash-verge-rev}/bin/clash-verge" "${pkgs.clash-verge-rev}/bin/clash-verge"
"${pkgs.firefox}/bin/firefox" "${pkgs.firefox}/bin/firefox"
"${pkgs.thunderbird}/bin/thunderbird" "${pkgs.thunderbird}/bin/thunderbird"
]; ];
programs.git = {
enable = true; programs = {
package = pkgs.gitFull; home-manager.enable = true;
userName = config.myDisplayName; firefox.enable = true;
userEmail = config.myEmail; thunderbird = {
extraConfig = { enable = true;
push.autoSetupRemote = true; profiles.default = {isDefault = true;};
commit.gpgsign = true; };
gpg.format = "ssh"; git = {
gpg.ssh.allowedSignersFile = "/home/${config.myUserName}/.ssh/allowed_signers"; enable = true;
user.signingkey = "/home/${config.myUserName}/.ssh/id_ed25519.pub"; package = pkgs.gitFull;
credential.helper = "libsecret"; userName = config.myDisplayName;
userEmail = config.myEmail;
extraConfig = {
push.autoSetupRemote = true;
commit.gpgsign = true;
gpg.format = "ssh";
gpg.ssh.allowedSignersFile = "/home/${config.myUserName}/.ssh/allowed_signers";
user.signingkey = "/home/${config.myUserName}/.ssh/id_ed25519.pub";
credential.helper = "libsecret";
};
}; };
}; };
programs.home-manager.enable = true;
programs.firefox.enable = true;
# Nicely reload system units when changing configs # Nicely reload system units when changing configs
systemd.user.startServices = "sd-switch"; systemd.user.startServices = "sd-switch";
services.kanshi = { services.kanshi = {

View file

@ -43,6 +43,7 @@
"$mod, D, exec, ${pkgs.fuzzel}/bin/fuzzel" "$mod, D, exec, ${pkgs.fuzzel}/bin/fuzzel"
# firefox quickstart # firefox quickstart
"$mod, F, exec, ${pkgs.firefox}/bin/firefox" "$mod, F, exec, ${pkgs.firefox}/bin/firefox"
"$mod, E, exec, ${pkgs.pcmanfm}/bin/pcmanfm"
# foot terminal # foot terminal
'' ''
$mod, Return, exec, ${pkgs.foot}/bin/foot -f 'BlexMono Nerd Font:size=12' -o colors.alpha=0.85 ${config.myShells.defaultShell}'' $mod, Return, exec, ${pkgs.foot}/bin/foot -f 'BlexMono Nerd Font:size=12' -o colors.alpha=0.85 ${config.myShells.defaultShell}''

View file

@ -0,0 +1,16 @@
{pkgs, ...}: {
xdg = {
enable = true;
mimeApps = {
enable = true;
defaultApplications = {
"application/pdf" = "org.kde.okular.desktop";
"image/png" = "sxiv.desktop";
"image/jpeg" = "sxiv.desktop";
"image/jpg" = "sxiv.desktop";
"image/webp" = "sxiv.desktop";
"image/heif" = "sxiv.desktop";
};
};
};
}

View file

@ -16,6 +16,7 @@
./services/laptop.preset.nix ./services/laptop.preset.nix
./hardware-configuration.nix ./hardware-configuration.nix
#./ags.nix #./ags.nix
./xdg.nix
]; ];
environment.variables = { environment.variables = {
GDK_SCALE = config.displayScale; GDK_SCALE = config.displayScale;

View file

@ -3,5 +3,6 @@
./nginx.service.nix ./nginx.service.nix
./pipewire.service.nix ./pipewire.service.nix
./syncthing.service.nix ./syncthing.service.nix
./misc.service.nix
]; ];
} }

View file

@ -0,0 +1,13 @@
{...}: {
specialisation.powersave.configuration = {
services.auto-cpufreq.enable = true;
};
services = {
upower.enable = true;
udisks2.enable = true;
#picom.enable = true;
#blueman.enable = true;
#gnome.gnome-keyring.enable = true;
#openssh.enable = true;
};
}

6
nixos/stylix.nix Normal file
View file

@ -0,0 +1,6 @@
{pkgs, ...}: {
stylix = {
base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-medium.yaml";
stylix.image = ../home-manager/stvnliu/assets/gruvbox-wallpaper.png;
};
}