Compare commits
1 Commits
| Author | SHA1 | Date |
|---|---|---|
 Thomas Avé
|
eaba3a8978 |
131
flake.lock
131
flake.lock
|
|
@ -2,19 +2,15 @@
|
|||
"nodes": {
|
||||
"ags": {
|
||||
"inputs": {
|
||||
"astal": [
|
||||
"astal"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
"astal": "astal",
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1764289441,
|
||||
"narHash": "sha256-ak+lgFiYE5PHByN1/BRkO5JP498hno6Ix24C1Qf/vec=",
|
||||
"lastModified": 1744557573,
|
||||
"narHash": "sha256-XAyj0iDuI51BytJ1PwN53uLpzTDdznPDQFG4RwihlTQ=",
|
||||
"owner": "aylur",
|
||||
"repo": "ags",
|
||||
"rev": "e169694390548dfd38ff40f1ef2163d6c3ffe3ea",
|
||||
"rev": "3ed9737bdbc8fc7a7c7ceef2165c9109f336bff6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -26,15 +22,16 @@
|
|||
"astal": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"ags",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1764173295,
|
||||
"narHash": "sha256-Jh4VtPcK2Ov+RTcV9FtyQRsxiJmXFQGfqX6jjM7/mgc=",
|
||||
"lastModified": 1742571008,
|
||||
"narHash": "sha256-5WgfJAeBpxiKbTR/gJvxrGYfqQRge5aUDcGKmU1YZ1Q=",
|
||||
"owner": "aylur",
|
||||
"repo": "astal",
|
||||
"rev": "7d1fac8a4b2a14954843a978d2ddde86168c75ef",
|
||||
"rev": "dc0e5d37abe9424c53dcbd2506a4886ffee6296e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -109,7 +106,7 @@
|
|||
"fzgo": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts",
|
||||
"nixpkgs": "nixpkgs"
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1737991358,
|
||||
|
|
@ -132,11 +129,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1767930051,
|
||||
"narHash": "sha256-YXtqo8h5bAbqC64XAPMMsZdYk8XkwkyNj/7XOsIyVf8=",
|
||||
"lastModified": 1750304462,
|
||||
"narHash": "sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "297a08510894822ddd93ee2cfc66d6ac65a3cebb",
|
||||
"rev": "863842639722dd12ae9e37ca83bcb61a63b36f6c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -167,6 +164,22 @@
|
|||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1743583204,
|
||||
"narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1722421184,
|
||||
"narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=",
|
||||
|
|
@ -182,33 +195,17 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1767767207,
|
||||
"narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5912c1772a44e31bf1c63c0390b90501e5026886",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1767767207,
|
||||
"narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=",
|
||||
"owner": "nixos",
|
||||
"lastModified": 1750134718,
|
||||
"narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5912c1772a44e31bf1c63c0390b90501e5026886",
|
||||
"rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
|
|
@ -216,15 +213,15 @@
|
|||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1762111121,
|
||||
"narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",
|
||||
"owner": "NixOS",
|
||||
"lastModified": 1750134718,
|
||||
"narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4",
|
||||
"rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
|
|
@ -249,14 +246,15 @@
|
|||
"nur": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts_2",
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1767950946,
|
||||
"narHash": "sha256-1uAvkp3rbtF4fdjiiXfGydNOLFcG6J0/LXbHFgQLxKY=",
|
||||
"lastModified": 1750323839,
|
||||
"narHash": "sha256-r2Izw07xe5JEWLjQLI4Y3C/Sw2VNBGNmnZTVWtOyzlg=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "3fabc71263f7765c342740db5360a2308ece715d",
|
||||
"rev": "7f1902da6a047ccffbbb809b98205d08cd5df509",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -268,47 +266,32 @@
|
|||
"root": {
|
||||
"inputs": {
|
||||
"ags": "ags",
|
||||
"astal": "astal",
|
||||
"fzgo": "fzgo",
|
||||
"home-manager": "home-manager",
|
||||
"nixos-06cb-009a-fingerprint-sensor": "nixos-06cb-009a-fingerprint-sensor",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"nur": "nur",
|
||||
"vicinae": "vicinae",
|
||||
"worktimer": "worktimer"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"vicinae": {
|
||||
"treefmt-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"systems": "systems"
|
||||
"nixpkgs": [
|
||||
"nur",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1767893586,
|
||||
"narHash": "sha256-fOMYp8L0k1e/lS9+wii6t52VU1EHGLfHZ2yN4VgfUwQ=",
|
||||
"owner": "vicinaehq",
|
||||
"repo": "vicinae",
|
||||
"rev": "a11af8cf1a4bd15692852e1abc1ecc0d62c4d50e",
|
||||
"lastModified": 1733222881,
|
||||
"narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "49717b5af6f80172275d47a418c9719a31a78b53",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "vicinaehq",
|
||||
"repo": "vicinae",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
|
|
|
|||
26
flake.nix
26
flake.nix
|
|
@ -7,22 +7,12 @@
|
|||
};
|
||||
nur.url = "github:nix-community/NUR";
|
||||
fzgo.url = "git+https://git.thomasave.be/thomasave/fzgo.git";
|
||||
vicinae.url = "github:vicinaehq/vicinae";
|
||||
ags.url = "github:aylur/ags";
|
||||
worktimer = {
|
||||
type = "git";
|
||||
url = "https://git.thomasave.be/thomasave/WorkTimer";
|
||||
ref = "cli";
|
||||
};
|
||||
astal = {
|
||||
url = "github:aylur/astal";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
ags = {
|
||||
url = "github:aylur/ags";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.astal.follows = "astal";
|
||||
};
|
||||
nixos-06cb-009a-fingerprint-sensor = {
|
||||
url = "github:ahbnr/nixos-06cb-009a-fingerprint-sensor?ref=24.11";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
@ -46,12 +36,10 @@
|
|||
substituters = [
|
||||
"https://nix-community.cachix.org"
|
||||
"https://cuda-maintainers.cachix.org"
|
||||
"https://vicinae.cachix.org"
|
||||
];
|
||||
trusted-public-keys = [
|
||||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||
"cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
|
||||
"vicinae.cachix.org-1:1kDrfienkGHPYbkpNj1mWTr7Fm1+zcenzgTizIcI3oc="
|
||||
];
|
||||
experimental-features = [ "nix-command" "flakes" ];
|
||||
trusted-users = [ "root" user ];
|
||||
|
|
@ -88,13 +76,9 @@
|
|||
./hosts/${host}
|
||||
];
|
||||
mkSystem = host: cfg:
|
||||
let
|
||||
system = cfg.system or "x86_64-linux";
|
||||
in
|
||||
nixpkgs.lib.nixosSystem {
|
||||
modules = (commonModules host cfg.user) ++ (cfg.modules or [ ]) ++ [
|
||||
{ nixpkgs.hostPlatform = system; }
|
||||
];
|
||||
system = cfg.system or "x86_64-linux";
|
||||
modules = (commonModules host cfg.user) ++ (cfg.modules or [ ]);
|
||||
specialArgs = inputs;
|
||||
};
|
||||
systems = {
|
||||
|
|
@ -107,7 +91,5 @@
|
|||
Asturia = { user = "user"; };
|
||||
};
|
||||
in
|
||||
{
|
||||
nixosConfigurations = nixpkgs.lib.mapAttrs mkSystem systems;
|
||||
};
|
||||
{ nixosConfigurations = nixpkgs.lib.mapAttrs mkSystem systems; };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,10 +3,13 @@ let
|
|||
fzgo_paths = {
|
||||
files = [
|
||||
"/home/user/.dotfiles"
|
||||
"/home/server/.cache/fzgo/entries/f/|home|user|Workspace"
|
||||
];
|
||||
dirs = [
|
||||
"/home/user/.dotfiles"
|
||||
"/Storage/TrackBox"
|
||||
"/home/server/.cache/fzgo/entries/d/|home|user|Workspace"
|
||||
"/home/server/.cache/fzgo/entries/d/|home|server|Storage|Thomas"
|
||||
"/home/server/.cache/fzgo/entries/d/|home|server|Storage|Shared"
|
||||
];
|
||||
};
|
||||
in
|
||||
|
|
@ -19,11 +22,7 @@ in
|
|||
programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Aloria/id_ed25519";
|
||||
|
||||
home.packages = with pkgs; [
|
||||
# jetbrains.pycharm-professional
|
||||
rclone
|
||||
opencode
|
||||
zed-editor
|
||||
google-cloud-sdk
|
||||
jetbrains.pycharm-professional
|
||||
distrobox
|
||||
gnome-disk-utility
|
||||
moonlight-qt
|
||||
|
|
@ -34,12 +33,21 @@ in
|
|||
smile
|
||||
];
|
||||
|
||||
services.hyprpaper = {
|
||||
settings = {
|
||||
wallpaper = [
|
||||
"HDMI-A-1,${./hyprland/files/wallpaper.png}"
|
||||
"DP-1,${./hyprland/files/wallpaper.png}"
|
||||
"eDP-1,${./hyprland/files/wallpaper.png}"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
monitor = [
|
||||
"eDP-1,2880x1800@120.00Hz,480x0,1.2,vrr,1"
|
||||
"eDP-1,2880x1800@120.00Hz,0x0,1.2"
|
||||
"DP-1,3840x2160@60.00Hz,0x-2160,1"
|
||||
"HDMI-A-1,3840x2160@60.00Hz,0x-2160,1"
|
||||
"DP-3,1920x1080,3840x-540,1"
|
||||
"DP-1,1920x1080,3840x-540,1"
|
||||
];
|
||||
bind = [
|
||||
", XF86PowerOff, exec, ${pkgs.rofi}/bin/rofi -show power-menu -modi power-menu:${
|
||||
|
|
@ -49,6 +57,6 @@ in
|
|||
general.gaps_out = 1;
|
||||
};
|
||||
|
||||
programs.alacritty.settings.font.size = 13;
|
||||
programs.kitty.font.size = 13;
|
||||
programs.alacritty.settings.font.size = 16;
|
||||
programs.kitty.font.size = 15;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,10 +3,13 @@ let
|
|||
fzgo_paths = {
|
||||
files = [
|
||||
"/home/user/.dotfiles"
|
||||
"/home/server/.cache/fzgo/entries/f/|home|user|Workspace"
|
||||
];
|
||||
dirs = [
|
||||
"/home/user/.dotfiles"
|
||||
"/Storage/TrackBox/"
|
||||
"/home/server/.cache/fzgo/entries/d/|home|user|Workspace"
|
||||
"/home/server/.cache/fzgo/entries/d/|home|server|Storage|Thomas"
|
||||
"/home/server/.cache/fzgo/entries/d/|home|server|Storage|Shared"
|
||||
];
|
||||
};
|
||||
in
|
||||
|
|
@ -25,7 +28,7 @@ in
|
|||
vscode
|
||||
texliveFull
|
||||
gnome-power-manager
|
||||
# jetbrains.pycharm-professional
|
||||
jetbrains.pycharm-professional
|
||||
discord
|
||||
smile
|
||||
];
|
||||
|
|
@ -54,5 +57,4 @@ in
|
|||
|
||||
programs.alacritty.settings.font.size = 13;
|
||||
programs.kitty.font.size = 15;
|
||||
programs.foot.settings.main.font = pkgs.lib.mkForce "DejaVu Sans Mono:size=15";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,30 +23,30 @@ let
|
|||
${pkgs.notmuch}/bin/notmuch new
|
||||
'');
|
||||
};
|
||||
# sync_vault = {
|
||||
# when = "*-*-* 02:00:00";
|
||||
# script = toString (pkgs.writeShellScript "script" ''
|
||||
# source $HOME/.secrets/Backup/env.sh
|
||||
# for _ in {1..2}; do
|
||||
# OUTPUT=$(echo "$ZFS_PASSPHRASE" | ssh 10.4.0.1 zfs load-key Vault/Thomas/Encrypted 2>&1);
|
||||
# if [ "$OUTPUT" == "Key load error: Key already loaded for 'Vault/Thomas/Encrypted'." ]; then
|
||||
# echo "Key successfully loaded, starting syncoid"
|
||||
# syncoid --no-privilege-elevation --no-sync-snap tank/Storage/Thomas/Workspace 10.4.0.1:Vault/Thomas/Encrypted/Storage/Workspace
|
||||
# syncoid --no-privilege-elevation --no-sync-snap tank/Storage/Thomas 10.4.0.1:Vault/Thomas/Encrypted/Storage/T
|
||||
# syncoid --no-privilege-elevation --no-sync-snap tank/Storage/Emily 10.4.0.1:Vault/Thomas/Encrypted/Storage/N
|
||||
# syncoid --no-privilege-elevation --no-sync-snap tank/Storage/Yolande 10.4.0.1:Vault/Thomas/Encrypted/Storage/Y
|
||||
# syncoid --no-privilege-elevation --no-sync-snap tank/Containers 10.4.0.1:Vault/Thomas/Encrypted/Containers
|
||||
# ssh 10.4.0.1 zfs unload-key Vault/Thomas/Encrypted
|
||||
# ${pkgs.curl}/bin/curl https://uptime.thomasave.be/api/push/s39pIIrB0R
|
||||
# exit 0
|
||||
# fi
|
||||
# done
|
||||
#
|
||||
# echo "Found output instead: $OUTPUT"
|
||||
# echo "Failed to load key: $OUTPUT" | sendmail
|
||||
# exit 1
|
||||
# '');
|
||||
# };
|
||||
sync_vault = {
|
||||
when = "*-*-* 02:00:00";
|
||||
script = toString (pkgs.writeShellScript "script" ''
|
||||
source $HOME/.secrets/Backup/env.sh
|
||||
for _ in {1..2}; do
|
||||
OUTPUT=$(echo "$ZFS_PASSPHRASE" | ssh 10.4.0.1 zfs load-key Vault/Thomas/Encrypted 2>&1);
|
||||
if [ "$OUTPUT" == "Key load error: Key already loaded for 'Vault/Thomas/Encrypted'." ]; then
|
||||
echo "Key successfully loaded, starting syncoid"
|
||||
syncoid --no-privilege-elevation --no-sync-snap tank/Storage/Thomas/Workspace 10.4.0.1:Vault/Thomas/Encrypted/Storage/Workspace
|
||||
syncoid --no-privilege-elevation --no-sync-snap tank/Storage/Thomas 10.4.0.1:Vault/Thomas/Encrypted/Storage/T
|
||||
syncoid --no-privilege-elevation --no-sync-snap tank/Storage/Emily 10.4.0.1:Vault/Thomas/Encrypted/Storage/N
|
||||
syncoid --no-privilege-elevation --no-sync-snap tank/Storage/Yolande 10.4.0.1:Vault/Thomas/Encrypted/Storage/Y
|
||||
syncoid --no-privilege-elevation --no-sync-snap tank/Containers 10.4.0.1:Vault/Thomas/Encrypted/Containers
|
||||
ssh 10.4.0.1 zfs unload-key Vault/Thomas/Encrypted
|
||||
${pkgs.curl}/bin/curl https://uptime.thomasave.be/api/push/s39pIIrB0R
|
||||
exit 0
|
||||
fi
|
||||
done
|
||||
|
||||
echo "Found output instead: $OUTPUT"
|
||||
echo "Failed to load key: $OUTPUT" | sendmail
|
||||
exit 1
|
||||
'');
|
||||
};
|
||||
backup = {
|
||||
when = "*-*-* 04:00:00";
|
||||
script = toString (pkgs.writeShellScript "script" ''
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
{
|
||||
# add the home manager module
|
||||
imports = [ inputs.ags.homeManagerModules.default ];
|
||||
|
||||
programs.ags = {
|
||||
enable = true;
|
||||
|
||||
configDir = ./files;
|
||||
|
||||
extraPackages = with inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}; [
|
||||
extraPackages = with inputs.ags.packages.${pkgs.system}; [
|
||||
pkgs.gtksourceview
|
||||
pkgs.accountsservice
|
||||
pkgs.libadwaita
|
||||
|
||||
battery
|
||||
hyprland
|
||||
|
|
|
|||
|
|
@ -1,53 +1,37 @@
|
|||
import { Astal, Gdk, Gtk } from "ags/gtk4";
|
||||
import app from "ags/gtk4/app";
|
||||
import { createBinding, createState, For, With, Accessor } from "ags";
|
||||
import { createPoll } from "ags/time";
|
||||
import { Astal, Gdk } from "ags/gtk4";
|
||||
import app from "ags/gtk4/app"
|
||||
import Gtk from "gi://Gtk?version=4.0"
|
||||
import { createBinding, createState } from "ags"
|
||||
import Tray from "gi://AstalTray";
|
||||
import { execAsync } from "ags/process";
|
||||
import { execAsync } from "ags/process"
|
||||
import Hyprland from "gi://AstalHyprland";
|
||||
import { getIconName } from "./utils";
|
||||
import Wp from "gi://AstalWp";
|
||||
import Battery from "gi://AstalBattery";
|
||||
import GLib from "gi://GLib";
|
||||
import Wp from "gi://AstalWp"
|
||||
import Battery from "gi://AstalBattery"
|
||||
|
||||
const battery = Battery.get_default();
|
||||
const sensorsAvailable = await execAsync(["sensors"])
|
||||
.then(() => true)
|
||||
.catch(() => false);
|
||||
const battery = Battery.get_default()
|
||||
const sensorsAvailable = await execAsync(['sensors']).then(() => true).catch(() => false);
|
||||
const wirePlumber = Wp.get_default();
|
||||
|
||||
function SysTray(): JSX.Element {
|
||||
const tray = Tray.get_default();
|
||||
let items = createBinding(tray, "items");
|
||||
|
||||
const init = (btn: Gtk.MenuButton, item: Tray.TrayItem) => {
|
||||
btn.menuModel = item.menuModel;
|
||||
btn.insert_action_group("dbusmenu", item.actionGroup);
|
||||
item.connect("notify::action-group", () => {
|
||||
btn.insert_action_group("dbusmenu", item.actionGroup);
|
||||
});
|
||||
};
|
||||
|
||||
return (
|
||||
<box>
|
||||
<For each={items}>
|
||||
{(item: Tray.TrayItem) => {
|
||||
{createBinding(tray, "items").as((items) =>
|
||||
items.map((item) => {
|
||||
if (item.iconThemePath) app.add_icons(item.iconThemePath);
|
||||
return (
|
||||
<menubutton
|
||||
$={(self) => init(self, item)}
|
||||
class="systray"
|
||||
tooltipMarkup={createBinding(item, "tooltipMarkup")}
|
||||
menuModel={createBinding(item, "menuModel")}
|
||||
>
|
||||
<image
|
||||
gicon={createBinding(item, "gicon")}
|
||||
class="systray-item"
|
||||
/>
|
||||
usePopover={false}
|
||||
actionGroup={createBinding(item, "actionGroup").as(ag => ["dbusmenu", ag])}
|
||||
menuModel={createBinding(item, "menuModel")}>
|
||||
{/* <icon gicon={createBinding(item, "gicon")} class="systray-item" /> */}
|
||||
</menubutton>
|
||||
);
|
||||
}}
|
||||
</For>
|
||||
}),
|
||||
)}
|
||||
</box>
|
||||
);
|
||||
}
|
||||
|
|
@ -69,75 +53,83 @@ function Center(): JSX.Element {
|
|||
}
|
||||
|
||||
function Date({ format = "%Y-%m-%d" }): JSX.Element {
|
||||
const time = createPoll<string>(
|
||||
"",
|
||||
60000,
|
||||
() => GLib.DateTime.new_now_local().format(format)!,
|
||||
);
|
||||
return (
|
||||
<button
|
||||
class="item"
|
||||
label={time}
|
||||
onClicked={() => execAsync(["gnome-calendar"])}
|
||||
/>
|
||||
);
|
||||
const time = createState<string>("").poll(60000, () =>
|
||||
GLib.DateTime.new_now_local().format(format)!)
|
||||
return <button
|
||||
class="item"
|
||||
onDestroy={() => time.drop()}
|
||||
label={time()}
|
||||
onClicked={() => execAsync(['gnome-calendar'])}
|
||||
/>
|
||||
}
|
||||
|
||||
function Time({ format = "%H:%M:%S" }): JSX.Element {
|
||||
const time = createPoll<string>(
|
||||
"",
|
||||
1000,
|
||||
() => GLib.DateTime.new_now_local().format(format)!,
|
||||
);
|
||||
return <label class="item blue" label={time} />;
|
||||
const time = createState<string>("").poll(1000, () =>
|
||||
GLib.DateTime.new_now_local().format(format)!)
|
||||
return <label
|
||||
class="item blue"
|
||||
onDestroy={() => time.drop()}
|
||||
label={time()}
|
||||
/>
|
||||
}
|
||||
|
||||
function Temp(): JSX.Element {
|
||||
let [label, _setlabel] = createState<string>("N/A");
|
||||
let label = createState<string>("N/A");
|
||||
if (sensorsAvailable) {
|
||||
label = createPoll<string>("", 3000, "sensors", (out) => {
|
||||
const match = out
|
||||
.split("\n")
|
||||
.find((line) => line.includes("Tctl") || line.includes("Package"))
|
||||
?.match(/[0-9.]*°C/);
|
||||
label = createState<string>("").poll(5000, 'sensors', out => {
|
||||
const match = out.split('\n').find(line => line.includes('Tctl') || line.includes('Package'))?.match(/[0-9.]*°C/);
|
||||
return match ? match[0] : "N/A";
|
||||
});
|
||||
})
|
||||
}
|
||||
return <label class="item blue" label={label} />;
|
||||
return <label
|
||||
class="item blue"
|
||||
onDestroy={() => label.drop()}
|
||||
label={label()}
|
||||
/>
|
||||
}
|
||||
|
||||
function Memory(): JSX.Element {
|
||||
const memory = createPoll<string>("", 2000, "free", (out) => {
|
||||
const line = out.split("\n").find((line) => line.includes("Mem:"));
|
||||
const memory = createState<string>("").poll(2000, "free", out => {
|
||||
const line = out.split('\n').find(line => line.includes('Mem:'));
|
||||
if (!line) return "N/A";
|
||||
const split = line.split(/\s+/).map(Number);
|
||||
return (split[2] / 1000000).toFixed(2) + "GB";
|
||||
});
|
||||
return <label class="item blue" label={memory} />;
|
||||
return <label
|
||||
class="item blue"
|
||||
onDestroy={() => memory.drop()}
|
||||
label={memory()}
|
||||
/>
|
||||
}
|
||||
|
||||
function ClockSpeed(): JSX.Element {
|
||||
const command =
|
||||
'bash -c "cat /proc/cpuinfo | grep \\"MHz\\" | awk \'{print \\$4}\' | sort -n | tail -1 | awk \'{printf \\"%.2fGHz\\", \\$1/1000}\'"';
|
||||
const speed = createPoll<string>("", 1000, command, (out) => out);
|
||||
return <label class="item" label={speed} />;
|
||||
const command = 'bash -c "cat /proc/cpuinfo | grep \\"MHz\\" | awk \'{print \\$4}\' | sort -n | tail -1 | awk \'{printf \\"%.2fGHz\\", \\$1/1000}\'"';
|
||||
const speed = createState<string>("").poll(5000, command)
|
||||
return <label
|
||||
class="item"
|
||||
onDestroy={() => speed.drop()}
|
||||
label={speed()}
|
||||
/>
|
||||
}
|
||||
|
||||
function CPU(): JSX.Element {
|
||||
const usage = createPoll<string>("", 2000, "top -b -n 1", (out) => {
|
||||
const line = out.split("\n").find((line) => line.includes("Cpu(s)"));
|
||||
const usage = createState<string>("").poll(2000, "top -b -n 1", out => {
|
||||
const line = out.split("\n").find(line => line.includes('Cpu(s)'));
|
||||
if (!line) return "N/A";
|
||||
return line.split(/\s+/)[1].replace(",", ".").toString() + "%";
|
||||
return line.split(/\s+/)[1].replace(',', '.').toString() + "%";
|
||||
});
|
||||
return (
|
||||
<box class="item">
|
||||
<image iconName="speedometer" css="margin-right: 0.7em;" />
|
||||
<label label={usage} />
|
||||
</box>
|
||||
);
|
||||
return <box class="item">
|
||||
{/* <icon icon="speedometer" css="margin-right: 0.7em;" /> */}
|
||||
<label
|
||||
onDestroy={() => usage.drop()}
|
||||
label={usage()}
|
||||
/>
|
||||
</box>
|
||||
}
|
||||
|
||||
function Right() {
|
||||
|
||||
|
||||
function Right(): JSX.Element {
|
||||
return (
|
||||
<box class="right" hexpand halign={Gtk.Align.END} spacing={6}>
|
||||
<Icons />
|
||||
|
|
@ -152,46 +144,31 @@ function Right() {
|
|||
);
|
||||
}
|
||||
|
||||
function BatteryIcon(): JSX.Element {
|
||||
if (battery.get_state() == 0) return <box />;
|
||||
let batteryPercentage = createBinding(battery, "percentage");
|
||||
return (
|
||||
<button
|
||||
class="battery-item"
|
||||
onClicked={() => execAsync(["gnome-power-statistics"])}
|
||||
>
|
||||
<box>
|
||||
<With value={batteryPercentage}>
|
||||
{(percentage) => {
|
||||
const thresholds = [...Array(11).keys()].map((i) => i * 10);
|
||||
const icon = thresholds.find(
|
||||
(threshold) => threshold >= percentage * 100,
|
||||
);
|
||||
const charging_name =
|
||||
battery.percentage >= 0.99 ? "charged" : "charging";
|
||||
return (
|
||||
<image
|
||||
iconName={
|
||||
battery.charging
|
||||
? `battery-level-${icon}-${charging_name}-symbolic`
|
||||
: `battery-level-${icon}-symbolic`
|
||||
}
|
||||
/>
|
||||
);
|
||||
}}
|
||||
</With>
|
||||
</box>
|
||||
</button>
|
||||
);
|
||||
}
|
||||
// function BatteryIcon(): JSX.Element {
|
||||
// if (battery.get_state() == 0) return <box />;
|
||||
// return <button class="battery-item" onClicked={() => execAsync(['gnome-power-statistics'])}>
|
||||
// <box>
|
||||
// {
|
||||
// createBinding(battery, "percentage").as((percentage) => {
|
||||
// const thresholds = [...Array(11).keys()].map(i => i * 10);
|
||||
// const icon = thresholds.find(threshold => threshold >= percentage * 100)
|
||||
// const charging_name = battery.percentage >= 0.99 ? "charged" : "charging"
|
||||
// return <icon
|
||||
// icon={battery.charging ? `battery-level-${icon}-${charging_name}-symbolic` : `battery-level-${icon}-symbolic`}
|
||||
// />
|
||||
// })
|
||||
// }
|
||||
// </box>
|
||||
// </button>
|
||||
// }
|
||||
|
||||
function Icons() {
|
||||
return (
|
||||
<box class="item icon-group">
|
||||
<SysTray />
|
||||
<BatteryIcon />
|
||||
{/* <BatteryIcon /> */}
|
||||
</box>
|
||||
);
|
||||
)
|
||||
}
|
||||
|
||||
function Volume(): JSX.Element {
|
||||
|
|
@ -199,173 +176,120 @@ function Volume(): JSX.Element {
|
|||
|
||||
const audio = wirePlumber.audio;
|
||||
const icon = createBinding(audio.default_speaker, "volume").as((volume) => {
|
||||
const vol = volume * 100;
|
||||
const vol = volume * 100
|
||||
const icon = [
|
||||
[101, "overamplified"],
|
||||
[67, "high"],
|
||||
[34, "medium"],
|
||||
[1, "low"],
|
||||
[0, "muted"],
|
||||
].find(([threshold]) => Number(threshold) <= vol)?.[1];
|
||||
return `audio-volume-${icon}-symbolic`;
|
||||
[101, 'overamplified'],
|
||||
[67, 'high'],
|
||||
[34, 'medium'],
|
||||
[1, 'low'],
|
||||
[0, 'muted'],
|
||||
].find(([threshold]) => Number(threshold) <= vol)?.[1]
|
||||
return `audio-volume-${icon}-symbolic`
|
||||
});
|
||||
const css = createBinding(audio.default_speaker, "mute").as((mute) => {
|
||||
return mute ? "margin-left:0;" : "margin-left: 0.7em;";
|
||||
return mute ? "margin-left:0;" : "margin-left: 0.7em;"
|
||||
});
|
||||
let volume = createBinding(audio.default_speaker, "volume");
|
||||
let mute = createBinding(audio.default_speaker, "mute");
|
||||
return (
|
||||
<button
|
||||
class="item blue"
|
||||
onClicked={() =>
|
||||
(audio.default_speaker.mute = !audio.default_speaker.mute)
|
||||
}
|
||||
>
|
||||
<button class="item blue" onClicked={() => audio.default_speaker.mute = !audio.default_speaker.mute}>
|
||||
<box>
|
||||
<image iconName={icon} />
|
||||
<With value={volume}>
|
||||
{(vol) => (
|
||||
<box>
|
||||
<With value={mute}>
|
||||
{(muted) => {
|
||||
return (
|
||||
<label
|
||||
label={muted ? "" : `${Math.floor(vol * 100)}%`}
|
||||
css={css}
|
||||
/>
|
||||
);
|
||||
}}
|
||||
</With>
|
||||
</box>
|
||||
)}
|
||||
</With>
|
||||
{/* <icon icon={icon} /> */}
|
||||
{
|
||||
createBinding(audio.default_speaker, "volume").as((volume) => <box>
|
||||
{
|
||||
createBinding(audio.default_speaker, "mute").as((mute) => <box>
|
||||
{
|
||||
<label label={mute ? "" : `${Math.floor(volume * 100)}%`} css={css} />
|
||||
}
|
||||
</box>)
|
||||
}
|
||||
</box>)
|
||||
}
|
||||
</box>
|
||||
</button>
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
function Workspaces(): JSX.Element {
|
||||
const hyprland = Hyprland.get_default();
|
||||
let workspaces = createBinding(hyprland, "workspaces");
|
||||
return (
|
||||
<box class="workspaces">
|
||||
<With value={workspaces}>
|
||||
{(wss: Array<Hyprland.Workspace>) => (
|
||||
<box>
|
||||
<With value={createBinding(hyprland, "focusedMonitor")}>
|
||||
{(fm: Hyprland.Monitor) => {
|
||||
let filtered_wss = new Accessor(() =>
|
||||
wss
|
||||
.sort((a, b) => a.id - b.id)
|
||||
.filter(
|
||||
(ws) =>
|
||||
ws &&
|
||||
ws.get_monitor() &&
|
||||
ws.get_monitor().get_id() === fm.get_id(),
|
||||
),
|
||||
);
|
||||
return (
|
||||
<box>
|
||||
<For each={filtered_wss}>
|
||||
{(ws: Hyprland.Workspace, _index) => (
|
||||
<button
|
||||
class={createBinding(hyprland, "focusedWorkspace").as(
|
||||
(fw) => (ws === fw ? "focused" : ""),
|
||||
)}
|
||||
onClicked={() => ws.focus()}
|
||||
>
|
||||
{`${ws.id}`.slice(-1)}
|
||||
</button>
|
||||
)}
|
||||
</For>
|
||||
</box>
|
||||
);
|
||||
}}
|
||||
</With>
|
||||
</box>
|
||||
)}
|
||||
</With>
|
||||
{createBinding(hyprland, "workspaces").as((wss) =>
|
||||
<box>
|
||||
{createBinding(hyprland, "focusedMonitor").as((fm) =>
|
||||
wss.sort((a, b) => a.id - b.id)
|
||||
.filter(ws => ws && ws.get_monitor() && ws.get_monitor().get_id() === fm.get_id())
|
||||
.map((ws) => (
|
||||
<button
|
||||
class={createBinding(hyprland, "focusedWorkspace").as((fw) => ws === fw ? "focused" : "",)}
|
||||
onClicked={() => ws.focus()}
|
||||
>
|
||||
{`${ws.id}`.slice(-1)}
|
||||
</button>
|
||||
)))}
|
||||
</box>
|
||||
)}
|
||||
</box>
|
||||
);
|
||||
}
|
||||
|
||||
function shorten(title: string) {
|
||||
return title.length > 40 ? title.slice(0, 20) + "..." : title;
|
||||
return title.length > 40 ? title.slice(0, 20) + "..." : title
|
||||
}
|
||||
|
||||
function Clients(): JSX.Element {
|
||||
const hyprland = Hyprland.get_default();
|
||||
let clients = createBinding(hyprland, "clients");
|
||||
return (
|
||||
<box>
|
||||
<With value={createBinding(hyprland, "focusedWorkspace")}>
|
||||
{(fw: Hyprland.Workspace) => (
|
||||
{
|
||||
createBinding(hyprland, "focusedWorkspace").as(fw => (
|
||||
<box class="clients">
|
||||
<With value={clients}>
|
||||
{(cls: Array<Hyprland.Client>) => {
|
||||
let filtered_clients = new Accessor(() =>
|
||||
cls
|
||||
.sort((a, b) => a.pid - b.pid)
|
||||
.filter((cl) => !cl.title.includes("rofi"))
|
||||
.filter(
|
||||
(cl) => fw && cl.get_workspace().get_id() === fw.get_id(),
|
||||
),
|
||||
);
|
||||
{
|
||||
createBinding(hyprland, "clients").as(cls =>
|
||||
cls
|
||||
.sort((a, b) => a.pid - b.pid)
|
||||
.filter(cl => !cl.title.includes("rofi"))
|
||||
.filter(cl => fw && cl.get_workspace().get_id() === fw.get_id())
|
||||
.map(cl => (
|
||||
<box
|
||||
class={createBinding(hyprland, "focusedClient").as(a => a && a.address === cl.address ? "focused" : "unfocused")}
|
||||
>
|
||||
{/* <icon */}
|
||||
{/* icon={getIconName(cl)} */}
|
||||
{/* class="app-icon" */}
|
||||
{/* /> */}
|
||||
<label label={createBinding(cl, 'title').as(title => shorten(title))} />
|
||||
</box>
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
return (
|
||||
<box>
|
||||
<For each={filtered_clients}>
|
||||
{(cl: Hyprland.Client, _index) => (
|
||||
<box
|
||||
class={createBinding(hyprland, "focusedClient").as(
|
||||
(a) =>
|
||||
a && a.address === cl.address
|
||||
? "focused"
|
||||
: "unfocused",
|
||||
)}
|
||||
>
|
||||
<image iconName={getIconName(cl)} class="app-icon" />
|
||||
<label
|
||||
label={createBinding(cl, "title").as((title) =>
|
||||
shorten(title),
|
||||
)}
|
||||
/>
|
||||
</box>
|
||||
)}
|
||||
</For>
|
||||
</box>
|
||||
);
|
||||
}}
|
||||
</With>
|
||||
}
|
||||
</box>
|
||||
)}
|
||||
</With>
|
||||
)
|
||||
)
|
||||
}
|
||||
</box>
|
||||
);
|
||||
}
|
||||
|
||||
export default function Bar(gdkmonitor: Gdk.Monitor, scaleFactor: number = 1) {
|
||||
console.log("Creating Bar on monitor:", gdkmonitor);
|
||||
return (
|
||||
<window
|
||||
visible
|
||||
gdkmonitor={gdkmonitor}
|
||||
css={"font-size: " + scaleFactor + "em;"}
|
||||
exclusivity={Astal.Exclusivity.EXCLUSIVE}
|
||||
anchor={
|
||||
Astal.WindowAnchor.TOP |
|
||||
Astal.WindowAnchor.LEFT |
|
||||
Astal.WindowAnchor.RIGHT
|
||||
}
|
||||
application={app}
|
||||
class="Bar"
|
||||
name="top-bar"
|
||||
>
|
||||
<centerbox class="window-box">
|
||||
<Left $type="start" />
|
||||
<Center $type="center" />
|
||||
<Right $type="end" />
|
||||
</centerbox>
|
||||
</window>
|
||||
);
|
||||
export default function Bar(gdkmonitor: Gdk.Monitor, scaleFactor: number = 1): Gtk.Window {
|
||||
return new Gtk.Window({
|
||||
gdkmonitor,
|
||||
css: "font-size: " + scaleFactor + "em;",
|
||||
exclusivity: Astal.Exclusivity.EXCLUSIVE,
|
||||
anchor: Astal.WindowAnchor.TOP | Astal.WindowAnchor.LEFT | Astal.WindowAnchor.RIGHT,
|
||||
application: app,
|
||||
class: "Bar",
|
||||
name: "top-bar",
|
||||
s: self => self.connect("destroy", () => {
|
||||
print("Detroying bar");
|
||||
app.remove_window(self);
|
||||
}),
|
||||
child: <centerbox class="window-box">
|
||||
<Left />
|
||||
<Center />
|
||||
<Right />
|
||||
</centerbox>
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,40 +1,42 @@
|
|||
import app from "ags/gtk4/app";
|
||||
import style from "./style.scss";
|
||||
import Bar from "./Bar";
|
||||
import app from "ags/gtk4/app"
|
||||
import style from "./style.scss"
|
||||
import Bar from "./Bar"
|
||||
import Hyprland from "gi://AstalHyprland";
|
||||
import NotificationPopups from "./notifications/NotificationPopups";
|
||||
import NotificationPopups from "./notifications/NotificationPopups"
|
||||
import Gtk from "gi://Gtk?version=4.0";
|
||||
import { Gdk } from "ags/gtk4";
|
||||
|
||||
const hyprland = Hyprland.get_default();
|
||||
|
||||
function find_main_monitor(): Hyprland.Monitor {
|
||||
let monitors = hyprland.get_monitors();
|
||||
let monitors = hyprland.get_monitors()
|
||||
for (let j = 0; j < monitors.length; j++) {
|
||||
for (const monitor of ["eDP", "DP", "HDMI-A"]) {
|
||||
for (let i = 0; i < monitors.length; i++) {
|
||||
console.log(
|
||||
"Checking monitor:",
|
||||
monitors[i].get_name(),
|
||||
"against",
|
||||
monitor + "-" + j,
|
||||
);
|
||||
console.log("Checking monitor:", monitors[i].get_name(), "against", monitor + "-" + j)
|
||||
if (monitors[i].get_name() == monitor + "-" + j) {
|
||||
return monitors[i];
|
||||
return monitors[i]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return monitors[0];
|
||||
return monitors[0]
|
||||
}
|
||||
|
||||
function register_windows(monitor: Hyprland.Monitor) {
|
||||
let gtkMonitor = app.get_monitors()[0];
|
||||
let scale = monitor.get_width() >= 3000 ? 1.2 : 1;
|
||||
Bar(gtkMonitor, scale);
|
||||
NotificationPopups();
|
||||
let gtkMonitors = app.get_monitors()[0].get_display().get_monitors()
|
||||
let gtkMonitor = gtkMonitors.get_item(0)
|
||||
if (!gtkMonitor) {
|
||||
console.error("No GTK monitor found for the Hyprland monitor:", monitor.get_name());
|
||||
return;
|
||||
}
|
||||
let scale = (monitor.get_width() >= 3000) ? 1.2 : 1
|
||||
Bar(gtkMonitor, scale)
|
||||
NotificationPopups(gtkMonitor)
|
||||
}
|
||||
|
||||
function switch_to_best_monitor() {
|
||||
let mainMonitor = find_main_monitor();
|
||||
let mainMonitor = find_main_monitor()
|
||||
for (var wd of app.get_windows()) {
|
||||
wd.destroy();
|
||||
}
|
||||
|
|
@ -42,19 +44,17 @@ function switch_to_best_monitor() {
|
|||
}
|
||||
|
||||
hyprland.connect("monitor-added", (_, _monitor: Hyprland.Monitor) => {
|
||||
switch_to_best_monitor();
|
||||
});
|
||||
switch_to_best_monitor()
|
||||
})
|
||||
|
||||
hyprland.connect("monitor-removed", () => {
|
||||
switch_to_best_monitor();
|
||||
});
|
||||
|
||||
console.log("Trying to find the best monitor");
|
||||
switch_to_best_monitor()
|
||||
})
|
||||
|
||||
app.start({
|
||||
css: style,
|
||||
iconTheme: "Papirus",
|
||||
main() {
|
||||
switch_to_best_monitor();
|
||||
switch_to_best_monitor()
|
||||
},
|
||||
});
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,21 +1,21 @@
|
|||
declare const SRC: string
|
||||
|
||||
declare module "inline:*" {
|
||||
const content: string
|
||||
export default content
|
||||
const content: string
|
||||
export default content
|
||||
}
|
||||
|
||||
declare module "*.scss" {
|
||||
const content: string
|
||||
export default content
|
||||
const content: string
|
||||
export default content
|
||||
}
|
||||
|
||||
declare module "*.blp" {
|
||||
const content: string
|
||||
export default content
|
||||
const content: string
|
||||
export default content
|
||||
}
|
||||
|
||||
declare module "*.css" {
|
||||
const content: string
|
||||
export default content
|
||||
const content: string
|
||||
export default content
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,110 +1,125 @@
|
|||
@use "sass:string";
|
||||
|
||||
@function gtkalpha($c, $a) {
|
||||
@return string.unquote("alpha(#{$c},#{$a})");
|
||||
@return string.unquote("alpha(#{$c},#{$a})");
|
||||
}
|
||||
|
||||
// https://gitlab.gnome.org/GNOME/gtk/-/blob/gtk-3-24/gtk/theme/Adwaita/_colors-public.scss
|
||||
$fg-color: #{"@theme_bg_color"};
|
||||
$fg-color: #{"@theme_fg_color"};
|
||||
$bg-color: #1f2430;
|
||||
$error: red;
|
||||
|
||||
window.NotificationPopups {
|
||||
all: unset;
|
||||
all: unset;
|
||||
}
|
||||
|
||||
.Notification {
|
||||
border-radius: 13px;
|
||||
background-color: $bg-color;
|
||||
margin: 0.5rem 1rem 0.5rem 1rem;
|
||||
box-shadow: 2px 3px 8px 0 gtkalpha(black, 0.4);
|
||||
border: 1pt solid gtkalpha($fg-color, 0.03);
|
||||
eventbox.Notification {
|
||||
|
||||
&.critical {
|
||||
border: 1pt solid gtkalpha($error, 0.4);
|
||||
&:first-child>box {
|
||||
margin-top: 1rem;
|
||||
}
|
||||
|
||||
&:last-child>box {
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
|
||||
// eventboxes can not take margins so we style its inner box instead
|
||||
>box {
|
||||
min-width: 400px;
|
||||
border-radius: 13px;
|
||||
background-color: #1f2430;
|
||||
margin: .5rem 1rem .5rem 1rem;
|
||||
box-shadow: 2px 3px 8px 0 gtkalpha(black, .4);
|
||||
border: 1pt solid gtkalpha($fg-color, .03);
|
||||
}
|
||||
|
||||
&.critical>box {
|
||||
border: 1pt solid gtkalpha($error, .4);
|
||||
|
||||
.header {
|
||||
|
||||
.app-name {
|
||||
color: gtkalpha($error, .8);
|
||||
|
||||
}
|
||||
|
||||
.app-icon {
|
||||
color: gtkalpha($error, .6);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.header {
|
||||
.app-name {
|
||||
color: gtkalpha($error, 0.8);
|
||||
}
|
||||
padding: .5rem;
|
||||
color: gtkalpha($fg-color, 0.5);
|
||||
|
||||
.app-icon {
|
||||
color: gtkalpha($error, 0.6);
|
||||
}
|
||||
}
|
||||
}
|
||||
.app-icon {
|
||||
margin: 0 .4rem;
|
||||
}
|
||||
|
||||
.header {
|
||||
padding: 0.5rem;
|
||||
color: gtkalpha($fg-color, 0.5);
|
||||
.app-name {
|
||||
margin-right: .3rem;
|
||||
font-weight: bold;
|
||||
|
||||
.app-icon {
|
||||
margin: 0 0.4rem;
|
||||
&:first-child {
|
||||
margin-left: .4rem;
|
||||
}
|
||||
}
|
||||
|
||||
.time {
|
||||
margin: 0 .4rem;
|
||||
}
|
||||
|
||||
button {
|
||||
padding: .2rem;
|
||||
min-width: 0;
|
||||
min-height: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.app-name {
|
||||
margin-right: 0.3rem;
|
||||
font-weight: bold;
|
||||
|
||||
&:first-child {
|
||||
margin-left: 0.4rem;
|
||||
}
|
||||
separator {
|
||||
margin: 0 .4rem;
|
||||
background-color: gtkalpha($fg-color, .1);
|
||||
}
|
||||
|
||||
.time {
|
||||
margin: 0 0.4rem;
|
||||
.content {
|
||||
margin: 1rem;
|
||||
margin-top: .5rem;
|
||||
|
||||
.summary {
|
||||
font-size: 1.2em;
|
||||
color: $fg-color;
|
||||
}
|
||||
|
||||
.body {
|
||||
color: gtkalpha($fg-color, 0.8);
|
||||
}
|
||||
|
||||
.image {
|
||||
border: 1px solid gtkalpha($fg-color, .02);
|
||||
margin-right: .5rem;
|
||||
border-radius: 9px;
|
||||
min-width: 100px;
|
||||
min-height: 100px;
|
||||
background-size: cover;
|
||||
background-position: center;
|
||||
}
|
||||
}
|
||||
|
||||
button {
|
||||
padding: 0.2rem;
|
||||
min-width: 0;
|
||||
min-height: 0;
|
||||
.actions {
|
||||
margin: 1rem;
|
||||
margin-top: 0;
|
||||
|
||||
button {
|
||||
margin: 0 .3rem;
|
||||
|
||||
&:first-child {
|
||||
margin-left: 0;
|
||||
}
|
||||
|
||||
&:last-child {
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
separator {
|
||||
margin: 0 0.4rem;
|
||||
background-color: gtkalpha($fg-color, 0.1);
|
||||
}
|
||||
|
||||
.content {
|
||||
margin: 1rem;
|
||||
margin-top: 0.5rem;
|
||||
|
||||
.summary {
|
||||
font-size: 1.2em;
|
||||
color: $fg-color;
|
||||
}
|
||||
|
||||
.body {
|
||||
color: gtkalpha($fg-color, 0.8);
|
||||
}
|
||||
|
||||
.image {
|
||||
border: 1px solid gtkalpha($fg-color, 0.02);
|
||||
margin-right: 0.5rem;
|
||||
border-radius: 9px;
|
||||
min-width: 100px;
|
||||
min-height: 100px;
|
||||
background-size: cover;
|
||||
background-position: center;
|
||||
}
|
||||
}
|
||||
|
||||
.actions {
|
||||
margin: 1rem;
|
||||
margin-top: 0;
|
||||
|
||||
button {
|
||||
margin: 0 0.3rem;
|
||||
|
||||
&:first-child {
|
||||
margin-left: 0;
|
||||
}
|
||||
|
||||
&:last-child {
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,156 +1,107 @@
|
|||
import { Gtk, Gdk } from "ags/gtk4";
|
||||
import Adw from "gi://Adw";
|
||||
import GLib from "gi://GLib";
|
||||
import AstalNotifd from "gi://AstalNotifd";
|
||||
import Pango from "gi://Pango";
|
||||
import { timeout } from "ags/time";
|
||||
import { Gtk, Astal } from "ags/gtk4"
|
||||
import { EventBox } from "ags"
|
||||
import Notifd from "gi://AstalNotifd"
|
||||
import GLib from "gi://GLib"
|
||||
|
||||
function isIcon(icon?: string | null) {
|
||||
const iconTheme = Gtk.IconTheme.get_for_display(Gdk.Display.get_default()!);
|
||||
return icon && iconTheme.has_icon(icon);
|
||||
}
|
||||
const isIcon = (icon: string) =>
|
||||
!!Astal.Icon.lookup_icon(icon)
|
||||
|
||||
function fileExists(path: string) {
|
||||
return GLib.file_test(path, GLib.FileTest.EXISTS);
|
||||
}
|
||||
const fileExists = (path: string) =>
|
||||
GLib.file_test(path, GLib.FileTest.EXISTS)
|
||||
|
||||
function time(time: number, format = "%H:%M") {
|
||||
return GLib.DateTime.new_from_unix_local(time).format(format)!;
|
||||
}
|
||||
const time = (time: number, format = "%H:%M") => GLib.DateTime
|
||||
.new_from_unix_local(time)
|
||||
.format(format)!
|
||||
|
||||
function urgency(n: AstalNotifd.Notification) {
|
||||
const { LOW, NORMAL, CRITICAL } = AstalNotifd.Urgency;
|
||||
const urgency = (n: Notifd.Notification) => {
|
||||
const { LOW, NORMAL, CRITICAL } = Notifd.Urgency
|
||||
// match operator when?
|
||||
switch (n.urgency) {
|
||||
case LOW:
|
||||
return "low";
|
||||
case CRITICAL:
|
||||
return "critical";
|
||||
case LOW: return "low"
|
||||
case CRITICAL: return "critical"
|
||||
case NORMAL:
|
||||
default:
|
||||
return "normal";
|
||||
default: return "normal"
|
||||
}
|
||||
}
|
||||
|
||||
export default function Notification({
|
||||
notification: n,
|
||||
onHoverLost,
|
||||
}: {
|
||||
notification: AstalNotifd.Notification;
|
||||
onHoverLost: () => void;
|
||||
}) {
|
||||
const timer = timeout(3000, () => {
|
||||
try {
|
||||
onHoverLost();
|
||||
} catch (error) {
|
||||
console.error("Failed to handle onHoverLost:", error);
|
||||
}
|
||||
});
|
||||
|
||||
const handleDismiss = () => {
|
||||
try {
|
||||
n.dismiss();
|
||||
} catch (error) {
|
||||
console.error("Failed to dismiss notification:", error);
|
||||
}
|
||||
};
|
||||
|
||||
const handleInvoke = (id: string) => {
|
||||
try {
|
||||
n.invoke(id);
|
||||
} catch (error) {
|
||||
console.error(`Failed to invoke action ${id}:`, error);
|
||||
}
|
||||
};
|
||||
|
||||
const handleTime = (timeValue: number) => {
|
||||
try {
|
||||
return time(timeValue);
|
||||
} catch (error) {
|
||||
console.error("Failed to format time:", error);
|
||||
return "Invalid time";
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<Adw.Clamp maximumSize={400}>
|
||||
<box
|
||||
widthRequest={400}
|
||||
class={`Notification ${urgency(n)}`}
|
||||
orientation={Gtk.Orientation.VERTICAL}
|
||||
>
|
||||
<Gtk.EventControllerMotion
|
||||
onEnter={() => timer.cancel()}
|
||||
onLeave={onHoverLost}
|
||||
/>
|
||||
<box class="header">
|
||||
{(n.appIcon || isIcon(n.desktopEntry)) && (
|
||||
<image
|
||||
class="app-icon"
|
||||
visible={Boolean(n.appIcon || n.desktopEntry)}
|
||||
iconName={n.appIcon || n.desktopEntry}
|
||||
/>
|
||||
)}
|
||||
<label
|
||||
class="app-name"
|
||||
halign={Gtk.Align.START}
|
||||
ellipsize={Pango.EllipsizeMode.END}
|
||||
label={n.appName || "Unknown"}
|
||||
/>
|
||||
<label
|
||||
class="time"
|
||||
hexpand
|
||||
halign={Gtk.Align.END}
|
||||
label={handleTime(n.time)}
|
||||
/>
|
||||
<button onClicked={handleDismiss}>
|
||||
<image iconName="window-close-symbolic" />
|
||||
</button>
|
||||
</box>
|
||||
<Gtk.Separator visible />
|
||||
<box class="content">
|
||||
{n.image && fileExists(n.image) && (
|
||||
<image valign={Gtk.Align.START} class="image" file={n.image} />
|
||||
)}
|
||||
{n.image && isIcon(n.image) && (
|
||||
<box valign={Gtk.Align.START} class="icon-image">
|
||||
<image
|
||||
iconName={n.image}
|
||||
halign={Gtk.Align.CENTER}
|
||||
valign={Gtk.Align.CENTER}
|
||||
/>
|
||||
</box>
|
||||
)}
|
||||
<box orientation={Gtk.Orientation.VERTICAL}>
|
||||
<label
|
||||
class="summary"
|
||||
halign={Gtk.Align.START}
|
||||
xalign={0}
|
||||
label={n.summary}
|
||||
ellipsize={Pango.EllipsizeMode.END}
|
||||
/>
|
||||
{n.body && (
|
||||
<label
|
||||
class="body"
|
||||
wrap
|
||||
useMarkup
|
||||
halign={Gtk.Align.START}
|
||||
xalign={0}
|
||||
justify={Gtk.Justification.FILL}
|
||||
label={n.body}
|
||||
/>
|
||||
)}
|
||||
</box>
|
||||
</box>
|
||||
{n.actions.length > 0 && (
|
||||
<box class="actions">
|
||||
{n.actions.map(({ label, id }) => (
|
||||
<button hexpand onClicked={() => handleInvoke(id)}>
|
||||
<label label={label} halign={Gtk.Align.CENTER} hexpand />
|
||||
</button>
|
||||
))}
|
||||
</box>
|
||||
)}
|
||||
</box>
|
||||
</Adw.Clamp>
|
||||
);
|
||||
type Props = {
|
||||
setup(self: EventBox): void
|
||||
onHoverLost(self: EventBox): void
|
||||
notification: Notifd.Notification
|
||||
}
|
||||
|
||||
export default function Notification(props: Props) {
|
||||
const { notification: n, onHoverLost, setup } = props
|
||||
const { START, CENTER, END } = Gtk.Align
|
||||
|
||||
return <eventbox
|
||||
class={`Notification ${urgency(n)}`}
|
||||
setup={setup}
|
||||
onHoverLost={onHoverLost}>
|
||||
<box vertical>
|
||||
<box class="header">
|
||||
{(n.appIcon || n.desktopEntry) && <icon
|
||||
class="app-icon"
|
||||
visible={Boolean(n.appIcon || n.desktopEntry)}
|
||||
icon={n.appIcon || n.desktopEntry}
|
||||
/>}
|
||||
<label
|
||||
class="app-name"
|
||||
halign={START}
|
||||
truncate
|
||||
label={n.appName || "Unknown"}
|
||||
/>
|
||||
<label
|
||||
class="time"
|
||||
hexpand
|
||||
halign={END}
|
||||
label={time(n.time)}
|
||||
/>
|
||||
<button onClicked={() => n.dismiss()}>
|
||||
<icon icon="window-close-symbolic" />
|
||||
</button>
|
||||
</box>
|
||||
<Gtk.Separator visible />
|
||||
<box class="content">
|
||||
{n.image && fileExists(n.image) && <box
|
||||
valign={START}
|
||||
class="image"
|
||||
css={`background-image: url('${n.image}')`}
|
||||
/>}
|
||||
{n.image && isIcon(n.image) && <box
|
||||
expand={false}
|
||||
valign={START}
|
||||
class="icon-image">
|
||||
<icon icon={n.image} expand halign={CENTER} valign={CENTER} />
|
||||
</box>}
|
||||
<box vertical>
|
||||
<label
|
||||
class="summary"
|
||||
halign={START}
|
||||
xalign={0}
|
||||
label={n.summary}
|
||||
truncate
|
||||
/>
|
||||
{n.body && <label
|
||||
class="body"
|
||||
wrap
|
||||
useMarkup
|
||||
halign={START}
|
||||
xalign={0}
|
||||
justifyFill
|
||||
label={n.body}
|
||||
/>}
|
||||
</box>
|
||||
</box>
|
||||
{n.get_actions().length > 0 && <box class="actions">
|
||||
{n.get_actions().map(({ label, id }) => (
|
||||
<button
|
||||
hexpand
|
||||
onClicked={() => n.invoke(id)}>
|
||||
<label label={label} halign={CENTER} hexpand />
|
||||
</button>
|
||||
))}
|
||||
</box>}
|
||||
</box>
|
||||
</eventbox>
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,79 +1,107 @@
|
|||
import app from "ags/gtk4/app";
|
||||
import { Astal, Gtk } from "ags/gtk4";
|
||||
import AstalNotifd from "gi://AstalNotifd";
|
||||
import Notification from "./Notification";
|
||||
import { createBinding, For, createState, onCleanup } from "ags";
|
||||
import { Astal, Gtk, Gdk } from "ags/gtk4"
|
||||
import Notifd from "gi://AstalNotifd"
|
||||
import Notification from "./Notification"
|
||||
import { type Subscribable } from "astal/binding"
|
||||
import { timeout } from "ags/time"
|
||||
import { createBinding, createState } from "ags"
|
||||
import GLib from "gi://GLib"
|
||||
|
||||
export default function NotificationPopups() {
|
||||
const monitors = createBinding(app, "monitors");
|
||||
// see comment below in constructor
|
||||
const TIMEOUT_DELAY = 5000
|
||||
|
||||
const notifd = AstalNotifd.get_default();
|
||||
// The purpose if this class is to replace Variable<Array<Widget>>
|
||||
// with a Map<number, Widget> type in order to track notification widgets
|
||||
// by their id, while making it conviniently bindable as an array
|
||||
class NotifiationMap implements Subscribable {
|
||||
// the underlying map to keep track of id widget pairs
|
||||
private map: Map<number, Gtk.Widget> = new Map()
|
||||
|
||||
const [notifications, setNotifications] = createState(
|
||||
new Array<AstalNotifd.Notification>(),
|
||||
);
|
||||
// it makes sense to use a Variable under the hood and use its
|
||||
// reactivity implementation instead of keeping track of subscribers ourselves
|
||||
private var: Array<Gtk.Widget> = createState([])
|
||||
|
||||
const notifiedHandler = notifd.connect("notified", (_, id, replaced) => {
|
||||
try {
|
||||
const notification = notifd.get_notification(id);
|
||||
if (!notification) {
|
||||
console.error(`Failed to get notification with id: ${id}`);
|
||||
return;
|
||||
}
|
||||
// notify subscribers to rerender when state changes
|
||||
private notifiy() {
|
||||
this.var.set([...this.map.values()].reverse())
|
||||
}
|
||||
|
||||
if (replaced && notifications.get().some((n) => n.id === id)) {
|
||||
setNotifications((ns) =>
|
||||
ns.map((n) => (n.id === id ? notification : n)),
|
||||
);
|
||||
} else {
|
||||
setNotifications((ns) => [notification, ...ns]);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error("Failed to handle notification:", error);
|
||||
}
|
||||
});
|
||||
private constructor() {
|
||||
const notifd = Notifd.get_default()
|
||||
|
||||
const resolvedHandler = notifd.connect("resolved", (_, id) => {
|
||||
try {
|
||||
setNotifications((ns) => ns.filter((n) => n.id !== id));
|
||||
} catch (error) {
|
||||
console.error("Failed to resolve notification:", error);
|
||||
}
|
||||
});
|
||||
/**
|
||||
* uncomment this if you want to
|
||||
* ignore timeout by senders and enforce our own timeout
|
||||
* note that if the notification has any actions
|
||||
* they might not work, since the sender already treats them as resolved
|
||||
*/
|
||||
// notifd.ignoreTimeout = true
|
||||
|
||||
// technically, we don't need to cleanup because in this example this is a root component
|
||||
// and this cleanup function is only called when the program exits, but exiting will cleanup either way
|
||||
// but it's here to remind you that you should not forget to cleanup signal connections
|
||||
onCleanup(() => {
|
||||
notifd.disconnect(notifiedHandler);
|
||||
notifd.disconnect(resolvedHandler);
|
||||
});
|
||||
notifd.connect("notified", (_, id) => {
|
||||
this.set(id, Notification({
|
||||
notification: notifd.get_notification(id)!,
|
||||
|
||||
return (
|
||||
<For each={monitors} cleanup={(win) => (win as Gtk.Window).destroy()}>
|
||||
{(monitor) => (
|
||||
<window
|
||||
class="NotificationPopups"
|
||||
gdkmonitor={monitor}
|
||||
visible={notifications((ns) => ns.length > 0)}
|
||||
anchor={Astal.WindowAnchor.TOP | Astal.WindowAnchor.RIGHT}
|
||||
>
|
||||
<box orientation={Gtk.Orientation.VERTICAL}>
|
||||
<For each={notifications}>
|
||||
{(notification) => (
|
||||
<Notification
|
||||
notification={notification}
|
||||
onHoverLost={() =>
|
||||
setNotifications((ns) =>
|
||||
ns.filter((n) => n.id !== notification.id),
|
||||
)
|
||||
}
|
||||
/>
|
||||
)}
|
||||
</For>
|
||||
</box>
|
||||
</window>
|
||||
)}
|
||||
</For>
|
||||
);
|
||||
// once hovering over the notification is done
|
||||
// destroy the widget without calling notification.dismiss()
|
||||
// so that it acts as a "popup" and we can still display it
|
||||
// in a notification center like widget
|
||||
// but clicking on the close button will close it
|
||||
onHoverLost: () => this.delete(id),
|
||||
|
||||
// notifd by default does not close notifications
|
||||
// until user input or the timeout specified by sender
|
||||
// which we set to ignore above
|
||||
setup: () => timeout(TIMEOUT_DELAY, () => {
|
||||
/**
|
||||
* uncomment this if you want to "hide" the notifications
|
||||
* after TIMEOUT_DELAY
|
||||
*/
|
||||
this.delete(id)
|
||||
})
|
||||
}))
|
||||
})
|
||||
|
||||
// notifications can be closed by the outside before
|
||||
// any user input, which have to be handled too
|
||||
notifd.connect("resolved", (_, id) => {
|
||||
this.delete(id)
|
||||
})
|
||||
}
|
||||
|
||||
private set(key: number, value: Gtk.Widget) {
|
||||
// in case of replacecment destroy previous widget
|
||||
this.map.get(key)?.destroy()
|
||||
this.map.set(key, value)
|
||||
this.notifiy()
|
||||
}
|
||||
|
||||
private delete(key: number) {
|
||||
this.map.get(key)?.destroy()
|
||||
this.map.delete(key)
|
||||
this.notifiy()
|
||||
}
|
||||
|
||||
// needed by the Subscribable interface
|
||||
get() {
|
||||
return this.var.get()
|
||||
}
|
||||
|
||||
// needed by the Subscribable interface
|
||||
subscribe(callback: (list: Array<Gtk.Widget>) => void) {
|
||||
return this.var.subscribe(callback)
|
||||
}
|
||||
}
|
||||
|
||||
export default function NotificationPopups(gdkmonitor: Gdk.Monitor) {
|
||||
const { TOP, RIGHT } = Astal.WindowAnchor
|
||||
const notifs = new NotifiationMap()
|
||||
|
||||
return <window
|
||||
className="NotificationPopups"
|
||||
gdkmonitor={gdkmonitor}
|
||||
exclusivity={Astal.Exclusivity.EXCLUSIVE}
|
||||
anchor={TOP | RIGHT}>
|
||||
<box vertical>
|
||||
{createBinding(notifs)}
|
||||
</box>
|
||||
</window>
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"dependencies": {
|
||||
"ags": "*"
|
||||
}
|
||||
"dependencies": {
|
||||
"ags": "*"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ window.Bar {
|
|||
margin-top: 0.2em;
|
||||
}
|
||||
|
||||
.clients box box {
|
||||
.clients box {
|
||||
margin-right: 0.3em;
|
||||
}
|
||||
|
||||
|
|
@ -27,13 +27,11 @@ window.Bar {
|
|||
border-radius: 0.3em;
|
||||
background: #1f2430;
|
||||
}
|
||||
|
||||
.battery-item:hover {
|
||||
background: #023269;
|
||||
}
|
||||
|
||||
.item,
|
||||
.clients box box {
|
||||
.item, .clients box {
|
||||
background: #1f2430;
|
||||
padding-left: 0.7em;
|
||||
padding-right: 0.7em;
|
||||
|
|
@ -51,14 +49,12 @@ window.Bar {
|
|||
|
||||
button {
|
||||
background: #1f2430;
|
||||
border: none;
|
||||
border:none;
|
||||
padding: 0.2em;
|
||||
border-radius: 0.3em;
|
||||
font-weight: normal;
|
||||
}
|
||||
|
||||
.focused,
|
||||
.clients box.focused {
|
||||
.focused, .clients box.focused {
|
||||
background: #023269;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,72 +1,40 @@
|
|||
import Apps from "gi://AstalApps";
|
||||
import Apps from "gi://AstalApps"
|
||||
import AstalHyprland from "gi://AstalHyprland";
|
||||
|
||||
const app_icons = new Apps.Apps().list.reduce(
|
||||
(acc, app) => {
|
||||
// keys from AstalApps entries are typically wm_class (snake_case) or name
|
||||
const key = app.wm_class ?? app.name;
|
||||
if (key) {
|
||||
acc.classOrNames[key] = app.icon_name;
|
||||
}
|
||||
if (app.executable) {
|
||||
if (app.icon_name) {
|
||||
acc.classOrNames[app.wm_class ?? app.name] = app.icon_name;
|
||||
acc.executables[app.executable] = app.icon_name;
|
||||
}
|
||||
return acc;
|
||||
},
|
||||
{ classOrNames: {} as Record<string, string>, executables: {} as Record<string, string> },
|
||||
{ classOrNames: {}, executables: {} },
|
||||
);
|
||||
|
||||
export function getIconName(client: AstalHyprland.Client | null | undefined) {
|
||||
if (!client) return "";
|
||||
export function getIconName(client: AstalHyprland.Client) {
|
||||
if (!client) {
|
||||
return "";
|
||||
}
|
||||
|
||||
// try a bunch of fields (snake_case and camelCase variants)
|
||||
const possibleKeys = [
|
||||
// common client properties (snake_case)
|
||||
(client as any).wm_class,
|
||||
(client as any).initial_class,
|
||||
(client as any).executable,
|
||||
// camelCase variants (some bindings expose these)
|
||||
(client as any).class,
|
||||
(client as any).initialClass,
|
||||
(client as any).initialTitle,
|
||||
(client as any).title,
|
||||
(client as any).name,
|
||||
].filter(Boolean) as string[];
|
||||
|
||||
// 1) direct exact match
|
||||
for (const k of possibleKeys) {
|
||||
const icon = app_icons.classOrNames[k] ?? app_icons.executables[k];
|
||||
if (icon) {
|
||||
// cache the mapping for this client's canonical class (prefer wm_class or class)
|
||||
const cacheKey = (client as any).wm_class ?? (client as any).class ?? (client as any).name ?? k;
|
||||
app_icons.classOrNames[cacheKey] = icon;
|
||||
return icon;
|
||||
let icon = app_icons.classOrNames[client.class];
|
||||
if (!icon) {
|
||||
const icon_key = Object.keys(app_icons.classOrNames).find(
|
||||
(key) =>
|
||||
key.includes(client.title) ||
|
||||
key.includes(client.initialTitle) ||
|
||||
key.includes(client.initialClass) ||
|
||||
key.includes(client.class),
|
||||
);
|
||||
if (icon_key) {
|
||||
icon = app_icons.classOrNames[icon_key];
|
||||
app_icons.classOrNames[client.class] = icon;
|
||||
}
|
||||
}
|
||||
|
||||
// 2) fuzzy match: see if any stored key includes any of the client strings (title, name, etc.)
|
||||
const searchStrings = [
|
||||
(client as any).title,
|
||||
(client as any).initialTitle,
|
||||
(client as any).initial_class,
|
||||
(client as any).initialClass,
|
||||
(client as any).wm_class,
|
||||
(client as any).class,
|
||||
(client as any).name,
|
||||
].filter(Boolean) as string[];
|
||||
|
||||
for (const s of searchStrings) {
|
||||
const matchKey = Object.keys(app_icons.classOrNames).find((key) => key.includes(s));
|
||||
if (matchKey) {
|
||||
const icon = app_icons.classOrNames[matchKey];
|
||||
const cacheKey = (client as any).wm_class ?? (client as any).class ?? (client as any).name ?? s;
|
||||
app_icons.classOrNames[cacheKey] = icon;
|
||||
return icon;
|
||||
}
|
||||
if (!icon) {
|
||||
app_icons.classOrNames[client.class] = "";
|
||||
}
|
||||
|
||||
// nothing found — cache empty string so we don't repeat work
|
||||
const cacheKey = (client as any).wm_class ?? (client as any).class ?? (client as any).name ?? "";
|
||||
if (cacheKey) app_icons.classOrNames[cacheKey] = "";
|
||||
return "";
|
||||
return icon;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
}: let
|
||||
system = "x86_64-linux";
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
extraPackages = with ags.packages.${pkgs.stdenv.hostPlatform.system}; [
|
||||
extraPackages = with ags.packages.${pkgs.system}; [
|
||||
pkgs.gtksourceview
|
||||
pkgs.accountsservice
|
||||
|
||||
|
|
|
|||
|
|
@ -40,8 +40,27 @@
|
|||
};
|
||||
};
|
||||
font = {
|
||||
size = pkgs.lib.mkDefault 13;
|
||||
normal.family = "DejaVu Sans Mono";
|
||||
size = pkgs.lib.mkDefault 15;
|
||||
bold = {
|
||||
family = "ZedMono Nerd Font";
|
||||
style = "Extended Bold";
|
||||
features = "+ss05";
|
||||
};
|
||||
bold_italic = {
|
||||
family = "ZedMono Nerd Font";
|
||||
style = "Extended Bold Italic";
|
||||
features = "+ss05";
|
||||
};
|
||||
italic = {
|
||||
family = "ZedMono Nerd Font";
|
||||
style = "Extended Italic";
|
||||
features = "+ss05";
|
||||
};
|
||||
normal = {
|
||||
family = "ZedMono Nerd Font";
|
||||
style = "Extended Light";
|
||||
features = "+ss05";
|
||||
};
|
||||
};
|
||||
keyboard.bindings = [
|
||||
{
|
||||
|
|
|
|||
|
|
@ -83,20 +83,20 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
# xdg.mimeApps.defaultApplications = {
|
||||
# "application/json" = [ "firefox.desktop" ];
|
||||
# "application/x-extension-htm" = [ "firefox.desktop" ];
|
||||
# "application/x-extension-html" = [ "firefox.desktop" ];
|
||||
# "application/x-extension-shtml" = [ "firefox.desktop" ];
|
||||
# "application/x-extension-xhtml" = [ "firefox.desktop" ];
|
||||
# "application/x-extension-xht" = [ "firefox.desktop" ];
|
||||
# "application/xhtml+xml" = [ "firefox.desktop" ];
|
||||
# "text/html" = [ "firefox.desktop" ];
|
||||
# "text/xml" = [ "firefox.desktop" ];
|
||||
# "x-scheme-handler/about" = [ "firefox.desktop" ];
|
||||
# "x-scheme-handler/ftp" = [ "firefox.desktop" ];
|
||||
# "x-scheme-handler/http" = [ "firefox.desktop" ];
|
||||
# "x-scheme-handler/unknown" = [ "firefox.desktop" ];
|
||||
# "x-scheme-handler/https" = [ "firefox.desktop" ];
|
||||
# };
|
||||
xdg.mimeApps.defaultApplications = {
|
||||
"application/json" = [ "firefox.desktop" ];
|
||||
"application/x-extension-htm" = [ "firefox.desktop" ];
|
||||
"application/x-extension-html" = [ "firefox.desktop" ];
|
||||
"application/x-extension-shtml" = [ "firefox.desktop" ];
|
||||
"application/x-extension-xhtml" = [ "firefox.desktop" ];
|
||||
"application/x-extension-xht" = [ "firefox.desktop" ];
|
||||
"application/xhtml+xml" = [ "firefox.desktop" ];
|
||||
"text/html" = [ "firefox.desktop" ];
|
||||
"text/xml" = [ "firefox.desktop" ];
|
||||
"x-scheme-handler/about" = [ "firefox.desktop" ];
|
||||
"x-scheme-handler/ftp" = [ "firefox.desktop" ];
|
||||
"x-scheme-handler/http" = [ "firefox.desktop" ];
|
||||
"x-scheme-handler/unknown" = [ "firefox.desktop" ];
|
||||
"x-scheme-handler/https" = [ "firefox.desktop" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -5,14 +5,12 @@
|
|||
server.enable = true;
|
||||
settings = {
|
||||
main = {
|
||||
font = "DejaVu Sans Mono:size=13";
|
||||
font = "Iosevka:size=14:style=Extended:fontfeatures=+ss05";
|
||||
term = "xterm-256color";
|
||||
line-height = "18";
|
||||
};
|
||||
tweak = {
|
||||
sixel = "yes";
|
||||
};
|
||||
scrollback.lines = 100000;
|
||||
colors = {
|
||||
background = "000010";
|
||||
foreground = "F8F8F2";
|
||||
|
|
|
|||
|
|
@ -3,20 +3,22 @@
|
|||
{
|
||||
programs.git = {
|
||||
enable = true;
|
||||
userName = "Thomas Avé";
|
||||
userEmail = "email@thomasave.be";
|
||||
lfs.enable = true;
|
||||
settings = {
|
||||
alias = {
|
||||
s = "status";
|
||||
a = "add";
|
||||
};
|
||||
user = {
|
||||
name = "Thomas Avé";
|
||||
email = "email@thomasave.be";
|
||||
};
|
||||
aliases = {
|
||||
s = "status";
|
||||
a = "add";
|
||||
};
|
||||
ignores = [
|
||||
"*.direnv/"
|
||||
".dmypy.json"
|
||||
];
|
||||
extraConfig = {
|
||||
credentials.helper = "store";
|
||||
pull.rebase = false;
|
||||
push.autoSetupRemove = true;
|
||||
branch.autoSetupMerge = true;
|
||||
branch.autoSetupMerge = "simple";
|
||||
init.defaultBranch = "master";
|
||||
diff.noprefix = true;
|
||||
color.ui = "auto";
|
||||
|
|
@ -26,17 +28,12 @@
|
|||
};
|
||||
rerere.enabled = true;
|
||||
};
|
||||
ignores = [
|
||||
"*.direnv/"
|
||||
".dmypy.json"
|
||||
];
|
||||
};
|
||||
programs.lazygit = {
|
||||
enable = true;
|
||||
settings = {
|
||||
os = {
|
||||
editPreset = "nvim";
|
||||
autoStageResolvedConflicts = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,59 +0,0 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
home.packages = [
|
||||
(pkgs.appimageTools.wrapType2 {
|
||||
pname = "Helium";
|
||||
version = "0.4.7.1";
|
||||
src = pkgs.fetchurl {
|
||||
url = "https://github.com/imputnet/helium-linux/releases/download/0.5.8.1/helium-0.5.8.1-x86_64.AppImage";
|
||||
sha256 = "sha256-d8kwLEU6qgEgp7nlEwdfRevB1JrbEKHRe8+GhGpGUig=";
|
||||
};
|
||||
})
|
||||
];
|
||||
xdg.desktopEntries = {
|
||||
helium = {
|
||||
name = "Helium";
|
||||
genericName = "Web Browser";
|
||||
comment = "Access the Internet";
|
||||
exec = "Helium --enable-features=TouchpadOverscrollHistoryNavigation %U";
|
||||
startupNotify = true;
|
||||
terminal = false;
|
||||
icon = "chromium";
|
||||
type = "Application";
|
||||
categories = [ "Network" "WebBrowser" ];
|
||||
mimeType = [
|
||||
"x-scheme-handler/webcal"
|
||||
"application/pdf"
|
||||
"application/rdf+xml"
|
||||
"application/rss+xml"
|
||||
"application/xhtml+xml"
|
||||
"application/xhtml_xml"
|
||||
"application/xml"
|
||||
"image/gif"
|
||||
"image/jpeg"
|
||||
"image/png"
|
||||
"image/webp"
|
||||
"text/html"
|
||||
"text/xml"
|
||||
"x-scheme-handler/http"
|
||||
"x-scheme-handler/https"
|
||||
];
|
||||
};
|
||||
};
|
||||
xdg.mimeApps.defaultApplications = {
|
||||
"application/json" = [ "helium.desktop" ];
|
||||
"application/x-extension-htm" = [ "helium.desktop" ];
|
||||
"application/x-extension-html" = [ "helium.desktop" ];
|
||||
"application/x-extension-shtml" = [ "helium.desktop" ];
|
||||
"application/x-extension-xhtml" = [ "helium.desktop" ];
|
||||
"application/x-extension-xht" = [ "helium.desktop" ];
|
||||
"application/xhtml+xml" = [ "helium.desktop" ];
|
||||
"text/html" = [ "helium.desktop" ];
|
||||
"text/xml" = [ "helium.desktop" ];
|
||||
"x-scheme-handler/about" = [ "helium.desktop" ];
|
||||
"x-scheme-handler/ftp" = [ "helium.desktop" ];
|
||||
"x-scheme-handler/http" = [ "helium.desktop" ];
|
||||
"x-scheme-handler/unknown" = [ "helium.desktop" ];
|
||||
"x-scheme-handler/https" = [ "helium.desktop" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,16 +1,32 @@
|
|||
{ pkgs, ... }:
|
||||
{ inputs, pkgs, ... }:
|
||||
let
|
||||
playerctl = "${pkgs.playerctl}/bin/playerctl";
|
||||
wl-paste = "${pkgs.wl-clipboard}/bin/wl-paste";
|
||||
nautilus = "${pkgs.nautilus}/bin/nautilus";
|
||||
gnome-calendar = "${pkgs.gnome-calendar}/bin/gnome-calendar";
|
||||
wpctl = "${pkgs.wireplumber}/bin/wpctl";
|
||||
terminal-name = "foot";
|
||||
terminal = "${pkgs.foot}/bin/footclient";
|
||||
terminal-name = ".kitty-wrapped";
|
||||
terminal = "${pkgs.kitty}/bin/kitty -1";
|
||||
rofi = "${pkgs.rofi-wayland}/bin/rofi";
|
||||
jq = "${pkgs.jq}/bin/jq";
|
||||
rofi-ykman = pkgs.writeShellScriptBin "rofi-ykman" ''
|
||||
accounts=$(${pkgs.yubikey-manager}/bin/ykman oath accounts list)
|
||||
prompt="YubiKey OATH"
|
||||
account=$(echo "''${accounts/, TOTP/\n}" | awk '{ print $0 "\0icon\x1fyubioath"; }' | ${rofi} -dmenu -i -p "$prompt" ''${shortcuts[@]})
|
||||
code=$(${pkgs.yubikey-manager}/bin/ykman oath accounts code "$account")
|
||||
IFS=', ' read -r -a code <<< "$code"
|
||||
echo -n "''${code[-1]}" | ${pkgs.wl-clipboard}/bin/wl-copy;
|
||||
'';
|
||||
|
||||
# workspace_command_prefix = "split-";
|
||||
# hyprland_plugins = [ inputs.split-monitor-workspaces.packages.${pkgs.system}.split-monitor-workspaces ];
|
||||
|
||||
workspace_command_prefix = "split:";
|
||||
hyprland_plugins = [ pkgs.hyprlandPlugins.hyprsplit ];
|
||||
|
||||
# Disable split-monitor-workspaces
|
||||
workspace_command_prefix = "";
|
||||
hyprland_plugins = [];
|
||||
# workspace_command_prefix = "";
|
||||
# hyprland_plugins = [];
|
||||
|
||||
launch_terminal = pkgs.writeShellScriptBin "launch_terminal" ''
|
||||
function find_leaf_pid(){
|
||||
|
|
@ -65,12 +81,13 @@ in {
|
|||
services.hyprpaper = {
|
||||
enable = true;
|
||||
settings = {
|
||||
ipc = "on";
|
||||
ipc = "off";
|
||||
splash = false;
|
||||
wallpaper = {
|
||||
path = "${./files/wallpaper.png}";
|
||||
monitor = "";
|
||||
};
|
||||
preload = [ "${./files/wallpaper.png}" ];
|
||||
wallpaper = [
|
||||
# Fill in by host-specific config!
|
||||
# "Display,${./files/wallpaper.png}"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -107,17 +124,20 @@ in {
|
|||
|
||||
wayland.windowManager.hyprland = {
|
||||
enable = true;
|
||||
systemd.enable = false;
|
||||
systemd.variables = [ "--all" ];
|
||||
systemd.enable = true;
|
||||
systemd.enableXdgAutostart = true;
|
||||
xwayland.enable = true;
|
||||
plugins = [ ] ++ hyprland_plugins;
|
||||
settings = {
|
||||
"$mainMod" = pkgs.lib.mkDefault "SUPER_L";
|
||||
"$altMod" = pkgs.lib.mkDefault "ALT_L";
|
||||
exec-once = [
|
||||
"uwsm app -- hyprpaper"
|
||||
"uwsm app -- foot --server"
|
||||
"uwsm app -- hyprctl dispatch exec ags run"
|
||||
"uwsm app -- ${pkgs.mate.mate-polkit}/bin/polkit-mate"
|
||||
"hyprpaper"
|
||||
"hyprctl dispatch exec ags run"
|
||||
"${wl-paste} --type text --watch cliphist store"
|
||||
"${wl-paste} --type image --watch cliphist store"
|
||||
"${pkgs.mate.mate-polkit}/bin/polkit-mate"
|
||||
];
|
||||
env = [
|
||||
"WLR_NO_HARDWARE_CURSORS,1"
|
||||
|
|
@ -125,39 +145,19 @@ in {
|
|||
"WLR_RENDERER_ALLOW_SOFTWARE,1"
|
||||
];
|
||||
debug = { disable_logs = false; };
|
||||
|
||||
# UPDATED: New Window Rule Syntax (0.53.0)
|
||||
windowrule = [
|
||||
"float on, match:title ^(rofi)(.*)$"
|
||||
"center on, match:title ^(rofi)(.*)$"
|
||||
"border_size 0, match:title ^(rofi)(.*)$" # 'noborder' is replaced by border_size 0
|
||||
|
||||
# Combined matches (replaces old multi-rule logic)
|
||||
"stay_focused on, match:title ^()$, match:class ^(steam)$"
|
||||
"min_size 1 1, match:title ^()$, match:class ^(steam)$"
|
||||
"stay_focused on, match:title ^()$, match:class ^(steam)$"
|
||||
|
||||
"workspace 8, match:class thunderbird"
|
||||
"workspace 9, match:class spotify"
|
||||
"workspace 10, match:class Slack"
|
||||
|
||||
# Windowrulev2-style logic updated to new prop syntax
|
||||
"border_size 0, match:float 0, match:workspace w[tv1]"
|
||||
"rounding 0, match:float 0, match:workspace w[tv1]"
|
||||
"border_size 0, match:float 0, match:workspace f[1]"
|
||||
"rounding 0, match:float 0, match:workspace f[1]"
|
||||
windowrulev2 = [
|
||||
"float, title:^(rofi)(.*)$"
|
||||
"center, title:^(rofi)(.*)$"
|
||||
"noborder, title:^(rofi)(.*)$"
|
||||
"stayfocused, title:^()$,class:^(steam)$"
|
||||
"minsize 1 1, title:^()$,class:^(steam)$"
|
||||
"stayfocused, title:^()$,class:^(steam)$"
|
||||
"bordersize 0, floating:0, onworkspace:w[tv1]"
|
||||
"rounding 0, floating:0, onworkspace:w[tv1]"
|
||||
"bordersize 0, floating:0, onworkspace:f[1]"
|
||||
"rounding 0, floating:0, onworkspace:f[1]"
|
||||
];
|
||||
|
||||
# UPDATED: New Layer Rule Syntax (0.53.0)
|
||||
# Syntax: effect value, match:namespace regex
|
||||
layerrule = [
|
||||
"no_anim on, match:namespace ags_bar_0"
|
||||
"no_anim on, match:namespace selection"
|
||||
"blur on, match:namespace vicinae"
|
||||
"ignore_alpha 0, match:namespace vicinae"
|
||||
"no_anim on, match:namespace vicinae"
|
||||
];
|
||||
|
||||
layerrule = [ "noanim,ags_bar_0" "noanim,selection" ];
|
||||
general = {
|
||||
gaps_in = 1;
|
||||
gaps_out = pkgs.lib.mkDefault 5;
|
||||
|
|
@ -169,14 +169,14 @@ in {
|
|||
input = {
|
||||
kb_layout = "us";
|
||||
follow_mouse = 1;
|
||||
kb_options = pkgs.lib.mkDefault "compose:rctrl, caps:ctrl_modifier";
|
||||
kb_options = pkgs.lib.mkDefault "compose:rctrl, shift:both_capslock, caps:ctrl_modifier";
|
||||
numlock_by_default = true;
|
||||
};
|
||||
binds = { scroll_event_delay = 1; };
|
||||
xwayland = { force_zero_scaling = true; };
|
||||
misc = {
|
||||
disable_hyprland_logo = 1;
|
||||
# Removed 'enable_anr_dialog' (deprecated/removed in recent versions)
|
||||
enable_anr_dialog = false;
|
||||
};
|
||||
decoration = {
|
||||
rounding = 1;
|
||||
|
|
@ -198,11 +198,8 @@ in {
|
|||
preserve_split = "yes";
|
||||
force_split = 2;
|
||||
};
|
||||
|
||||
gesture = [
|
||||
"3, horizontal, workspace"
|
||||
];
|
||||
gestures = {
|
||||
workspace_swipe = "on";
|
||||
workspace_swipe_invert = false;
|
||||
};
|
||||
device = [
|
||||
|
|
@ -220,7 +217,7 @@ in {
|
|||
"f[1], gapsout:0, gapsin:0"
|
||||
];
|
||||
bindr = [
|
||||
"$mainMod, $mainMod, exec, vicinae toggle"
|
||||
"$mainMod, $mainMod, exec, pkill rofi || ${rofi} -show drun"
|
||||
];
|
||||
bindm = [
|
||||
"$mainMod, mouse:272, movewindow"
|
||||
|
|
@ -238,22 +235,24 @@ in {
|
|||
"$mainMod, Q, killactive,"
|
||||
"$mainMod, A, exec, ${nautilus}"
|
||||
"$mainMod, S, exec, LC_TIME=\"en_GB.UTF-8\" ${gnome-calendar}"
|
||||
"$mainMod, B, exec, Helium"
|
||||
"$mainMod, B, exec, MOZ_ENABLE_WAYLAND=1 firefox"
|
||||
"$mainMod, M, fullscreen, 1"
|
||||
"$mainMod, F11, fullscreen"
|
||||
"$mainMod, F, togglefloating,"
|
||||
"$mainMod, SPACE, togglesplit, # dwindle"
|
||||
"CONTROL_L ALT_L, L, exec, ${pkgs.hyprlock}/bin/hyprlock"
|
||||
"$mainMod, C, exec, vicinae vicinae://extensions/vicinae/clipboard/history"
|
||||
"$mainMod, W, exec, vicinae vicinae://extensions/vicinae/wm/switch-windows"
|
||||
"$mainMod, Escape, exec, vicinae open -q \"Power Management \""
|
||||
''$mainMod, C, exec, cliphist list | awk '{print $0, "\0icon\x1fcom.github.davidmhewitt.clipped"; }' | ${rofi} -dmenu -display-columns 2 | cliphist decode | wl-copy''
|
||||
"$mainMod, Y, exec, ${rofi-ykman}/bin/rofi-ykman"
|
||||
"$mainMod, N, exec, ${./files/rofi-ssh.sh}"
|
||||
"$mainMod, Escape, exec, ${rofi} -show power-menu -modi power-menu:${ ./files/rofi-power-menu.sh }"
|
||||
|
||||
",XF86MonBrightnessUp, exec, ${pkgs.brightnessctl}/bin/brightnessctl set +10%"
|
||||
",XF86MonBrightnessDown, exec, ${pkgs.brightnessctl}/bin/brightnessctl set 10%-"
|
||||
",XF86AudioRaiseVolume, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 10%+ --limit 1.0"
|
||||
",XF86AudioLowerVolume, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 10%-"
|
||||
",XF86AudioMicMute, exec, ${wpctl} set-mute @DEFAULT_AUDIO_SOURCE@ toggle"
|
||||
# ",mouse:273, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 1%+ --limit 1.0"
|
||||
# ",mouse:272, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 1%-"
|
||||
",mouse_right, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 1%+ --limit 1.0"
|
||||
",mouse_left, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 1%-"
|
||||
",XF86AudioMute, exec, ${wpctl} set-mute @DEFAULT_AUDIO_SINK@ toggle"
|
||||
",XF86AudioNext, exec, ${playerctl} next"
|
||||
",XF86AudioPrev, exec, ${playerctl} previous"
|
||||
|
|
@ -284,6 +283,7 @@ in {
|
|||
"$mainMod SHIFT, Caps_Lock, ${workspace_command_prefix}workspace, m-1"
|
||||
] ++ (
|
||||
# workspaces
|
||||
# binds $mod + [shift +] {1..10} to [move to] workspace {1..10}
|
||||
builtins.concatLists (builtins.genList (x:
|
||||
let
|
||||
ws = let c = (x + 1) / 10; in builtins.toString (x + 1 - (c * 10));
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, ... }:
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
programs.kitty = {
|
||||
|
|
@ -6,7 +6,8 @@
|
|||
shellIntegration.enableZshIntegration = true;
|
||||
font = {
|
||||
name = "'ZedMono Nerd Font' style='Extended Light' features=+ss05";
|
||||
size = lib.mkDefault 13;
|
||||
size = lib.mkDefault 14;
|
||||
|
||||
};
|
||||
keybindings = {
|
||||
"kitty_mod+h" = "kitty_scrollback_nvim";
|
||||
|
|
@ -14,11 +15,8 @@
|
|||
"kitty_mod+enter" = "nop";
|
||||
"kitty_mod+equal" = "change_font_size current +1.0";
|
||||
"kitty_mod+minus" = "change_font_size current -1.0";
|
||||
"ctrl+shift+c" = "copy_to_clipboard";
|
||||
"ctrl+shift+v" = "paste_from_clipboard";
|
||||
};
|
||||
settings = {
|
||||
kitty_mod= "ctrl+alt";
|
||||
cursor_shape = "block";
|
||||
cursor_beam_thickness = 1;
|
||||
scrollback_lines = 100000;
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
*.zip) unzip -l "''$1";;
|
||||
*.rar) unrar l "''$1";;
|
||||
*.7z) 7z l "''$1";;
|
||||
*.pdf) ${pkgs.poppler-utils}/bin/pdftotext "''$1" -;;
|
||||
*.pdf) ${pkgs.poppler_utils}/bin/pdftotext "''$1" -;;
|
||||
*) ${pkgs.highlight}/bin/highlight -O ansi "''$1";;
|
||||
esac
|
||||
'');
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ video-sync=display-resample
|
|||
interpolation
|
||||
tscale=oversample
|
||||
vo=gpu-next
|
||||
hwdec=auto
|
||||
gpu-api=opengl
|
||||
force-window=yes
|
||||
keep-open=yes
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
yaml-language-server
|
||||
bash-language-server
|
||||
docker-compose-language-service
|
||||
dockerfile-language-server
|
||||
dockerfile-language-server-nodejs
|
||||
lua-language-server
|
||||
rust-analyzer
|
||||
gopls
|
||||
|
|
|
|||
|
|
@ -12,14 +12,8 @@ return {
|
|||
},
|
||||
},
|
||||
filetypes = {
|
||||
["*"] = true, -- Enable for all filetypes by default
|
||||
["dap-repl"] = false,
|
||||
["dapui_scopes"] = false,
|
||||
["dapui_stacks"] = false,
|
||||
["dapui_watches"] = false,
|
||||
["dapui_breakpoints"] = false,
|
||||
["TelescopePrompt"] = false,
|
||||
["Trouble"] = false,
|
||||
markdown = true,
|
||||
tex = true,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -88,6 +88,7 @@ return {
|
|||
lazy = false,
|
||||
config = function(_, opts)
|
||||
require('blink.cmp').setup(opts)
|
||||
local lspconfig = require('lspconfig')
|
||||
local filetypes = { "bibtex", "gitcommit", "markdown", "org", "tex", "restructuredtext", "rsweave", "latex",
|
||||
"quarto", "rmd", "context", "html", "xhtml", "typst", "mail" }
|
||||
local lsp_opts = {
|
||||
|
|
@ -195,8 +196,7 @@ return {
|
|||
}
|
||||
for server, config in pairs(lsp_opts.servers) do
|
||||
config.capabilities = require('blink.cmp').get_lsp_capabilities(config.capabilities)
|
||||
vim.lsp.enable(server)
|
||||
vim.lsp.config(server, config)
|
||||
lspconfig[server].setup(config)
|
||||
end
|
||||
vim.diagnostic.config({
|
||||
virtual_text = false
|
||||
|
|
|
|||
|
|
@ -1,37 +1,68 @@
|
|||
return {
|
||||
'nvim-treesitter/nvim-treesitter',
|
||||
branch = 'main',
|
||||
lazy = false,
|
||||
config = function()
|
||||
-- 1. Install Parsers
|
||||
require('nvim-treesitter').install({
|
||||
"typst", "cpp", "c", "lua", "vim", "dockerfile", "python", "java",
|
||||
"cmake", "diff", "gitcommit", "html", "css", "javascript", "json",
|
||||
"rust", "sql", "yaml", "markdown", "markdown_inline", "nix", "bibtex"
|
||||
})
|
||||
|
||||
-- 2. Safe Autocmd for Highlighting & Indent
|
||||
vim.api.nvim_create_autocmd('FileType', {
|
||||
callback = function(args)
|
||||
-- Get the language associated with the filetype
|
||||
local lang = vim.treesitter.language.get_lang(vim.bo[args.buf].filetype)
|
||||
if not lang then return end
|
||||
|
||||
-- IGNORE specific filetypes or large files
|
||||
if lang == "ini" then return end
|
||||
|
||||
local max_filesize = 2000 * 1024 -- 2MB
|
||||
local ok, stats = pcall(vim.uv.fs_stat, vim.api.nvim_buf_get_name(args.buf))
|
||||
if ok and stats and stats.size > max_filesize then return end
|
||||
|
||||
-- SAFEGUARD: Try to start. If it fails (e.g., 'snacks_layout_box'), 'success' will be false.
|
||||
local success, _ = pcall(vim.treesitter.start, args.buf, lang)
|
||||
|
||||
-- Only enable indentation if Treesitter actually started successfully
|
||||
if success then
|
||||
vim.bo[args.buf].indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
|
||||
end
|
||||
end,
|
||||
dependencies = {
|
||||
"luckasRanarison/tree-sitter-hyprlang",
|
||||
"nvim-treesitter/nvim-treesitter-textobjects",
|
||||
},
|
||||
build = ":TSUpdate",
|
||||
config = function ()
|
||||
require("nvim-treesitter.configs").setup({
|
||||
ensure_installed = { "typst", "cpp", "c", "lua", "vim", "dockerfile", "python", "java", "cmake", "diff", "gitcommit", "html", "css", "javascript", "json", "rust", "sql", "yaml", "markdown", "markdown_inline", "nix", "bibtex" },
|
||||
auto_install = true,
|
||||
highlight = {
|
||||
enable = true,
|
||||
sync_install = true,
|
||||
additional_vim_regex_highlighting = false,
|
||||
disable = function(lang, buf) -- Disable if file size is too big
|
||||
if lang == "ini" or lang == "markdown" then
|
||||
return true
|
||||
end
|
||||
local max_filesize = 2000 * 1024 -- 2MB
|
||||
local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf))
|
||||
if ok and stats and stats.size > max_filesize then
|
||||
return true
|
||||
end
|
||||
end,
|
||||
},
|
||||
indent = {
|
||||
enable = true
|
||||
},
|
||||
textobjects = {
|
||||
select = {
|
||||
enable = true,
|
||||
lookahead = true,
|
||||
keymaps = {
|
||||
-- You can use the capture groups defined in textobjects.scm
|
||||
["af"] = "@function.outer",
|
||||
["if"] = "@function.inner",
|
||||
["ac"] = "@class.outer",
|
||||
["ic"] = { query = "@class.inner", desc = "Select inner part of a class region" },
|
||||
["as"] = { query = "@local.scope", query_group = "locals", desc = "Select language scope" },
|
||||
},
|
||||
-- You can choose the select mode (default is charwise 'v')
|
||||
--
|
||||
-- Can also be a function which gets passed a table with the keys
|
||||
-- * query_string: eg '@function.inner'
|
||||
-- * method: eg 'v' or 'o'
|
||||
-- and should return the mode ('v', 'V', or '<c-v>') or a table
|
||||
-- mapping query_strings to modes.
|
||||
selection_modes = {
|
||||
['@parameter.outer'] = 'v', -- charwise
|
||||
['@function.outer'] = 'V', -- linewise
|
||||
['@class.outer'] = '<c-v>', -- blockwise
|
||||
},
|
||||
-- If you set this to `true` (default is `false`) then any textobject is
|
||||
-- extended to include preceding or succeeding whitespace. Succeeding
|
||||
-- whitespace has priority in order to act similarly to eg the built-in
|
||||
-- `ap`.
|
||||
--
|
||||
-- Can also be a function which gets passed a table with the keys
|
||||
-- * query_string: eg '@function.inner'
|
||||
-- * selection_mode: eg 'v'
|
||||
-- and should return true or false
|
||||
include_surrounding_whitespace = false,
|
||||
},
|
||||
},
|
||||
})
|
||||
end,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
programs.rofi = {
|
||||
enable = true;
|
||||
package = pkgs.rofi;
|
||||
package = pkgs.rofi-wayland;
|
||||
font = "SF Pro Rounded 13";
|
||||
extraConfig = {
|
||||
show-icons = true;
|
||||
|
|
|
|||
|
|
@ -56,7 +56,6 @@ echo -e '\n\n\n'
|
|||
echo "Running git.thomasave.be Backups"
|
||||
borg create -s --progress \
|
||||
--exclude /home/server/Containers/git.thomasave.be/gitea/gitea/sessions \
|
||||
--exclude /home/server/Containers/git.thomasave.be/runner-data/.cache \
|
||||
--exclude /home/server/Containers/git.thomasave.be/gitea/gitea/jwt \
|
||||
--exclude /home/server/Containers/git.thomasave.be/gitea/ssh \
|
||||
10.4.0.1:Storage/Thomas/Borg/Containers/git.thomasave.be::'{hostname}-{now}' \
|
||||
|
|
@ -93,7 +92,6 @@ borg create -s --progress \
|
|||
echo -e '\n\n\n'
|
||||
echo "Running Workspace Backups"
|
||||
borg create -s --progress \
|
||||
--exclude /home/server/Workspace/TrackBox/Resources \
|
||||
10.4.0.1:Storage/Thomas/Borg/Workspace::'{hostname}-{now}' \
|
||||
/home/server/Workspace/
|
||||
borg prune --keep-daily 7 --keep-weekly 4 --keep-monthly -1 --save-space 10.4.0.1:Storage/Thomas/Borg/Workspace
|
||||
|
|
@ -135,6 +133,23 @@ borg create -s --progress \
|
|||
borg prune --keep-daily 7 --keep-weekly 4 --keep-monthly -1 --save-space 10.4.0.1:Storage/Thomas/Borg/Thomas
|
||||
borg compact 10.4.0.1:Storage/Thomas/Borg/Thomas
|
||||
|
||||
|
||||
echo -e '\n\n\n'
|
||||
echo "Running Niels Backups"
|
||||
borg create -s --progress \
|
||||
--exclude /home/server/Storage/Niels/Backups \
|
||||
10.4.0.1:Storage/Thomas/Borg/Niels::'{now:%Y-%m-%d}' \
|
||||
/home/server/Storage/Niels/
|
||||
borg prune --keep-daily 7 --keep-weekly 4 --keep-monthly 12 --save-space 10.4.0.1:Storage/Thomas/Borg/Niels
|
||||
borg compact 10.4.0.1:Storage/Thomas/Borg/Niels
|
||||
|
||||
|
||||
# echo -e '\n\n\n'
|
||||
# echo "Running Experiment Backups"
|
||||
# borg create -s --progress \
|
||||
# 10.4.0.1:Storage/Thomas/Borg/Containers/exp.thomasave.be::'{hostname}-{now}' \
|
||||
# /home/server/Workspace/Experiments/Backend/data/
|
||||
|
||||
##########################################
|
||||
# Perpare Cloud Backup #
|
||||
##########################################
|
||||
|
|
@ -172,7 +187,7 @@ ssh vault /home/server/Storage/Thomas/Scripts/Mount/borg_lock.sh
|
|||
# Backups to Oracle Cloud #
|
||||
##########################################
|
||||
|
||||
echo "Running Oracle Cloud Backup, containing Vaultwarden, robbertave.com, git.thomasave.be, Boaty, Stats, and Caddy."
|
||||
echo "Running Oracle Cloud Backup, containing Vaultwarden, robbertave.com, git.thomasave.be, Boaty, Stats, Caddy, and Niels."
|
||||
|
||||
borg create -s --progress \
|
||||
--exclude /home/server/Containers/pw.thomasave.be/data/icon_cache \
|
||||
|
|
@ -182,6 +197,7 @@ borg create -s --progress \
|
|||
--exclude /home/server/Containers/git.thomasave.be/gitea/gitea/jwt \
|
||||
--exclude /home/server/Containers/stats.thomasave.be/logs \
|
||||
--exclude /home/server/Containers/Caddy/Data\
|
||||
--exclude /home/server/Storage/Niels/Backups \
|
||||
ubuntu@10.0.0.6:~/Backups/Borg::'{hostname}-{now}' \
|
||||
/home/server/Containers/pw.thomasave.be\
|
||||
/home/server/Containers/robbertave.com\
|
||||
|
|
@ -191,3 +207,4 @@ borg create -s --progress \
|
|||
/home/server/Containers/Caddy \
|
||||
/home/server/Containers/cal.thomasave.be\
|
||||
/home/server/Containers/stats.thomasave.be \
|
||||
/home/server/Storage/Niels \
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
{
|
||||
programs.ssh = {
|
||||
enable = true;
|
||||
enableDefaultConfig = false;
|
||||
includes = [ "gpulab_hosts_config" ];
|
||||
matchBlocks = {
|
||||
"*" = {
|
||||
host = "*";
|
||||
|
|
@ -78,13 +78,6 @@
|
|||
user = "server";
|
||||
forwardAgent = true;
|
||||
};
|
||||
gcp = {
|
||||
host = "gcp";
|
||||
hostname = "34.126.140.76";
|
||||
port = 22;
|
||||
user = "user";
|
||||
forwardAgent = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@
|
|||
../lf
|
||||
../tmux
|
||||
../yazi
|
||||
../zellij
|
||||
];
|
||||
|
||||
home.stateVersion = "24.11";
|
||||
|
|
@ -18,14 +17,16 @@
|
|||
programs.home-manager.enable = true;
|
||||
home.packages = with pkgs; [
|
||||
htop
|
||||
ghostscript
|
||||
waypipe
|
||||
inputs.worktimer.packages.${pkgs.stdenv.hostPlatform.system}.default
|
||||
inputs.worktimer.packages.${pkgs.system}.default
|
||||
usbutils
|
||||
gocryptfs
|
||||
sshfs
|
||||
ncdu
|
||||
];
|
||||
programs.nh = {
|
||||
enable = true;
|
||||
clean.enable = true;
|
||||
flake = "/home/user/.dotfiles";
|
||||
};
|
||||
|
||||
home.sessionVariables = {
|
||||
XDG_CONFIG_HOME = "${config.xdg.configHome}";
|
||||
XDG_CACHE_HOME = "${config.xdg.cacheHome}";
|
||||
|
|
|
|||
|
|
@ -6,12 +6,11 @@
|
|||
(import ../hyprland { inherit inputs pkgs; })
|
||||
(import ../ags { inherit inputs pkgs; })
|
||||
../rofi
|
||||
../vicinae
|
||||
../alacritty
|
||||
../foot
|
||||
../kitty
|
||||
../ghostty
|
||||
../firefox
|
||||
../helium
|
||||
../ssh
|
||||
../mpv
|
||||
];
|
||||
|
|
@ -20,7 +19,7 @@
|
|||
spotify
|
||||
slack
|
||||
eid-mw
|
||||
onlyoffice-desktopeditors
|
||||
onlyoffice-bin
|
||||
libreoffice
|
||||
telegram-desktop
|
||||
signal-desktop
|
||||
|
|
@ -36,6 +35,8 @@
|
|||
zip
|
||||
heroic
|
||||
cmake
|
||||
jellyfin-media-player
|
||||
chromium
|
||||
nmap
|
||||
arp-scan
|
||||
virt-manager
|
||||
|
|
@ -46,7 +47,6 @@
|
|||
yubioath-flutter
|
||||
obsidian
|
||||
nautilus
|
||||
appimage-run
|
||||
];
|
||||
|
||||
services.kdeconnect = {
|
||||
|
|
@ -79,6 +79,8 @@
|
|||
package = pkgs.adwaita-icon-theme;
|
||||
};
|
||||
|
||||
services.cliphist = { enable = true; };
|
||||
|
||||
services.mpris-proxy.enable = true; # Bluetooth media control
|
||||
|
||||
xdg.mimeApps = {
|
||||
|
|
@ -86,7 +88,6 @@
|
|||
defaultApplications = {
|
||||
"x-scheme-handler/mailto" = "userapp-Thunderbird-7GETV2.desktop";
|
||||
"x-scheme-handler/mid" = "userapp-Thunderbird-7GETV2.desktop";
|
||||
"x-scheme-handler/tonsite" = "org.telegram.desktop.desktop";
|
||||
"message/rfc822" = "userapp-Thunderbird-7GETV2.desktop";
|
||||
"application/pdf" = "org.gnome.Evince.desktop";
|
||||
"x-scheme-handler/tg" = "org.telegram.desktop.desktop";
|
||||
|
|
@ -99,11 +100,8 @@
|
|||
"x-scheme-handler/tg" = "org.telegram.desktop.desktop";
|
||||
"x-scheme-handler/mailto" = "userapp-Thunderbird-7GETV2.desktop";
|
||||
"x-scheme-handler/mid" = "userapp-Thunderbird-7GETV2.desktop";
|
||||
"x-scheme-handler/tonsite" = "org.telegram.desktop.desktop";
|
||||
"image/jpeg" = "org.gnome.Loupe.desktop";
|
||||
"image/png" = "org.gnome.Loupe.desktop";
|
||||
};
|
||||
};
|
||||
|
||||
fonts.fontconfig.enable = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ let
|
|||
zlib
|
||||
zstd
|
||||
stdenv.cc.cc
|
||||
stdenv.cc.cc.lib
|
||||
curl
|
||||
openssl
|
||||
attr
|
||||
|
|
|
|||
|
|
@ -1,16 +0,0 @@
|
|||
{ inputs, ... }: # Add inputs here
|
||||
{
|
||||
# Import the module definition here
|
||||
imports = [ inputs.vicinae.homeManagerModules.default ];
|
||||
|
||||
services.vicinae = {
|
||||
enable = true;
|
||||
systemd = {
|
||||
enable = true;
|
||||
autoStart = true;
|
||||
environment = {
|
||||
QT_SCALE_FACTOR="1.5";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
{
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
package = inputs.waybar.packages.${pkgs.stdenv.hostPlatform.system}.waybar;
|
||||
package = inputs.waybar.packages.${pkgs.system}.waybar;
|
||||
settings = {
|
||||
mainBar = {
|
||||
layer = "top";
|
||||
|
|
|
|||
|
|
@ -1,28 +1,13 @@
|
|||
{...}:
|
||||
{ inputs, config, pkgs, ... }:
|
||||
|
||||
{
|
||||
programs.yazi = {
|
||||
enable = true;
|
||||
enableZshIntegration = true;
|
||||
settings = {
|
||||
mgr = {
|
||||
sort_by = "natural";
|
||||
};
|
||||
programs.yazi = {
|
||||
enable = true;
|
||||
enableZshIntegration = true;
|
||||
settings = {
|
||||
mgr = {
|
||||
sort_by = "natural";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
keymap = {
|
||||
mgr.normal = [
|
||||
{ on = [ "j" ]; run = "down"; desc = "Move cursor down"; }
|
||||
{ on = [ "k" ]; run = "up"; desc = "Move cursor up"; }
|
||||
{ on = [ "h" ]; run = "back"; desc = "Go back to parent directory"; }
|
||||
{ on = [ "l" ]; run = "forward"; desc = "Enter directory / open file"; }
|
||||
{ on = [ "q" ]; run = "quit"; desc = "Quit yazi"; }
|
||||
{ on = [ " " ]; run = "select"; desc = "Select the current file"; }
|
||||
{ on = [ "v" ]; run = "visual_mode"; desc = "Enter visual mode"; }
|
||||
{ on = [ "y" ]; run = "yank"; desc = "Yank selection"; }
|
||||
{ on = [ "p" ]; run = "paste"; desc = "Paste files"; }
|
||||
{ on = [ "d" ]; run = "remove --permanently"; desc = "Delete permanently"; }
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +0,0 @@
|
|||
{ config, ... }:
|
||||
{
|
||||
programs.zellij = {
|
||||
enable = true;
|
||||
};
|
||||
home.file."${config.xdg.configHome}/zellij" = {
|
||||
source = ./files;
|
||||
recursive = true;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,451 +0,0 @@
|
|||
ui {
|
||||
pane_frames {
|
||||
hide_session_name true
|
||||
}
|
||||
}
|
||||
|
||||
keybinds clear-defaults=true {
|
||||
locked {
|
||||
bind "Ctrl a" { SwitchToMode "normal"; }
|
||||
bind "Ctrl H" { MoveFocus "left"; }
|
||||
bind "Ctrl J" { MoveFocus "down"; }
|
||||
bind "Ctrl K" { MoveFocus "up"; }
|
||||
bind "Ctrl L" { MoveFocus "right"; }
|
||||
}
|
||||
normal {
|
||||
bind "-" { NewPane "down"; SwitchToMode "locked"; }
|
||||
bind "|" { NewPane "right"; SwitchToMode "locked"; }
|
||||
bind "c" { NewTab; SwitchToMode "locked"; }
|
||||
bind "d" { Detach; }
|
||||
bind "n" { GoToNextTab; SwitchToMode "locked"; }
|
||||
}
|
||||
pane {
|
||||
bind "left" { MoveFocus "left"; }
|
||||
bind "down" { MoveFocus "down"; }
|
||||
bind "up" { MoveFocus "up"; }
|
||||
bind "right" { MoveFocus "right"; }
|
||||
bind "c" { SwitchToMode "renamepane"; PaneNameInput 0; }
|
||||
bind "d" { NewPane "down"; SwitchToMode "locked"; }
|
||||
bind "e" { TogglePaneEmbedOrFloating; SwitchToMode "locked"; }
|
||||
bind "f" { ToggleFocusFullscreen; SwitchToMode "locked"; }
|
||||
bind "h" { MoveFocus "left"; }
|
||||
bind "i" { TogglePanePinned; SwitchToMode "locked"; }
|
||||
bind "j" { MoveFocus "down"; }
|
||||
bind "k" { MoveFocus "up"; }
|
||||
bind "l" { MoveFocus "right"; }
|
||||
bind "n" { NewPane; SwitchToMode "locked"; }
|
||||
bind "p" { SwitchToMode "normal"; }
|
||||
bind "r" { NewPane "right"; SwitchToMode "locked"; }
|
||||
bind "w" { ToggleFloatingPanes; SwitchToMode "locked"; }
|
||||
bind "x" { CloseFocus; SwitchToMode "locked"; }
|
||||
bind "z" { TogglePaneFrames; SwitchToMode "locked"; }
|
||||
bind "tab" { SwitchFocus; }
|
||||
}
|
||||
tab {
|
||||
bind "left" { GoToPreviousTab; }
|
||||
bind "down" { GoToNextTab; }
|
||||
bind "up" { GoToPreviousTab; }
|
||||
bind "right" { GoToNextTab; }
|
||||
bind "1" { GoToTab 1; SwitchToMode "locked"; }
|
||||
bind "2" { GoToTab 2; SwitchToMode "locked"; }
|
||||
bind "3" { GoToTab 3; SwitchToMode "locked"; }
|
||||
bind "4" { GoToTab 4; SwitchToMode "locked"; }
|
||||
bind "5" { GoToTab 5; SwitchToMode "locked"; }
|
||||
bind "6" { GoToTab 6; SwitchToMode "locked"; }
|
||||
bind "7" { GoToTab 7; SwitchToMode "locked"; }
|
||||
bind "8" { GoToTab 8; SwitchToMode "locked"; }
|
||||
bind "9" { GoToTab 9; SwitchToMode "locked"; }
|
||||
bind "[" { BreakPaneLeft; SwitchToMode "locked"; }
|
||||
bind "]" { BreakPaneRight; SwitchToMode "locked"; }
|
||||
bind "b" { BreakPane; SwitchToMode "locked"; }
|
||||
bind "h" { GoToPreviousTab; }
|
||||
bind "j" { GoToNextTab; }
|
||||
bind "k" { GoToPreviousTab; }
|
||||
bind "l" { GoToNextTab; }
|
||||
bind "n" { NewTab; SwitchToMode "locked"; }
|
||||
bind "r" { SwitchToMode "renametab"; TabNameInput 0; }
|
||||
bind "s" { ToggleActiveSyncTab; SwitchToMode "locked"; }
|
||||
bind "t" { SwitchToMode "normal"; }
|
||||
bind "x" { CloseTab; SwitchToMode "locked"; }
|
||||
bind "tab" { ToggleTab; }
|
||||
}
|
||||
resize {
|
||||
bind "left" { Resize "Increase left"; }
|
||||
bind "down" { Resize "Increase down"; }
|
||||
bind "up" { Resize "Increase up"; }
|
||||
bind "right" { Resize "Increase right"; }
|
||||
bind "+" { Resize "Increase"; }
|
||||
bind "-" { Resize "Decrease"; }
|
||||
bind "=" { Resize "Increase"; }
|
||||
bind "H" { Resize "Decrease left"; }
|
||||
bind "J" { Resize "Decrease down"; }
|
||||
bind "K" { Resize "Decrease up"; }
|
||||
bind "L" { Resize "Decrease right"; }
|
||||
bind "h" { Resize "Increase left"; }
|
||||
bind "j" { Resize "Increase down"; }
|
||||
bind "k" { Resize "Increase up"; }
|
||||
bind "l" { Resize "Increase right"; }
|
||||
bind "r" { SwitchToMode "normal"; }
|
||||
}
|
||||
move {
|
||||
bind "left" { MovePane "left"; }
|
||||
bind "down" { MovePane "down"; }
|
||||
bind "up" { MovePane "up"; }
|
||||
bind "right" { MovePane "right"; }
|
||||
bind "h" { MovePane "left"; }
|
||||
bind "j" { MovePane "down"; }
|
||||
bind "k" { MovePane "up"; }
|
||||
bind "l" { MovePane "right"; }
|
||||
bind "m" { SwitchToMode "normal"; }
|
||||
bind "n" { MovePane; }
|
||||
bind "p" { MovePaneBackwards; }
|
||||
bind "tab" { MovePane; }
|
||||
}
|
||||
scroll {
|
||||
bind "Alt left" { MoveFocusOrTab "left"; SwitchToMode "locked"; }
|
||||
bind "Alt down" { MoveFocus "down"; SwitchToMode "locked"; }
|
||||
bind "Alt up" { MoveFocus "up"; SwitchToMode "locked"; }
|
||||
bind "Alt right" { MoveFocusOrTab "right"; SwitchToMode "locked"; }
|
||||
bind "e" { EditScrollback; SwitchToMode "locked"; }
|
||||
bind "f" { SwitchToMode "entersearch"; SearchInput 0; }
|
||||
bind "Alt h" { MoveFocusOrTab "left"; SwitchToMode "locked"; }
|
||||
bind "Alt j" { MoveFocus "down"; SwitchToMode "locked"; }
|
||||
bind "Alt k" { MoveFocus "up"; SwitchToMode "locked"; }
|
||||
bind "Alt l" { MoveFocusOrTab "right"; SwitchToMode "locked"; }
|
||||
bind "s" { SwitchToMode "normal"; }
|
||||
}
|
||||
search {
|
||||
bind "c" { SearchToggleOption "CaseSensitivity"; }
|
||||
bind "n" { Search "down"; }
|
||||
bind "o" { SearchToggleOption "WholeWord"; }
|
||||
bind "p" { Search "up"; }
|
||||
bind "w" { SearchToggleOption "Wrap"; }
|
||||
}
|
||||
session {
|
||||
bind "a" {
|
||||
LaunchOrFocusPlugin "zellij:about" {
|
||||
floating true
|
||||
move_to_focused_tab true
|
||||
}
|
||||
SwitchToMode "locked"
|
||||
}
|
||||
bind "c" {
|
||||
LaunchOrFocusPlugin "configuration" {
|
||||
floating true
|
||||
move_to_focused_tab true
|
||||
}
|
||||
SwitchToMode "locked"
|
||||
}
|
||||
bind "d" { Detach; }
|
||||
bind "o" { SwitchToMode "normal"; }
|
||||
bind "p" {
|
||||
LaunchOrFocusPlugin "plugin-manager" {
|
||||
floating true
|
||||
move_to_focused_tab true
|
||||
}
|
||||
SwitchToMode "locked"
|
||||
}
|
||||
bind "w" {
|
||||
LaunchOrFocusPlugin "session-manager" {
|
||||
floating true
|
||||
move_to_focused_tab true
|
||||
}
|
||||
SwitchToMode "locked"
|
||||
}
|
||||
}
|
||||
shared_among "normal" "locked" {
|
||||
bind "Alt left" { MoveFocusOrTab "left"; }
|
||||
bind "Alt down" { MoveFocus "down"; }
|
||||
bind "Alt up" { MoveFocus "up"; }
|
||||
bind "Alt right" { MoveFocusOrTab "right"; }
|
||||
bind "Alt +" { Resize "Increase"; }
|
||||
bind "Alt -" { Resize "Decrease"; }
|
||||
bind "Alt =" { Resize "Increase"; }
|
||||
bind "Alt [" { PreviousSwapLayout; }
|
||||
bind "Alt ]" { NextSwapLayout; }
|
||||
bind "Alt f" { ToggleFloatingPanes; }
|
||||
bind "Alt h" { MoveFocusOrTab "left"; }
|
||||
bind "Alt i" { MoveTab "left"; }
|
||||
bind "Alt j" { MoveFocus "down"; }
|
||||
bind "Alt k" { MoveFocus "up"; }
|
||||
bind "Alt l" { MoveFocusOrTab "right"; }
|
||||
bind "Alt n" { NewPane; }
|
||||
bind "Alt o" { MoveTab "right"; }
|
||||
}
|
||||
shared_except "locked" "renametab" "renamepane" {
|
||||
bind "Ctrl g" { SwitchToMode "locked"; }
|
||||
bind "Ctrl q" { Quit; }
|
||||
}
|
||||
shared_except "locked" "entersearch" {
|
||||
bind "enter" { SwitchToMode "locked"; }
|
||||
}
|
||||
shared_except "locked" "entersearch" "renametab" "renamepane" {
|
||||
bind "esc" { SwitchToMode "locked"; }
|
||||
}
|
||||
shared_except "locked" "entersearch" "renametab" "renamepane" "move" {
|
||||
bind "m" { SwitchToMode "move"; }
|
||||
}
|
||||
shared_except "locked" "entersearch" "search" "renametab" "renamepane" "session" {
|
||||
bind "o" { SwitchToMode "session"; }
|
||||
}
|
||||
shared_except "locked" "tab" "entersearch" "renametab" "renamepane" {
|
||||
bind "t" { SwitchToMode "tab"; }
|
||||
}
|
||||
shared_except "locked" "tab" "scroll" "entersearch" "renametab" "renamepane" {
|
||||
bind "s" { SwitchToMode "scroll"; }
|
||||
}
|
||||
shared_among "normal" "resize" "tab" "scroll" "prompt" "tmux" {
|
||||
bind "p" { SwitchToMode "pane"; }
|
||||
}
|
||||
shared_except "locked" "resize" "pane" "tab" "entersearch" "renametab" "renamepane" {
|
||||
bind "r" { SwitchToMode "resize"; }
|
||||
}
|
||||
shared_among "scroll" "search" {
|
||||
bind "PageDown" { PageScrollDown; }
|
||||
bind "PageUp" { PageScrollUp; }
|
||||
bind "left" { PageScrollUp; }
|
||||
bind "down" { ScrollDown; }
|
||||
bind "up" { ScrollUp; }
|
||||
bind "right" { PageScrollDown; }
|
||||
bind "Ctrl b" { PageScrollUp; }
|
||||
bind "Ctrl c" { ScrollToBottom; SwitchToMode "locked"; }
|
||||
bind "d" { HalfPageScrollDown; }
|
||||
bind "Ctrl f" { PageScrollDown; }
|
||||
bind "h" { PageScrollUp; }
|
||||
bind "j" { ScrollDown; }
|
||||
bind "k" { ScrollUp; }
|
||||
bind "l" { PageScrollDown; }
|
||||
bind "u" { HalfPageScrollUp; }
|
||||
}
|
||||
entersearch {
|
||||
bind "Ctrl c" { SwitchToMode "scroll"; }
|
||||
bind "esc" { SwitchToMode "scroll"; }
|
||||
bind "enter" { SwitchToMode "search"; }
|
||||
}
|
||||
renametab {
|
||||
bind "esc" { UndoRenameTab; SwitchToMode "tab"; }
|
||||
}
|
||||
shared_among "renametab" "renamepane" {
|
||||
bind "Ctrl c" { SwitchToMode "locked"; }
|
||||
}
|
||||
renamepane {
|
||||
bind "esc" { UndoRenamePane; SwitchToMode "pane"; }
|
||||
}
|
||||
}
|
||||
|
||||
// Plugin aliases - can be used to change the implementation of Zellij
|
||||
// changing these requires a restart to take effect
|
||||
plugins {
|
||||
about location="zellij:about"
|
||||
compact-bar location="zellij:compact-bar"
|
||||
configuration location="zellij:configuration"
|
||||
filepicker location="zellij:strider" {
|
||||
cwd "/"
|
||||
}
|
||||
plugin-manager location="zellij:plugin-manager"
|
||||
session-manager location="zellij:session-manager"
|
||||
status-bar location="zellij:status-bar"
|
||||
strider location="zellij:strider"
|
||||
tab-bar location="zellij:tab-bar"
|
||||
welcome-screen location="zellij:session-manager" {
|
||||
welcome_screen true
|
||||
}
|
||||
}
|
||||
|
||||
// Plugins to load in the background when a new session starts
|
||||
// eg. "file:/path/to/my-plugin.wasm"
|
||||
// eg. "https://example.com/my-plugin.wasm"
|
||||
load_plugins {
|
||||
}
|
||||
|
||||
// Use a simplified UI without special fonts (arrow glyphs)
|
||||
// Options:
|
||||
// - true
|
||||
// - false (Default)
|
||||
//
|
||||
// simplified_ui true
|
||||
|
||||
// Choose the theme that is specified in the themes section.
|
||||
// Default: default
|
||||
//
|
||||
theme "tokyo-night-dark"
|
||||
|
||||
// Choose the base input mode of zellij.
|
||||
// Default: normal
|
||||
//
|
||||
default_mode "locked"
|
||||
|
||||
// Choose the path to the default shell that zellij will use for opening new panes
|
||||
// Default: $SHELL
|
||||
//
|
||||
// default_shell "fish"
|
||||
|
||||
// Choose the path to override cwd that zellij will use for opening new panes
|
||||
//
|
||||
// default_cwd "/tmp"
|
||||
|
||||
// The name of the default layout to load on startup
|
||||
// Default: "default"
|
||||
//
|
||||
default_layout "compact"
|
||||
|
||||
// The folder in which Zellij will look for layouts
|
||||
// (Requires restart)
|
||||
//
|
||||
// layout_dir "/tmp"
|
||||
|
||||
// The folder in which Zellij will look for themes
|
||||
// (Requires restart)
|
||||
//
|
||||
// theme_dir "/tmp"
|
||||
|
||||
// Toggle enabling the mouse mode.
|
||||
// On certain configurations, or terminals this could
|
||||
// potentially interfere with copying text.
|
||||
// Options:
|
||||
// - true (default)
|
||||
// - false
|
||||
//
|
||||
mouse_mode true
|
||||
|
||||
// Toggle having pane frames around the panes
|
||||
// Options:
|
||||
// - true (default, enabled)
|
||||
// - false
|
||||
//
|
||||
pane_frames false
|
||||
|
||||
// When attaching to an existing session with other users,
|
||||
// should the session be mirrored (true)
|
||||
// or should each user have their own cursor (false)
|
||||
// (Requires restart)
|
||||
// Default: false
|
||||
//
|
||||
// mirror_session true
|
||||
|
||||
// Choose what to do when zellij receives SIGTERM, SIGINT, SIGQUIT or SIGHUP
|
||||
// eg. when terminal window with an active zellij session is closed
|
||||
// (Requires restart)
|
||||
// Options:
|
||||
// - detach (Default)
|
||||
// - quit
|
||||
//
|
||||
// on_force_close "quit"
|
||||
|
||||
// Configure the scroll back buffer size
|
||||
// This is the number of lines zellij stores for each pane in the scroll back
|
||||
// buffer. Excess number of lines are discarded in a FIFO fashion.
|
||||
// (Requires restart)
|
||||
// Valid values: positive integers
|
||||
// Default value: 10000
|
||||
//
|
||||
// scroll_buffer_size 10000
|
||||
|
||||
// Provide a command to execute when copying text. The text will be piped to
|
||||
// the stdin of the program to perform the copy. This can be used with
|
||||
// terminal emulators which do not support the OSC 52 ANSI control sequence
|
||||
// that will be used by default if this option is not set.
|
||||
// Examples:
|
||||
//
|
||||
// copy_command "xclip -selection clipboard" // x11
|
||||
copy_command "wl-copy" // wayland
|
||||
// copy_command "pbcopy" // osx
|
||||
//
|
||||
// copy_command "pbcopy"
|
||||
|
||||
// Choose the destination for copied text
|
||||
// Allows using the primary selection buffer (on x11/wayland) instead of the system clipboard.
|
||||
// Does not apply when using copy_command.
|
||||
// Options:
|
||||
// - system (default)
|
||||
// - primary
|
||||
//
|
||||
// copy_clipboard "primary"
|
||||
|
||||
// Enable automatic copying (and clearing) of selection when releasing mouse
|
||||
// Default: true
|
||||
//
|
||||
// copy_on_select true
|
||||
|
||||
// Path to the default editor to use to edit pane scrollbuffer
|
||||
// Default: $EDITOR or $VISUAL
|
||||
// scrollback_editor "/usr/bin/vim"
|
||||
|
||||
// A fixed name to always give the Zellij session.
|
||||
// Consider also setting `attach_to_session true,`
|
||||
// otherwise this will error if such a session exists.
|
||||
// Default: <RANDOM>
|
||||
//
|
||||
// session_name "My singleton session"
|
||||
|
||||
// When `session_name` is provided, attaches to that session
|
||||
// if it is already running or creates it otherwise.
|
||||
// Default: false
|
||||
//
|
||||
// attach_to_session true
|
||||
|
||||
// Toggle between having Zellij lay out panes according to a predefined set of layouts whenever possible
|
||||
// Options:
|
||||
// - true (default)
|
||||
// - false
|
||||
//
|
||||
// auto_layout false
|
||||
|
||||
// Whether sessions should be serialized to the cache folder (including their tabs/panes, cwds and running commands) so that they can later be resurrected
|
||||
// Options:
|
||||
// - true (default)
|
||||
// - false
|
||||
//
|
||||
// session_serialization false
|
||||
|
||||
// Whether pane viewports are serialized along with the session, default is false
|
||||
// Options:
|
||||
// - true
|
||||
// - false (default)
|
||||
//
|
||||
// serialize_pane_viewport false
|
||||
|
||||
// Scrollback lines to serialize along with the pane viewport when serializing sessions, 0
|
||||
// defaults to the scrollback size. If this number is higher than the scrollback size, it will
|
||||
// also default to the scrollback size. This does nothing if `serialize_pane_viewport` is not true.
|
||||
//
|
||||
// scrollback_lines_to_serialize 10000
|
||||
|
||||
// Enable or disable the rendering of styled and colored underlines (undercurl).
|
||||
// May need to be disabled for certain unsupported terminals
|
||||
// (Requires restart)
|
||||
// Default: true
|
||||
//
|
||||
// styled_underlines false
|
||||
|
||||
// How often in seconds sessions are serialized
|
||||
//
|
||||
// serialization_interval 10000
|
||||
|
||||
// Enable or disable writing of session metadata to disk (if disabled, other sessions might not know
|
||||
// metadata info on this session)
|
||||
// (Requires restart)
|
||||
// Default: false
|
||||
//
|
||||
// disable_session_metadata false
|
||||
|
||||
// Enable or disable support for the enhanced Kitty Keyboard Protocol (the host terminal must also support it)
|
||||
// (Requires restart)
|
||||
// Default: true (if the host terminal supports it)
|
||||
//
|
||||
support_kitty_keyboard_protocol true
|
||||
|
||||
// Whether to stack panes when resizing beyond a certain size
|
||||
// Default: true
|
||||
//
|
||||
// stacked_resize false
|
||||
|
||||
// Whether to show tips on startup
|
||||
// Default: true
|
||||
//
|
||||
show_startup_tips false
|
||||
|
||||
// Whether to show release notes on first version run
|
||||
// Default: true
|
||||
//
|
||||
// show_release_notes false
|
||||
|
|
@ -12,10 +12,10 @@
|
|||
pkgs.ripgrep
|
||||
pkgs.rsync
|
||||
pkgs.moreutils
|
||||
inputs.fzgo.packages.${pkgs.stdenv.hostPlatform.system}.default
|
||||
inputs.fzgo.packages.${pkgs.system}.default
|
||||
];
|
||||
home.sessionVariables = {
|
||||
BROWSER = "Helium";
|
||||
BROWSER = "firefox";
|
||||
PDF_VIEWER = "evince";
|
||||
GPULAB_CERT = "${config.xdg.configHome}/../.secrets/GPULab/certificate.pem";
|
||||
GPULAB_DEV = "False";
|
||||
|
|
@ -78,9 +78,6 @@
|
|||
function o() {
|
||||
${pkgs.handlr-regex}/bin/handlr open $@ < /dev/null &> /dev/null & disown
|
||||
}
|
||||
precmd() {
|
||||
print -Pn "\e]133;A\e\\"
|
||||
}
|
||||
'';
|
||||
|
||||
shellAliases = {
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ in {
|
|||
(import ../Common/desktop.nix { inherit inputs pkgs config; })
|
||||
(import ../Common/nfs.nix { inherit pkgs serverIP; })
|
||||
(import ../Common/zfs.nix {inherit inputs pkgs config; })
|
||||
(import ../Common/android.nix { inherit pkgs; })
|
||||
];
|
||||
|
||||
hardware.graphics.extraPackages = [
|
||||
|
|
@ -16,36 +17,9 @@ in {
|
|||
|
||||
zramSwap.enable = true;
|
||||
services.upower.enable = true;
|
||||
services.logind.settings.Login = {
|
||||
HandlePowerKey = "suspend";
|
||||
};
|
||||
services.logind.extraConfig = ''HandlePowerKey=ignore'';
|
||||
services.throttled.enable = true;
|
||||
services.thinkfan.enable = true;
|
||||
services.thinkfan.settings = {
|
||||
sensors = [
|
||||
# Search for 'coretemp' anywhere in /sys/class/hwmon
|
||||
{ hwmon = "/sys/class/hwmon"; name = "coretemp"; indices = [ 1 ]; }
|
||||
|
||||
# Search for 'acpitz'
|
||||
{ hwmon = "/sys/class/hwmon"; name = "acpitz"; indices = [ 1 ]; }
|
||||
|
||||
# Search for 'nvme'
|
||||
{ hwmon = "/sys/class/hwmon"; name = "nvme"; indices = [ 1 ]; }
|
||||
];
|
||||
|
||||
fans = [
|
||||
{ tpacpi = "/proc/acpi/ibm/fan"; }
|
||||
];
|
||||
|
||||
levels = [
|
||||
[ 0 0 45 ]
|
||||
[ 1 42 55 ]
|
||||
[ 2 50 60 ]
|
||||
[ 3 56 68 ]
|
||||
[ 5 64 78 ]
|
||||
[ 7 76 95 ]
|
||||
];
|
||||
};
|
||||
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
|
|
@ -57,7 +31,7 @@ in {
|
|||
networking.wireless.iwd.enable = true;
|
||||
networking.wireless.iwd.settings = {
|
||||
IPv6 = {
|
||||
Enabled = false;
|
||||
Enabled = true;
|
||||
};
|
||||
Settings = {
|
||||
AutoConnect = true;
|
||||
|
|
@ -78,6 +52,7 @@ in {
|
|||
|
||||
# virtualisation
|
||||
virtualisation.libvirtd.enable = true;
|
||||
virtualisation.libvirtd.qemu.ovmf.enable = true;
|
||||
virtualisation.spiceUSBRedirection.enable = true;
|
||||
programs.virt-manager.enable = true;
|
||||
users.users.user.extraGroups = [ "libvirtd" ];
|
||||
|
|
@ -101,7 +76,7 @@ in {
|
|||
|
||||
networking.wg-quick.interfaces = {
|
||||
Tunnel = {
|
||||
address = [ "10.0.0.5/24" ];
|
||||
address = [ "10.0.0.5/24" "2a02:a03f:83ad:2101::5/128" ];
|
||||
privateKeyFile = "/home/user/.secrets/Wireguard/Aloria.key";
|
||||
listenPort = 51820;
|
||||
autostart = false;
|
||||
|
|
@ -115,7 +90,7 @@ in {
|
|||
}];
|
||||
};
|
||||
OPNsense = {
|
||||
address = [ "10.0.0.5/24" ];
|
||||
address = [ "10.0.0.5/24" "2a02:a03f:83ad:2101::5/128" ];
|
||||
privateKeyFile = "/home/user/.secrets/Wireguard/Aloria.key";
|
||||
listenPort = 51820;
|
||||
autostart = true;
|
||||
|
|
@ -128,19 +103,6 @@ in {
|
|||
persistentKeepalive = 25;
|
||||
}];
|
||||
};
|
||||
GCP = {
|
||||
address = [ "10.5.0.5/24" ];
|
||||
privateKeyFile = "/home/user/.secrets/Wireguard/GCP.key";
|
||||
listenPort = 51820;
|
||||
autostart = false;
|
||||
postUp = "resolvectl dns GCP 1.1.1.1;resolvectl dns wlan0 1.1.1.1;";
|
||||
peers = [{
|
||||
publicKey = "NEBNE4Czf2MkZF2X5aVhmofENH1uXjDpvXjIMJvfMFA=";
|
||||
allowedIPs = [ "0.0.0.0/0" ];
|
||||
endpoint = "35.201.231.151:443";
|
||||
persistentKeepalive = 25;
|
||||
}];
|
||||
};
|
||||
};
|
||||
systemd.services."wg-quick-OPNsense" = {
|
||||
serviceConfig = { Restart = "on-failure"; RestartSec = "2s"; };
|
||||
|
|
|
|||
|
|
@ -11,10 +11,7 @@
|
|||
boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ config.boot.kernelPackages.tp_smapi ];
|
||||
boot.extraModprobeConfig = ''
|
||||
options thinkpad_acpi fan_control=1
|
||||
'';
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "rpool/root";
|
||||
|
|
@ -48,16 +45,13 @@
|
|||
hardware.trackpoint.device = "TPPS/2 Synaptics TrackPoint";
|
||||
hardware.ipu6.enable = true;
|
||||
hardware.ipu6.platform = "ipu6ep";
|
||||
# nixpkgs.config.packageOverrides = pkgs: {
|
||||
# zfs = pkgs.zfs_unstable;
|
||||
# };
|
||||
# boot.kernelPackages = pkgs.linuxPackages_latest.extend ( self: super: {
|
||||
# ipu6-drivers = super.ipu6-drivers.overrideAttrs (
|
||||
# final: previous: rec {
|
||||
# src = builtins.fetchGit {
|
||||
# url = "https://github.com/intel/ipu6-drivers.git";
|
||||
# ref = "master";
|
||||
# rev = "4bb5b4d8128fbf7f4730cd364a8f7fc13a0ef65b";
|
||||
# rev = "b4ba63df5922150ec14ef7f202b3589896e0301a";
|
||||
# };
|
||||
# patches = [
|
||||
# "${src}/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch"
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ in {
|
|||
(import ../Common/desktop.nix { inherit inputs pkgs config; })
|
||||
(import ../Common/nfs.nix { inherit pkgs serverIP; })
|
||||
(import ../Common/zfs.nix {inherit inputs pkgs config; })
|
||||
(import ../Common/android.nix {inherit inputs pkgs config; })
|
||||
];
|
||||
|
||||
hardware.graphics.extraPackages = [
|
||||
|
|
@ -25,9 +26,7 @@ in {
|
|||
zramSwap.enable = true;
|
||||
services.upower.enable = true;
|
||||
services.thermald.enable = true;
|
||||
services.logind.settings.Login = {
|
||||
HandlePowerKey = "suspend";
|
||||
};
|
||||
services.logind.extraConfig = ''HandlePowerKey=ignore'';
|
||||
services.throttled = {
|
||||
enable = true;
|
||||
};
|
||||
|
|
@ -41,7 +40,6 @@ in {
|
|||
};
|
||||
Settings = {
|
||||
AutoConnect = true;
|
||||
Country = "ES";
|
||||
};
|
||||
General = {
|
||||
EnableNetworkConfiguration = true;
|
||||
|
|
@ -59,6 +57,7 @@ in {
|
|||
|
||||
# virtualisation
|
||||
virtualisation.libvirtd.enable = true;
|
||||
virtualisation.libvirtd.qemu.ovmf.enable = true;
|
||||
virtualisation.spiceUSBRedirection.enable = true;
|
||||
programs.virt-manager.enable = true;
|
||||
users.users.user.extraGroups = [ "libvirtd" ];
|
||||
|
|
@ -120,5 +119,4 @@ in {
|
|||
];
|
||||
fonts.fontDir.enable = true;
|
||||
services.flatpak.enable = true;
|
||||
boot.kernel.sysctl."net.ipv4.ip_forward" = 1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
programs.adb.enable = true;
|
||||
users.users.user.extraGroups = ["adbusers"];
|
||||
services.udev.packages = [
|
||||
pkgs.android-udev-rules
|
||||
];
|
||||
}
|
||||
|
|
@ -7,73 +7,14 @@
|
|||
security.rtkit.enable = true;
|
||||
programs.zsh.enable = true;
|
||||
networking.firewall.enable = false;
|
||||
programs.nix-ld = {
|
||||
enable = true;
|
||||
libraries = with pkgs; [
|
||||
# Toolchain / C++ runtime
|
||||
stdenv.cc.cc # libc, libgcc, libstdc++
|
||||
stdenv.cc.cc.lib # sometimes needed explicitly
|
||||
|
||||
# Compression / archive
|
||||
zlib
|
||||
zstd
|
||||
xz
|
||||
bzip2
|
||||
|
||||
# Crypto / TLS / networking
|
||||
openssl
|
||||
curl
|
||||
libssh
|
||||
|
||||
# Core system libs
|
||||
attr
|
||||
acl
|
||||
util-linux
|
||||
libsodium
|
||||
systemd # libudev, libsystemd
|
||||
libxml2
|
||||
expat
|
||||
|
||||
# Graphics / X11 / desktop
|
||||
xorg.libX11
|
||||
xorg.libXext
|
||||
xorg.libXfixes
|
||||
xorg.libXdamage
|
||||
xorg.libXcomposite
|
||||
xorg.libXrandr
|
||||
xorg.libxcb
|
||||
libdrm
|
||||
mesa
|
||||
libxkbcommon
|
||||
|
||||
# Audio / desktop integration
|
||||
alsa-lib
|
||||
dbus
|
||||
cups
|
||||
|
||||
# GLib / GTK stack (lots of GUI apps, Electron, etc.)
|
||||
glib
|
||||
gdk-pixbuf
|
||||
pango
|
||||
cairo
|
||||
atk
|
||||
gtk3
|
||||
|
||||
# NSS/NSPR (Firefox, Electron, many apps)
|
||||
nspr
|
||||
nss
|
||||
];
|
||||
};
|
||||
programs.nix-ld.enable = true;
|
||||
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.systemd-boot.memtest86.enable = true;
|
||||
boot.loader.systemd-boot.netbootxyz.enable = true;
|
||||
boot.loader.timeout = 1;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
systemd.settings.Manager.DefaultTimeoutStopSec = "10s";
|
||||
systemd.settings.Manager.DefaultTimeoutStartSec = "10s";
|
||||
systemd.settings.Manager.DefaultTimeoutAbortSec = "10s";
|
||||
systemd.settings.Manager.DefaultDeviceTimeoutSec = "10s";
|
||||
systemd.extraConfig = "DefaultTimeoutStopSec=10s";
|
||||
systemd.services.systemd-user-sessions.enable = false;
|
||||
boot.tmp.cleanOnBoot = true;
|
||||
|
||||
|
|
@ -94,7 +35,7 @@
|
|||
fonts.packages = with pkgs; [
|
||||
noto-fonts
|
||||
noto-fonts-cjk-sans
|
||||
noto-fonts-color-emoji
|
||||
noto-fonts-emoji
|
||||
iosevka
|
||||
roboto
|
||||
font-awesome
|
||||
|
|
@ -105,7 +46,6 @@
|
|||
];
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
android-tools
|
||||
virtiofsd
|
||||
wget
|
||||
curl
|
||||
|
|
@ -135,8 +75,8 @@
|
|||
};
|
||||
|
||||
services.resolved = {
|
||||
enable = pkgs.lib.mkDefault true;
|
||||
enable = true;
|
||||
fallbackDns = [ "1.1.1.1" "1.0.0.1" ];
|
||||
};
|
||||
networking.nameservers = pkgs.lib.mkDefault ["1.1.1.1" "1.0.0.1"];
|
||||
networking.nameservers = ["1.1.1.1" "1.0.0.1"];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
{ inputs, pkgs, ... }:
|
||||
{
|
||||
services.udev.packages = [ pkgs.yubikey-personalization ];
|
||||
programs.appimage.enable = true;
|
||||
programs.appimage.binfmt = true;
|
||||
|
||||
hardware.graphics = {
|
||||
enable = true;
|
||||
|
|
@ -14,13 +12,12 @@
|
|||
};
|
||||
programs.hyprland = {
|
||||
enable = true;
|
||||
withUWSM = true;
|
||||
};
|
||||
services.greetd = {
|
||||
enable = pkgs.lib.mkDefault true;
|
||||
settings = rec {
|
||||
initial_session = {
|
||||
command = "uwsm start hyprland-uwsm.desktop";
|
||||
command = "Hyprland";
|
||||
user = "user";
|
||||
};
|
||||
default_session = initial_session;
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ let
|
|||
"soft"
|
||||
"bg"
|
||||
"intr"
|
||||
# "x-systemd.automount"
|
||||
"x-systemd.automount"
|
||||
"x-systemd.idle-timeout=600"
|
||||
"x-systemd.device-timeout=2s"
|
||||
"x-systemd.mount-timeout=2s"
|
||||
|
|
@ -61,4 +61,10 @@ in {
|
|||
device = "/home/server/Storage/Thomas/Videos";
|
||||
options = bind_options;
|
||||
};
|
||||
systemd.extraConfig = ''
|
||||
DefaultTimeoutStartSec=15s
|
||||
DefaultTimeoutStopSec=15s
|
||||
DefaultTimeoutAbortSec=15s
|
||||
DefaultDeviceTimeoutSec=15s
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ ... }:
|
||||
{ inputs, config, pkgs, ... }:
|
||||
{
|
||||
boot.initrd.supportedFilesystems = [ "zfs" ];
|
||||
boot.supportedFilesystems = [ "zfs" ];
|
||||
|
|
@ -18,17 +18,6 @@
|
|||
autoprune = true;
|
||||
autosnap = true;
|
||||
};
|
||||
"rpool/storage" = {
|
||||
frequently = 8;
|
||||
yearly = 0;
|
||||
monthly = 0;
|
||||
weekly = 0;
|
||||
daily = 0;
|
||||
hourly = 0;
|
||||
frequent_period = 15;
|
||||
autoprune = true;
|
||||
autosnap = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -68,11 +68,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765980955,
|
||||
"narHash": "sha256-rB45jv4uwC90vM9UZ70plfvY/2Kdygs+zlQ07dGQFk4=",
|
||||
"lastModified": 1743648554,
|
||||
"narHash": "sha256-23JFd+zd2GamTTdnGuFVeIg8x8C3hLpQJRh/PGTORzo=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "89c9508bbe9b40d36b3dc206c2483ef176f15173",
|
||||
"rev": "107352dde4ff3c01cb5a0b3fe17f5beef37215bc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -99,11 +99,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1765779637,
|
||||
"narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=",
|
||||
"lastModified": 1743583204,
|
||||
"narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "1306659b587dc277866c7b69eb97e5f07864d8c4",
|
||||
"rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -38,9 +38,7 @@ in {
|
|||
acceleration = "rocm";
|
||||
};
|
||||
# nixpkgs.config.cudaSupport = true;
|
||||
services.logind.settings.Login = {
|
||||
HandlePowerKey = "suspend";
|
||||
};
|
||||
services.logind.extraConfig = ''HandlePowerKey=suspend'';
|
||||
|
||||
# Virtualization
|
||||
virtualisation.libvirtd.enable = true;
|
||||
|
|
|
|||
|
|
@ -68,11 +68,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1753181343,
|
||||
"narHash": "sha256-CLQfNtUqirNVSYoW/kYbvL4PeeNasmZonaPnjO3+1YQ=",
|
||||
"lastModified": 1740208222,
|
||||
"narHash": "sha256-FqgPcK5BK+Mc4cGBCGz555UsVd/TQK9FvmuamBWu+ZY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "0cdfcdbb525b77b951c889b6131047bc374f48fe",
|
||||
"rev": "f4a07823a298deff0efb0db30f9318511de7c232",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -99,11 +99,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1752950548,
|
||||
"narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=",
|
||||
"lastModified": 1739866667,
|
||||
"narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c87b95e25065c028d31a94f06a62927d18763fdf",
|
||||
"rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -2,18 +2,21 @@
|
|||
{
|
||||
imports = [
|
||||
(import ../Common/default.nix { inherit inputs config pkgs; })
|
||||
(import ../Common/desktop.nix { inherit inputs pkgs config; })
|
||||
(import ../Common/nvidia.nix { inherit pkgs config; })
|
||||
# (import ../Common/desktop.nix { inherit inputs pkgs config; })
|
||||
];
|
||||
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
services.ollama = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
# services.sunshine = {
|
||||
# enable = true;
|
||||
# autoStart = false;
|
||||
# capSysAdmin = true;
|
||||
# openFirewall = true;
|
||||
# };
|
||||
services.sunshine = {
|
||||
enable = true;
|
||||
autoStart = false;
|
||||
capSysAdmin = true;
|
||||
openFirewall = true;
|
||||
};
|
||||
|
||||
boot.kernelParams = ["mitigations=off"];
|
||||
|
||||
|
|
@ -42,12 +45,4 @@
|
|||
device = "/home/server/Workspace";
|
||||
options = ["bind"];
|
||||
};
|
||||
services.resolved = {
|
||||
enable = false;
|
||||
};
|
||||
networking.nameservers = ["192.168.1.2"];
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
gamescopeSession.enable = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue