Compare commits
3 Commits
2649b0a5f8
...
41f6770688
| Author | SHA1 | Date | |
|---|---|---|---|
| 41f6770688 | |||
| 7894259bfe | |||
| f1661eb6e0 |
2
.gitignore
vendored
2
.gitignore
vendored
@ -8,3 +8,5 @@
|
||||
result
|
||||
|
||||
config/neovim/store
|
||||
home/modules/ags/config/types
|
||||
home/modules/ags/config/tsconfig.json
|
||||
|
||||
@ -33,6 +33,8 @@ rec {
|
||||
|
||||
# Enable and configure my custom HM modules.
|
||||
modules = {
|
||||
ags.enable = true;
|
||||
|
||||
chromium = {
|
||||
enable = true;
|
||||
google = false;
|
||||
@ -170,10 +172,7 @@ rec {
|
||||
theme = "Foggy-Lake";
|
||||
};
|
||||
|
||||
waybar = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
waybar.enable = false;
|
||||
zathura.enable = true;
|
||||
};
|
||||
|
||||
|
||||
@ -48,7 +48,6 @@
|
||||
];
|
||||
};
|
||||
|
||||
# TODO: Also set the dunst monitor
|
||||
waybar.monitor = "HDMI-A-1";
|
||||
};
|
||||
|
||||
|
||||
202
home/modules/ags/config/config.js
Normal file
202
home/modules/ags/config/config.js
Normal file
@ -0,0 +1,202 @@
|
||||
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,
|
||||
});
|
||||
}
|
||||
|
||||
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(), Clock(), SysTray()],
|
||||
});
|
||||
}
|
||||
|
||||
function Bar(monitor = 0) {
|
||||
return Widget.Window({
|
||||
name: `bar-${monitor}`,
|
||||
class_name: "ags_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(0)],
|
||||
});
|
||||
40
home/modules/ags/config/style.css
Normal file
40
home/modules/ags/config/style.css
Normal 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: yellow;
|
||||
}
|
||||
|
||||
levelbar block,
|
||||
highlight {
|
||||
min-height: 10px;
|
||||
}
|
||||
@ -2,6 +2,7 @@
|
||||
config,
|
||||
lib,
|
||||
mylib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib;
|
||||
@ -10,7 +11,20 @@ with mylib.modules; let
|
||||
in {
|
||||
options.modules.ags = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
config =
|
||||
mkIf cfg.enable {
|
||||
config = mkIf cfg.enable {
|
||||
programs.ags = {
|
||||
enable = true;
|
||||
systemd.enable = true;
|
||||
|
||||
# configDir = ./config;
|
||||
};
|
||||
|
||||
home.file = {
|
||||
# NOTE: Keep this symlinked as long as I'm configuring
|
||||
".config/ags".source = config.lib.file.mkOutOfStoreSymlink "/home/christoph/NixFlake/home/modules/ags/config";
|
||||
|
||||
# LSP typechecking support
|
||||
# ".config/ags/types".source = config.lib.file.mkOutOfStoreSymlink "${pkgs.ags}/share/com.github.Aylur.ags/types";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
# Obsolete modules are kept in "1_deprecated" for reference.
|
||||
|
||||
# My own HM modules
|
||||
./ags
|
||||
./chromium
|
||||
./color
|
||||
./firefox
|
||||
|
||||
@ -318,6 +318,7 @@ in {
|
||||
};
|
||||
|
||||
# Notification service
|
||||
# TODO: Allow setting the dunst monitor
|
||||
dunst = {
|
||||
enable = true;
|
||||
|
||||
|
||||
@ -35,19 +35,21 @@ in {
|
||||
lua51Packages.xml2lua # For rest
|
||||
lua51Packages.mimetypes # For rest
|
||||
lua51Packages.jsregexp # For tree-sitter
|
||||
nodejs
|
||||
|
||||
# Language servers
|
||||
clang-tools_18
|
||||
clojure-lsp
|
||||
cmake-language-server
|
||||
haskell-language-server
|
||||
ltex-ls
|
||||
lua-language-server
|
||||
nil
|
||||
nixd
|
||||
pyright
|
||||
rust-analyzer
|
||||
texlab
|
||||
ltex-ls
|
||||
typescript
|
||||
|
||||
# Linters
|
||||
checkstyle # java
|
||||
@ -1858,6 +1860,15 @@ in {
|
||||
config = mkDefaultConfig name;
|
||||
};
|
||||
|
||||
typescript-tools = rec {
|
||||
name = "typescript-tools";
|
||||
pkg = pkgs.vimPlugins.typescript-tools-nvim;
|
||||
lazy = true;
|
||||
ft = ["javascript" "typescript"];
|
||||
dependencies = [_plenary lspconfig];
|
||||
config = mkDefaultConfig name;
|
||||
};
|
||||
|
||||
_promise = {
|
||||
name = "promise";
|
||||
pkg = pkgs.vimPlugins.promise-async;
|
||||
@ -2020,6 +2031,7 @@ in {
|
||||
treesitter # AST based syntax highlighting + indentation
|
||||
trim # Trim whitespace
|
||||
trouble # Diagnostics window
|
||||
typescript-tools # Typescript tsserver LSP
|
||||
ufo # Code folding
|
||||
vimtex # LaTeX support
|
||||
wakatime # Time tracking
|
||||
|
||||
@ -46,15 +46,6 @@ with mylib.networking; {
|
||||
};
|
||||
};
|
||||
|
||||
# NOTE: This should be handled by my local DNS
|
||||
# networking.hosts = {
|
||||
# "192.168.86.50" = ["nixinator"];
|
||||
# "192.168.86.4" = ["proxmox"];
|
||||
# "192.168.86.20" = ["truenas"];
|
||||
# "192.168.86.5" = ["opnsense"];
|
||||
# "192.168.86.25" = ["servenix"];
|
||||
# };
|
||||
|
||||
# Enable flakes
|
||||
nix = {
|
||||
package = pkgs.nixVersions.stable;
|
||||
@ -64,18 +55,12 @@ with mylib.networking; {
|
||||
|
||||
settings.trusted-users = ["root" "christoph"];
|
||||
|
||||
# Keep nix-shell from garbage collection for direnv (keep-outputs + keep-derivations)
|
||||
# NOTE: nix-direnv use nix or use flake should do this automatically
|
||||
# keep-outputs = true
|
||||
# keep-derivations = true
|
||||
|
||||
# Auto garbage-collect and optimize store
|
||||
# gc.automatic = true; # NOTE: Disabled for "nh clean"
|
||||
gc.options = "--delete-older-than 5d";
|
||||
settings.auto-optimise-store = true;
|
||||
optimise.automatic = true;
|
||||
|
||||
# TODO: I do not understand this
|
||||
# This will add your inputs as registries, making operations with them (such
|
||||
# as nix shell nixpkgs#name) consistent with your flake inputs.
|
||||
# (Registry contains flakes)
|
||||
@ -88,9 +73,7 @@ with mylib.networking; {
|
||||
# Bootloader/Kernel stuff
|
||||
boot = {
|
||||
kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
|
||||
# kernelPackages = pkgs.linuxPackages_zen; # NOTE: Only set for nixinator
|
||||
# kernelPackages = pkgs.linuxPackages_latest; # The package set that includes the kernel and modules
|
||||
kernelParams = ["mitigations=off"]; # I don't care about security regarding spectre/meltdown
|
||||
kernelParams = ["mitigations=off"]; # I don't care
|
||||
|
||||
# plymouth.enable = true;
|
||||
loader = {
|
||||
@ -118,23 +101,13 @@ with mylib.networking; {
|
||||
hyprlock = {};
|
||||
};
|
||||
|
||||
# TODO: Replace with polkit
|
||||
sudo.enable = true;
|
||||
sudo.extraRules = [
|
||||
{
|
||||
users = ["christoph"];
|
||||
commands = [
|
||||
# Launch gamemode without password because it is annoying
|
||||
# {
|
||||
# command = "/etc/profiles/per-user/christoph/bin/gamemoderun";
|
||||
# options = [ "SETENV" "NOPASSWD" ];
|
||||
# }
|
||||
# {
|
||||
# command = "${pkgs.gamemode}/libexec/cpugovctl";
|
||||
# options = [ "SETENV" "NOPASSWD" ];
|
||||
# }
|
||||
|
||||
# We allow running flatpak without password so flatpaks can be installed from the hm config (needs sudo)
|
||||
# We allow running flatpak without password
|
||||
# so flatpaks can be installed from the hm config
|
||||
{
|
||||
command = "/run/current-system/sw/bin/flatpak";
|
||||
options = ["SETENV" "NOPASSWD"];
|
||||
@ -198,7 +171,7 @@ with mylib.networking; {
|
||||
textEditor = "neovide.desktop"; # Helix.desktop
|
||||
videoPlayer = "mpv.desktop";
|
||||
imageViewer = "imv.desktop";
|
||||
audioPlayer = "vlc.desktop"; # mov.desktop
|
||||
audioPlayer = "mpv.desktop"; # mov.desktop
|
||||
in {
|
||||
"inode/directory" = "nnn.desktop";
|
||||
|
||||
@ -245,8 +218,9 @@ with mylib.networking; {
|
||||
enableDefaultPackages = true; # Some default fonts for unicode coverage
|
||||
fontDir.enable = true; # Puts fonts to /run/current-system/sw/share/X11/fonts
|
||||
|
||||
# Font packages go here
|
||||
# NOTE: Don't do this with HomeManager as I need the fonts in the fontdir for flatpak apps
|
||||
# Font packages go here.
|
||||
# They are installed system-wide so they land in fontdir,
|
||||
# this is required for flatpak to find them.
|
||||
packages = with pkgs; [
|
||||
# Monospace fonts
|
||||
(nerdfonts.override {
|
||||
@ -262,8 +236,6 @@ with mylib.networking; {
|
||||
lxgw-wenkai
|
||||
];
|
||||
|
||||
# TODO: Check if this works
|
||||
# TODO: Conflicts with kde?
|
||||
fontconfig = {
|
||||
enable = true;
|
||||
antialias = true;
|
||||
@ -296,7 +268,8 @@ with mylib.networking; {
|
||||
"lp"
|
||||
"libvirtd"
|
||||
];
|
||||
shell = pkgs.fish; # TODO: Is this needed if programs.fish.enable = true?
|
||||
shell = pkgs.fish;
|
||||
|
||||
# We do this with HomeManager
|
||||
# packages = with pkgs; [];
|
||||
};
|
||||
@ -335,25 +308,12 @@ with mylib.networking; {
|
||||
# egl-wayland
|
||||
];
|
||||
|
||||
# NOTE: Gnome
|
||||
# TODO: Identify all the crap
|
||||
# Remove these packages that come by default with GNOME
|
||||
# environment.gnome.excludePackages = with pkgs.gnome; [
|
||||
# # epiphany # gnome webbrowser, could be good with new version
|
||||
# gnome-maps
|
||||
# gnome-contacts
|
||||
# ];
|
||||
|
||||
# NOTE: Plasma
|
||||
# TODO: Identify all the crap
|
||||
# environment.plasma5.excludePackages = with pkgs.libsForQt5; [
|
||||
# ];
|
||||
|
||||
# It is preferred to use the module (if it exists) over environment.systemPackages, as some extra configs are applied.
|
||||
# I would prefer to use HomeManager for some of these but the modules don't exist (yet)
|
||||
# It is preferred to use the module (if it exists) over environment.systemPackages,
|
||||
# as some extra configs are applied.
|
||||
# I would prefer to use HomeManager for some of these but the modules don't exist (yet).
|
||||
programs = {
|
||||
adb.enable = true;
|
||||
dconf.enable = true; # NOTE: Also needed for Plasma Wayland (GTK theming)
|
||||
dconf.enable = true;
|
||||
fish.enable = true;
|
||||
firejail.enable = true; # Use to run app in network namespace (e.g. through vpn)
|
||||
git.enable = true;
|
||||
@ -376,7 +336,6 @@ with mylib.networking; {
|
||||
# ausweisapp.openFirewall = true; # Directly set port in firewall
|
||||
};
|
||||
|
||||
# sound.enable = false; # Alsa, seems to conflict with PipeWire # NOTE: Deprecated
|
||||
hardware.pulseaudio.enable = false; # Get off my lawn
|
||||
|
||||
# List services that you want to enable:
|
||||
@ -388,9 +347,7 @@ with mylib.networking; {
|
||||
alsa.support32Bit = true;
|
||||
pulse.enable = true;
|
||||
jack.enable = false;
|
||||
|
||||
wireplumber.enable = true; # Probably the default
|
||||
# media-session.enable = false; # NOTE: Deprecated
|
||||
wireplumber.enable = true;
|
||||
};
|
||||
|
||||
# Enable the X11 windowing system.
|
||||
@ -416,6 +373,7 @@ with mylib.networking; {
|
||||
dell-b1160w # TODO: Broken
|
||||
];
|
||||
};
|
||||
|
||||
avahi = {
|
||||
enable = false; # Network printers
|
||||
nssmdns4 = true;
|
||||
@ -441,13 +399,6 @@ with mylib.networking; {
|
||||
enable = true;
|
||||
package = lib.mkForce pkgs.gnome3.gvfs;
|
||||
};
|
||||
# packagekit.enable = true; # KDE Discover/Gnome Software
|
||||
|
||||
# samba = {
|
||||
# package = pkgs.samba4Full;
|
||||
# enable = true;
|
||||
# openFirewall = true;
|
||||
# };
|
||||
|
||||
udev = {
|
||||
packages = with pkgs; [
|
||||
@ -455,10 +406,7 @@ with mylib.networking; {
|
||||
];
|
||||
};
|
||||
|
||||
gnome.gnome-keyring.enable = true; # TODO: Is probably also needed for Plasma (some apps require it)
|
||||
# gnome.sushi.enable = true;
|
||||
# gnome.gnome-settings-daemon.enable = true;
|
||||
# gnome.gnome-online-accounts.enable = true; # Probably Gnome enables this
|
||||
gnome.gnome-keyring.enable = true; # Some apps require this
|
||||
};
|
||||
|
||||
virtualisation = {
|
||||
@ -484,13 +432,9 @@ with mylib.networking; {
|
||||
|
||||
oci-containers.backend = "podman"; # "docker" or "podman"
|
||||
libvirtd.enable = true;
|
||||
|
||||
# Follow steps from https://nixos.wiki/wiki/WayDroid
|
||||
# waydroid.enable = true;
|
||||
# lxd.enable = true;
|
||||
};
|
||||
|
||||
# NOTE: Current system was installed on 22.05, do not change
|
||||
# The current system was installed on 22.05, do not change.
|
||||
# This value determines the NixOS release from which the default
|
||||
# settings for stateful data, like file locations and database versions
|
||||
# on your system were taken. It‘s perfectly fine and recommended to leave
|
||||
|
||||
Reference in New Issue
Block a user