feat: modified AGS bar styling
This commit is contained in:
parent
a88e7c28a5
commit
9fec340586
13 changed files with 238 additions and 184 deletions
|
@ -27,6 +27,7 @@
|
|||
myEmail = "z.liu@outlook.com.gr";
|
||||
myAutostartCommands = [
|
||||
"fcitx5"
|
||||
"${pkgs.udiskie}/bin/udiskie"
|
||||
];
|
||||
myConfigLocation = "/home/${myUserName}/nix-conf";
|
||||
};
|
||||
|
|
|
@ -12,4 +12,4 @@ if you do not want typechecking only suggestions
|
|||
```
|
||||
|
||||
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
|
||||
|
|
|
@ -1,219 +1,223 @@
|
|||
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 audio = await Service.import("audio")
|
||||
const battery = await Service.import("battery")
|
||||
const systemtray = await Service.import("systemtray")
|
||||
|
||||
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
|
||||
// so to make a reuseable widget, make it a function
|
||||
// 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 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 dispatch = ws => hyprland.messageAsync(`dispatch workspace ${ws}`);
|
||||
|
||||
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() {
|
||||
return Widget.Label({
|
||||
class_name: "client-title",
|
||||
label: hyprland.active.client.bind("title"),
|
||||
})
|
||||
return Widget.Label({
|
||||
class_name: "client-title",
|
||||
label: hyprland.active.client.bind("title"),
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
function Clock() {
|
||||
return Widget.Label({
|
||||
class_name: "clock",
|
||||
label: date.bind(),
|
||||
})
|
||||
return Widget.Label({
|
||||
class_name: "clock",
|
||||
label: date.bind(),
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
// we don't need dunst or any other notification daemon
|
||||
// because the Notifications module is a notification daemon itself
|
||||
function Notification() {
|
||||
const popups = notifications.bind("popups")
|
||||
return Widget.Box({
|
||||
class_name: "notification",
|
||||
visible: popups.as(p => p.length > 0),
|
||||
children: [
|
||||
Widget.Icon({
|
||||
icon: "preferences-system-notifications-symbolic",
|
||||
}),
|
||||
Widget.Label({
|
||||
label: popups.as(p => p[0]?.summary || ""),
|
||||
}),
|
||||
],
|
||||
})
|
||||
}
|
||||
/*function Notification() {
|
||||
const popups = notifications.bind("popups")
|
||||
return Widget.Box({
|
||||
class_name: "notification",
|
||||
visible: popups.as(p => p.length > 0),
|
||||
children: [
|
||||
Widget.Icon({
|
||||
icon: "preferences-system-notifications-symbolic",
|
||||
}),
|
||||
Widget.Label({
|
||||
label: popups.as(p => p[0]?.summary || ""),
|
||||
}),
|
||||
],
|
||||
})
|
||||
}*/
|
||||
|
||||
|
||||
function Media() {
|
||||
const label = Utils.watch("", mpris, "player-changed", () => {
|
||||
if (mpris.players[0]) {
|
||||
const { track_artists, track_title } = mpris.players[0]
|
||||
return `${track_artists.join(", ")} - ${track_title}`
|
||||
} else {
|
||||
return "Nothing is playing"
|
||||
}
|
||||
})
|
||||
const label = Utils.watch("", mpris, "player-changed", () => {
|
||||
if (mpris.players[0]) {
|
||||
const { track_artists, track_title } = mpris.players[0]
|
||||
return `${track_artists.join(", ")} - ${track_title}`
|
||||
} else {
|
||||
return "Nothing is playing"
|
||||
}
|
||||
})
|
||||
|
||||
return Widget.Button({
|
||||
class_name: "media",
|
||||
on_primary_click: () => mpris.getPlayer("")?.playPause(),
|
||||
on_scroll_up: () => mpris.getPlayer("")?.next(),
|
||||
on_scroll_down: () => mpris.getPlayer("")?.previous(),
|
||||
child: Widget.Label({ label }),
|
||||
})
|
||||
return Widget.Button({
|
||||
class_name: "media",
|
||||
on_primary_click: () => mpris.getPlayer("")?.playPause(),
|
||||
on_scroll_up: () => mpris.getPlayer("")?.next(),
|
||||
on_scroll_down: () => mpris.getPlayer("")?.previous(),
|
||||
child: Widget.Label({ label }),
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
function Volume() {
|
||||
const icons = {
|
||||
101: "overamplified",
|
||||
67: "high",
|
||||
34: "medium",
|
||||
1: "low",
|
||||
0: "muted",
|
||||
}
|
||||
const icons = {
|
||||
101: "overamplified",
|
||||
67: "high",
|
||||
34: "medium",
|
||||
1: "low",
|
||||
0: "muted",
|
||||
}
|
||||
|
||||
function getIcon() {
|
||||
const icon = audio.speaker.is_muted ? 0 : [101, 67, 34, 1, 0].find(
|
||||
threshold => threshold <= audio.speaker.volume * 100)
|
||||
function getIcon() {
|
||||
const icon = audio.speaker.is_muted ? 0 : [101, 67, 34, 1, 0].find(
|
||||
threshold => threshold <= audio.speaker.volume * 100)
|
||||
|
||||
return `audio-volume-${icons[icon]}-symbolic`
|
||||
}
|
||||
return `audio-volume-${icons[icon]}-symbolic`
|
||||
}
|
||||
|
||||
const icon = Widget.Icon({
|
||||
icon: Utils.watch(getIcon(), audio.speaker, getIcon),
|
||||
})
|
||||
const icon = Widget.Icon({
|
||||
icon: Utils.watch(getIcon(), audio.speaker, getIcon),
|
||||
})
|
||||
|
||||
const slider = Widget.Slider({
|
||||
hexpand: true,
|
||||
draw_value: false,
|
||||
on_change: ({ value }) => audio.speaker.volume = value,
|
||||
setup: self => self.hook(audio.speaker, () => {
|
||||
self.value = audio.speaker.volume || 0
|
||||
}),
|
||||
})
|
||||
const slider = Widget.Slider({
|
||||
hexpand: true,
|
||||
draw_value: false,
|
||||
on_change: ({ value }) => audio.speaker.volume = value,
|
||||
setup: self => self.hook(audio.speaker, () => {
|
||||
self.value = audio.speaker.volume || 0
|
||||
}),
|
||||
})
|
||||
|
||||
return Widget.Box({
|
||||
class_name: "volume",
|
||||
css: "min-width: 180px",
|
||||
children: [icon, slider],
|
||||
})
|
||||
return Widget.Box({
|
||||
class_name: "volume",
|
||||
css: "min-width: 180px",
|
||||
children: [icon, slider],
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
function BatteryLabel() {
|
||||
const value = battery.bind("percent").as(p => p > 0 ? p / 100 : 0)
|
||||
const icon = battery.bind("percent").as(p =>
|
||||
`battery-level-${Math.floor(p / 10) * 10}-symbolic`)
|
||||
const value = battery.bind("percent").as(p => p > 0 ? p / 100 : 0)
|
||||
const icon = battery.bind("percent").as(p =>
|
||||
`battery-level-${Math.floor(p / 10) * 10}-symbolic`)
|
||||
|
||||
return Widget.Box({
|
||||
class_name: "battery",
|
||||
visible: battery.bind("available"),
|
||||
children: [
|
||||
Widget.Icon({ icon }),
|
||||
Widget.LevelBar({
|
||||
widthRequest: 140,
|
||||
vpack: "center",
|
||||
value,
|
||||
}),
|
||||
],
|
||||
})
|
||||
return Widget.Box({
|
||||
class_name: "battery",
|
||||
visible: battery.bind("available"),
|
||||
children: [
|
||||
Widget.Icon({ icon }),
|
||||
Widget.LevelBar({
|
||||
widthRequest: 140,
|
||||
vpack: "center",
|
||||
value,
|
||||
}),
|
||||
],
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
function SysTray() {
|
||||
const items = systemtray.bind("items")
|
||||
.as(items => items.map(item => Widget.Button({
|
||||
child: Widget.Icon({ icon: item.bind("icon") }),
|
||||
on_primary_click: (_, event) => item.activate(event),
|
||||
on_secondary_click: (_, event) => item.openMenu(event),
|
||||
tooltip_markup: item.bind("tooltip_markup"),
|
||||
})))
|
||||
const items = systemtray.bind("items")
|
||||
.as(items => items.map(item => Widget.Button({
|
||||
child: Widget.Icon({ icon: item.bind("icon") }),
|
||||
on_primary_click: (_, event) => item.activate(event),
|
||||
on_secondary_click: (_, event) => item.openMenu(event),
|
||||
tooltip_markup: item.bind("tooltip_markup"),
|
||||
})))
|
||||
|
||||
return Widget.Box({
|
||||
children: items,
|
||||
})
|
||||
return Widget.Box({
|
||||
children: items,
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
// layout of the bar
|
||||
function Left() {
|
||||
return Widget.Box({
|
||||
spacing: 8,
|
||||
children: [
|
||||
Workspaces(),
|
||||
ClientTitle(),
|
||||
],
|
||||
})
|
||||
return Widget.Box({
|
||||
spacing: 8,
|
||||
children: [
|
||||
Workspaces(),
|
||||
ClientTitle(),
|
||||
],
|
||||
})
|
||||
}
|
||||
|
||||
function Center() {
|
||||
return Widget.Box({
|
||||
spacing: 8,
|
||||
children: [
|
||||
Media(),
|
||||
Notification(),
|
||||
],
|
||||
})
|
||||
return Widget.Box({
|
||||
spacing: 8,
|
||||
children: [
|
||||
Clock(),
|
||||
],
|
||||
})
|
||||
}
|
||||
|
||||
function Right() {
|
||||
return Widget.Box({
|
||||
hpack: "end",
|
||||
spacing: 8,
|
||||
children: [
|
||||
Volume(),
|
||||
BatteryLabel(),
|
||||
Clock(),
|
||||
SysTray(),
|
||||
],
|
||||
})
|
||||
return Widget.Box({
|
||||
hpack: "end",
|
||||
spacing: 8,
|
||||
children: [
|
||||
Volume(),
|
||||
BatteryLabel(),
|
||||
SysTray(),
|
||||
],
|
||||
})
|
||||
}
|
||||
|
||||
function Bar(monitor = 0) {
|
||||
return Widget.Window({
|
||||
name: `bar-${monitor}`, // name has to be unique
|
||||
class_name: "bar",
|
||||
monitor,
|
||||
anchor: ["top", "left", "right"],
|
||||
exclusivity: "exclusive",
|
||||
child: Widget.CenterBox({
|
||||
start_widget: Left(),
|
||||
center_widget: Center(),
|
||||
end_widget: Right(),
|
||||
}),
|
||||
})
|
||||
return Widget.Window({
|
||||
name: `bar-${monitor}`, // name has to be unique
|
||||
class_name: "bar",
|
||||
monitor,
|
||||
anchor: ["top", "left", "right"],
|
||||
exclusivity: "exclusive",
|
||||
child: Widget.CenterBox({
|
||||
start_widget: Left(),
|
||||
center_widget: Center(),
|
||||
end_widget: Right(),
|
||||
}),
|
||||
})
|
||||
}
|
||||
|
||||
App.config({
|
||||
style: "./style.css",
|
||||
windows: [
|
||||
Bar(),
|
||||
style: "./style.css",
|
||||
windows: [
|
||||
Bar(),
|
||||
|
||||
// you can call it, for each monitor
|
||||
// Bar(0),
|
||||
// Bar(1)
|
||||
],
|
||||
// you can call it, for each monitor
|
||||
// Bar(0),
|
||||
// Bar(1)
|
||||
],
|
||||
})
|
||||
|
||||
export { }
|
||||
|
|
|
@ -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
|
|
@ -4,7 +4,15 @@
|
|||
...
|
||||
}: {
|
||||
config = {
|
||||
#home.packages = with pkgs; [ ags ];
|
||||
myAutostartCommands = ["${pkgs.ags}/bin/ags"];
|
||||
home.file = {
|
||||
"${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 |
|
@ -17,11 +17,12 @@
|
|||
./hypr
|
||||
./shells
|
||||
../../common/variables.nix
|
||||
#./mako.nix
|
||||
./mako.nix
|
||||
./wechat
|
||||
./editors.nix
|
||||
./gtk.nix
|
||||
./ags
|
||||
./xdg.nix
|
||||
];
|
||||
|
||||
nixpkgs = {
|
||||
|
@ -57,18 +58,6 @@
|
|||
# copy wallpaper from assets
|
||||
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; [
|
||||
protonvpn-gui
|
||||
devenv
|
||||
|
@ -80,34 +69,48 @@
|
|||
qq
|
||||
libreoffice
|
||||
discord
|
||||
zathura
|
||||
#zathura
|
||||
kdePackages.okular
|
||||
shotwell
|
||||
mpv
|
||||
kdenlive
|
||||
obsidian
|
||||
pcmanfm
|
||||
udiskie
|
||||
android-file-transfer
|
||||
usbutils
|
||||
mtpfs
|
||||
teams-for-linux
|
||||
sxiv
|
||||
];
|
||||
myAutostartCommands = [
|
||||
"${pkgs.clash-verge-rev}/bin/clash-verge"
|
||||
"${pkgs.firefox}/bin/firefox"
|
||||
"${pkgs.thunderbird}/bin/thunderbird"
|
||||
];
|
||||
programs.git = {
|
||||
enable = true;
|
||||
package = pkgs.gitFull;
|
||||
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;
|
||||
firefox.enable = true;
|
||||
thunderbird = {
|
||||
enable = true;
|
||||
profiles.default = {isDefault = true;};
|
||||
};
|
||||
git = {
|
||||
enable = true;
|
||||
package = pkgs.gitFull;
|
||||
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
|
||||
systemd.user.startServices = "sd-switch";
|
||||
services.kanshi = {
|
||||
|
|
|
@ -43,6 +43,7 @@
|
|||
"$mod, D, exec, ${pkgs.fuzzel}/bin/fuzzel"
|
||||
# firefox quickstart
|
||||
"$mod, F, exec, ${pkgs.firefox}/bin/firefox"
|
||||
"$mod, E, exec, ${pkgs.pcmanfm}/bin/pcmanfm"
|
||||
# foot terminal
|
||||
''
|
||||
$mod, Return, exec, ${pkgs.foot}/bin/foot -f 'BlexMono Nerd Font:size=12' -o colors.alpha=0.85 ${config.myShells.defaultShell}''
|
||||
|
|
16
home-manager/stvnliu/xdg.nix
Normal file
16
home-manager/stvnliu/xdg.nix
Normal 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";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
|
@ -16,6 +16,7 @@
|
|||
./services/laptop.preset.nix
|
||||
./hardware-configuration.nix
|
||||
#./ags.nix
|
||||
./xdg.nix
|
||||
];
|
||||
environment.variables = {
|
||||
GDK_SCALE = config.displayScale;
|
||||
|
|
|
@ -3,5 +3,6 @@
|
|||
./nginx.service.nix
|
||||
./pipewire.service.nix
|
||||
./syncthing.service.nix
|
||||
./misc.service.nix
|
||||
];
|
||||
}
|
||||
|
|
13
nixos/services/misc.service.nix
Normal file
13
nixos/services/misc.service.nix
Normal 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
6
nixos/stylix.nix
Normal 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;
|
||||
};
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue