feat: better AGS integration and Hyprland setup

AGS: Full AGS config directory init

Autostart: Created myAutostartCommands var to programmatically define

all commands to be started when Hyprland initiates

this includes firefox, thunderbird, and a terminal to be set in the

special Hyprland workspace
This commit is contained in:
Zhongheng Liu 2024-08-20 14:27:41 +08:00
commit 37674d828e
No known key found for this signature in database
10 changed files with 335 additions and 25 deletions

View file

@ -1,5 +1,5 @@
{
tmconfig,
config,
pkgs,
lib,
...
@ -13,6 +13,7 @@
myDisplayName = mkOption {type = str;};
myEmail = mkOption {type = str;};
displayScale = mkOption {type = int;};
myAutostartCommands = mkOption {type = listOf str;};
};
# Default values for this configuration
@ -23,5 +24,8 @@
myWallPaperPathString = "/home/${myUserName}/wallpaper.png";
myDisplayName = "Zhongheng Liu";
myEmail = "z.liu@outlook.com.gr";
myAutostartCommands = [
"fcitx5"
];
};
}

View file

@ -0,0 +1,15 @@
# Starter Config
if suggestions don't work, first make sure
you have TypeScript LSP working in your editor
if you do not want typechecking only suggestions
```json
// tsconfig.json
"checkJs": false
```
types are symlinked to:
/nix/store/1yw1cklb7s6snf7x2ahrbgkbs1vgrfyk-ags-1.8.2/share/com.github.Aylur.ags/types

View file

@ -0,0 +1,219 @@
const hyprland = await Service.import("hyprland")
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."'],
})
// 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
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,
})
}
function ClientTitle() {
return Widget.Label({
class_name: "client-title",
label: hyprland.active.client.bind("title"),
})
}
function Clock() {
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 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"
}
})
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",
}
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`
}
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
}),
})
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`)
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"),
})))
return Widget.Box({
children: items,
})
}
// layout of the bar
function Left() {
return Widget.Box({
spacing: 8,
children: [
Workspaces(),
ClientTitle(),
],
})
}
function Center() {
return Widget.Box({
spacing: 8,
children: [
Media(),
Notification(),
],
})
}
function Right() {
return Widget.Box({
hpack: "end",
spacing: 8,
children: [
Volume(),
BatteryLabel(),
Clock(),
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(),
}),
})
}
App.config({
style: "./style.css",
windows: [
Bar(),
// you can call it, for each monitor
// Bar(0),
// Bar(1)
],
})
export { }

View file

@ -0,0 +1,40 @@
window.bar {
background-color: @theme_bg_color;
color: @theme_fg_color;
}
button {
min-width: 0;
padding-top: 0;
padding-bottom: 0;
background-color: transparent;
}
button:active {
background-color: @theme_selected_bg_color;
}
button:hover {
border-bottom: 3px solid @theme_fg_color;
}
label {
font-weight: bold;
}
.workspaces button.focused {
border-bottom: 3px solid @theme_selected_bg_color;
}
.client-title {
color: @theme_selected_bg_color;
}
.notification {
color: black;
}
levelbar block,
highlight {
min-height: 10px;
}

View file

@ -0,0 +1,18 @@
{
"compilerOptions": {
"target": "ES2022",
"module": "ES2022",
"lib": [
"ES2022"
],
"allowJs": true,
"checkJs": true,
"strict": true,
"noImplicitAny": false,
"baseUrl": ".",
"typeRoots": [
"./types"
],
"skipLibCheck": true
}
}

View file

@ -0,0 +1 @@
/nix/store/1yw1cklb7s6snf7x2ahrbgkbs1vgrfyk-ags-1.8.2/share/com.github.Aylur.ags/types

View file

@ -0,0 +1,10 @@
{
pkgs,
config,
...
}: {
config = {
#home.packages = with pkgs; [ ags ];
myAutostartCommands = ["${pkgs.ags}/bin/ags"];
};
}

View file

@ -1,4 +1,4 @@
#his is your home-manager configuration file
# his is your home-manager configuration file
# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
{
inputs,
@ -21,7 +21,7 @@
./wechat
./editors.nix
./gtk.nix
#./ags.nix
./ags
];
nixpkgs = {
@ -36,6 +36,11 @@
# patches = [ ./change-hello-to-hi.patch ];
# });
# })
(final: prev: {
ags = prev.ags.overrideAttrs (old: {
buildInputs = old.buildInputs ++ [pkgs.libdbusmenu-gtk3];
});
})
];
# Configure your nixpkgs instance
config = {
@ -50,9 +55,7 @@
username = "${config.myUserName}";
homeDirectory = "/home/${config.myUserName}";
# copy wallpaper from assets
file = {
"wallpaper.png".source = ./assets/gruvbox-wallpaper.png;
};
file = {"wallpaper.png".source = ./assets/gruvbox-wallpaper.png;};
};
#programs.neovim = {
# enable = true;
@ -64,9 +67,7 @@
#};
programs.thunderbird = {
enable = true;
profiles.default = {
isDefault = true;
};
profiles.default = {isDefault = true;};
};
home.packages = with pkgs; [
protonvpn-gui
@ -81,6 +82,11 @@
discord
zathura
];
myAutostartCommands = [
"${pkgs.clash-verge-rev}/bin/clash-verge"
"${pkgs.firefox}/bin/firefox"
"${pkgs.thunderbird}/bin/thunderbird"
];
programs.git = {
enable = true;
package = pkgs.gitFull;

View file

@ -21,10 +21,13 @@
repeat_rate = 50;
repeat_delay = 250;
};
exec-once = [
"fcitx5"
"ags"
];
exec-once =
config.myAutostartCommands
++ [
''
[workspace special silent] ${pkgs.foot}/bin/foot -f 'BlexMono Nerd Fon
t:size=12' -o colors.alpha=0.85 ${config.myShells.defaultShell}''
];
misc = {
disable_hyprland_logo = true;
disable_splash_rendering = true;
@ -42,7 +45,9 @@
# firefox quickstart
"$mod, F, exec, ${pkgs.firefox}/bin/firefox"
# 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}''
]
++ (
# workspaces
@ -64,9 +69,7 @@
};
# Optional
# Whether to enable hyprland-session.target on hyprland startup
systemd = {
enable = true;
};
systemd = {enable = true;};
};
# ...
}

View file

@ -15,7 +15,7 @@
./fonts.nix
./services/laptop.preset.nix
./hardware-configuration.nix
./ags.nix
#./ags.nix
];
environment.variables = {GDK_SCALE = config.displayScale;};
security.pam.services.hyprlock = {};
@ -88,13 +88,7 @@
#};
programs.hyprland.enable = true; # enables Hyprland DM.
nixpkgs = {
overlays = [
(final: prev: {
ags = prev.ags.overrideAttrs (old: {
buildInputs = old.buildInputs ++ [pkgs.libdbusmenu-gtk3];
});
})
];
overlays = [];
config = {allowUnfree = true;};
};