Compare commits

..

1 Commits

Author SHA1 Message Date
Thomas Avé eaba3a8978 Working on porting to new ags version 2025-07-09 16:09:53 +02:00
94 changed files with 5027 additions and 5302 deletions

View File

@ -2,19 +2,15 @@
"nodes": { "nodes": {
"ags": { "ags": {
"inputs": { "inputs": {
"astal": [ "astal": "astal",
"astal" "nixpkgs": "nixpkgs"
],
"nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1775689345, "lastModified": 1744557573,
"narHash": "sha256-tM3s7CX+tgxlYW0Sk3nzVThg2MHn08foIuMxABupxIs=", "narHash": "sha256-XAyj0iDuI51BytJ1PwN53uLpzTDdznPDQFG4RwihlTQ=",
"owner": "aylur", "owner": "aylur",
"repo": "ags", "repo": "ags",
"rev": "bbee2f18939f1ec7ff720e717cf305e73635628f", "rev": "3ed9737bdbc8fc7a7c7ceef2165c9109f336bff6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -26,15 +22,16 @@
"astal": { "astal": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"ags",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1773914523, "lastModified": 1742571008,
"narHash": "sha256-GOL+bR30FPImAzy4NNsTMY1gpoINMsLTXR0WJBRSq30=", "narHash": "sha256-5WgfJAeBpxiKbTR/gJvxrGYfqQRge5aUDcGKmU1YZ1Q=",
"owner": "aylur", "owner": "aylur",
"repo": "astal", "repo": "astal",
"rev": "41b50290c6a1cdce7b482897c22fe49286912b9a", "rev": "dc0e5d37abe9424c53dcbd2506a4886ffee6296e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -109,7 +106,7 @@
"fzgo": { "fzgo": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1737991358, "lastModified": 1737991358,
@ -132,11 +129,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1776661682, "lastModified": 1750304462,
"narHash": "sha256-X32LTSDqUdVqMy85WYdRgyt0I75wc4Lhi9j+lrCDR8w=", "narHash": "sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "4bfce11ea820df0359f73736fd59c7e8f53641a6", "rev": "863842639722dd12ae9e37ca83bcb61a63b36f6c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -167,6 +164,22 @@
} }
}, },
"nixpkgs": { "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": { "locked": {
"lastModified": 1722421184, "lastModified": 1722421184,
"narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=", "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=",
@ -182,33 +195,17 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1776169885,
"narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1776169885, "lastModified": 1750134718,
"narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=",
"owner": "nixos", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
@ -216,15 +213,15 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1772542754, "lastModified": 1750134718,
"narHash": "sha256-WGV2hy+VIeQsYXpsLjdr4GvHv5eECMISX1zKLTedhdg=", "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=",
"owner": "NixOS", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8c809a146a140c5c8806f13399592dbcb1bb5dc4", "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "nixos",
"ref": "nixos-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
@ -249,14 +246,15 @@
"nur": { "nur": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_2",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_4",
"treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1776664029, "lastModified": 1750323839,
"narHash": "sha256-X5LbrpV66STh+DgWXx0+TnTClHoQCWjGtUcZpMfqfUk=", "narHash": "sha256-r2Izw07xe5JEWLjQLI4Y3C/Sw2VNBGNmnZTVWtOyzlg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "2b094682b2f7f4dbf83d4600219f4c64cda8e7e0", "rev": "7f1902da6a047ccffbbb809b98205d08cd5df509",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -268,47 +266,32 @@
"root": { "root": {
"inputs": { "inputs": {
"ags": "ags", "ags": "ags",
"astal": "astal",
"fzgo": "fzgo", "fzgo": "fzgo",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixos-06cb-009a-fingerprint-sensor": "nixos-06cb-009a-fingerprint-sensor", "nixos-06cb-009a-fingerprint-sensor": "nixos-06cb-009a-fingerprint-sensor",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_3",
"nur": "nur", "nur": "nur",
"vicinae": "vicinae",
"worktimer": "worktimer" "worktimer": "worktimer"
} }
}, },
"systems": { "treefmt-nix": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"vicinae": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_4", "nixpkgs": [
"systems": "systems" "nur",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1776435302, "lastModified": 1733222881,
"narHash": "sha256-MSmlvbsg2kc2DdQGBR+3Shta+Spgi4A2k5tkbTnrro8=", "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
"owner": "vicinaehq", "owner": "numtide",
"repo": "vicinae", "repo": "treefmt-nix",
"rev": "9fb1f6d2f882ebf36ab19919e99ca36ad7e06c9b", "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "vicinaehq", "owner": "numtide",
"repo": "vicinae", "repo": "treefmt-nix",
"type": "github" "type": "github"
} }
}, },

105
flake.nix
View File

@ -7,68 +7,47 @@
}; };
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
fzgo.url = "git+https://git.thomasave.be/thomasave/fzgo.git"; fzgo.url = "git+https://git.thomasave.be/thomasave/fzgo.git";
vicinae.url = "github:vicinaehq/vicinae"; ags.url = "github:aylur/ags";
worktimer = { worktimer = {
type = "git"; type = "git";
url = "https://git.thomasave.be/thomasave/WorkTimer"; url = "https://git.thomasave.be/thomasave/WorkTimer";
ref = "cli"; 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 = { nixos-06cb-009a-fingerprint-sensor = {
url = "github:ahbnr/nixos-06cb-009a-fingerprint-sensor?ref=24.11"; url = "github:ahbnr/nixos-06cb-009a-fingerprint-sensor?ref=24.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };
outputs = { outputs = { nixpkgs, home-manager, nur, nixos-06cb-009a-fingerprint-sensor, ... }@inputs:
nixpkgs, let
home-manager, system = "x86_64-linux";
nur, pkgs = nixpkgs.legacyPackages.${system};
nixos-06cb-009a-fingerprint-sensor,
...
} @ inputs: let
supportedSystems = ["x86_64-linux" "aarch64-linux"];
forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
commonModules = host: user: [ commonModules = host: user: [
./hosts/${host}/hardware-configuration.nix ./hosts/${host}/hardware-configuration.nix
{ { nixpkgs.overlays = [
nixpkgs.overlays = [
nur.overlays.default nur.overlays.default
(self: super: {utillinux = super.util-linux;}) (self: super: { utillinux = super.util-linux; })
]; ]; }
} {
({pkgs, ...}: {
networking.hostName = host; networking.hostName = host;
time.timeZone = "Asia/Bangkok"; time.timeZone = "Europe/Brussels";
nix.settings = { nix.settings = {
substituters = [ substituters = [
"https://nix-community.cachix.org" "https://nix-community.cachix.org"
"https://cuda-maintainers.cachix.org" "https://cuda-maintainers.cachix.org"
"https://vicinae.cachix.org"
]; ];
trusted-public-keys = [ trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E=" "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
"vicinae.cachix.org-1:1kDrfienkGHPYbkpNj1mWTr7Fm1+zcenzgTizIcI3oc="
]; ];
experimental-features = ["nix-command" "flakes"]; experimental-features = [ "nix-command" "flakes" ];
trusted-users = ["root" user]; trusted-users = [ "root" user ];
keep-outputs = true;
keep-derivations = true;
auto-optimise-store = true; auto-optimise-store = true;
}; };
users.users.${user} = { users.users.${user} = {
isNormalUser = true; isNormalUser = true;
extraGroups = ["wheel" "video"]; # Enable 'sudo' for the user. extraGroups = [ "wheel" ]; # Enable sudo for the user.
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKAa3tMzSCRuprEACrBsKI0F/o73o6J9L1qR3TaZn/N8 user@Kell" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKAa3tMzSCRuprEACrBsKI0F/o73o6J9L1qR3TaZn/N8 user@Kell"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIByLwLAdJbmoDV5sx4hg5NbzKbOh1GmWEhDOUJ1GQBhK user@Riva" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIByLwLAdJbmoDV5sx4hg5NbzKbOh1GmWEhDOUJ1GQBhK user@Riva"
@ -83,64 +62,34 @@
shell = pkgs.zsh; shell = pkgs.zsh;
}; };
system.stateVersion = "23.11"; system.stateVersion = "23.11";
}) }
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
home-manager = { home-manager = {
extraSpecialArgs = {inherit inputs;}; extraSpecialArgs = { inherit inputs; };
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
users.${user} = {imports = [./home/${host}.nix];}; users.${user} = { imports = [ ./home/${host}.nix ]; };
backupFileExtension = "bak"; backupFileExtension = "bak";
}; };
} }
./hosts/${host} ./hosts/${host}
]; ];
mkSystem = host: cfg: let mkSystem = host: cfg:
system = cfg.system or "x86_64-linux";
in
nixpkgs.lib.nixosSystem { nixpkgs.lib.nixosSystem {
modules = system = cfg.system or "x86_64-linux";
(commonModules host cfg.user) modules = (commonModules host cfg.user) ++ (cfg.modules or [ ]);
++ (cfg.modules or [])
++ [
{nixpkgs.hostPlatform = system;}
];
specialArgs = inputs; specialArgs = inputs;
}; };
systems = { systems = {
Riva = {user = "user";}; Riva = { user = "user"; };
Kell = {user = "user";}; Kell = { user = "user"; };
Aloria = {user = "user";}; Aloria = { user = "user"; };
Arendia = { Arendia = { user = "user"; modules = [
user = "user";
modules = [
nixos-06cb-009a-fingerprint-sensor.nixosModules."06cb-009a-fingerprint-sensor" nixos-06cb-009a-fingerprint-sensor.nixosModules."06cb-009a-fingerprint-sensor"
]; ];};
}; Asturia = { user = "user"; };
};
mkHome = architecture: modulePath:
home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.${architecture};
modules = [modulePath];
extraSpecialArgs = {inherit inputs;};
};
in {
nixosConfigurations = nixpkgs.lib.mapAttrs mkSystem systems;
# Automatically injects the correct pkgs and modules for each host
homeConfigurations = {
"user@Pi" = mkHome "aarch64-linux" ./home/Pi.nix;
"ubuntu@Arm" = mkHome "aarch64-linux" ./home/Arm.nix;
"user@Tolnedra" = mkHome "x86_64-linux" ./home/Tolnedra.nix;
"server@Vault" = mkHome "x86_64-linux" ./home/Vault.nix;
"user@Docker" = mkHome "x86_64-linux" ./home/Docker.nix;
"server@Mallorea" = mkHome "x86_64-linux" ./home/Mallorea.nix;
};
# Generic formatter across architectures
formatter = forAllSystems (
system:
nixpkgs.legacyPackages.${system}.alejandra
);
}; };
in
{ nixosConfigurations = nixpkgs.lib.mapAttrs mkSystem systems; };
} }

View File

@ -1,55 +1,62 @@
{ { inputs, config, pkgs, ... }:
inputs, let
config,
pkgs,
...
}: let
fzgo_paths = { fzgo_paths = {
files = [ files = [
"/home/user/.dotfiles" "/home/user/.dotfiles"
"/home/server/.cache/fzgo/entries/f/|home|user|Workspace"
]; ];
dirs = [ dirs = [
"/home/user/.dotfiles" "/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 { in
{
imports = [ imports = [
(import ./utils/desktop.nix {inherit inputs config pkgs;}) (import ./utils/desktop.nix { inherit inputs config pkgs; })
(import ./utils/fzgo_links.nix {inherit config pkgs fzgo_paths;}) (import ./utils/fzgo_links.nix { inherit config pkgs fzgo_paths; })
]; ];
programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Aloria/id_ed25519"; programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Aloria/id_ed25519";
home.packages = with pkgs; [ home.packages = with pkgs; [
jetbrains.pycharm jetbrains.pycharm-professional
rclone
opencode
# zed-editor
uv
google-cloud-sdk
awscli2
distrobox distrobox
gnome-disk-utility gnome-disk-utility
moonlight-qt moonlight-qt
vscode vscode
texliveFull texliveFull
gnome-power-manager gnome-power-manager
discord
smile smile
podman-compose
vesktop
]; ];
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 = { wayland.windowManager.hyprland.settings = {
monitor = [ 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" "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:${
./hyprland/files/rofi-power-menu.sh
}"
]; ];
general.gaps_out = 1; general.gaps_out = 1;
}; };
programs.alacritty.settings.font.size = 13; programs.alacritty.settings.font.size = 16;
programs.kitty.font.size = 13; programs.kitty.font.size = 15;
} }

View File

@ -1,22 +1,22 @@
{ { inputs, config, pkgs, ... }:
inputs, let
config,
pkgs,
...
}: let
fzgo_paths = { fzgo_paths = {
files = [ files = [
"/home/user/.dotfiles" "/home/user/.dotfiles"
"/home/server/.cache/fzgo/entries/f/|home|user|Workspace"
]; ];
dirs = [ dirs = [
"/home/user/.dotfiles" "/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 { in
{
imports = [ imports = [
(import ./utils/desktop.nix {inherit inputs config pkgs;}) (import ./utils/desktop.nix { inherit inputs config pkgs; })
(import ./utils/fzgo_links.nix {inherit config pkgs fzgo_paths;}) (import ./utils/fzgo_links.nix { inherit config pkgs fzgo_paths; })
]; ];
programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Arendia/id_ed25519"; programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Arendia/id_ed25519";
@ -28,10 +28,20 @@ in {
vscode vscode
texliveFull texliveFull
gnome-power-manager gnome-power-manager
# jetbrains.pycharm-professional jetbrains.pycharm-professional
discord
smile smile
]; ];
services.hyprpaper = {
settings = {
wallpaper = [
"HDMI-A-1,${./hyprland/files/wallpaper.png}"
"eDP-1,${./hyprland/files/wallpaper.png}"
];
};
};
wayland.windowManager.hyprland.settings = { wayland.windowManager.hyprland.settings = {
monitor = [ monitor = [
"eDP-1,2560x1440@60.01,0x0,1" "eDP-1,2560x1440@60.01,0x0,1"
@ -47,5 +57,4 @@ in {
programs.alacritty.settings.font.size = 13; programs.alacritty.settings.font.size = 13;
programs.kitty.font.size = 15; programs.kitty.font.size = 15;
programs.foot.settings.main.font = pkgs.lib.mkForce "DejaVu Sans Mono:size=15";
} }

View File

@ -1,10 +1,7 @@
{ { inputs, config, pkgs, ... }:
inputs, let
config, in
pkgs, {
...
}: let
in {
home.username = "ubuntu"; home.username = "ubuntu";
home.homeDirectory = "/home/ubuntu"; home.homeDirectory = "/home/ubuntu";
nix = { nix = {
@ -15,7 +12,7 @@ in {
xdg.enable = true; xdg.enable = true;
imports = [ imports = [
(import ./utils/common.nix {inherit inputs config pkgs;}) (import ./utils/common.nix { inherit inputs config pkgs; })
./ssh ./ssh
]; ];
programs.ssh.matchBlocks."*".identityFile = "/home/ubuntu/.secrets/SSH/Arm/id_ed25519"; programs.ssh.matchBlocks."*".identityFile = "/home/ubuntu/.secrets/SSH/Arm/id_ed25519";

View File

@ -1,11 +1,8 @@
{ inputs, config, pkgs, ... }:
{ {
inputs,
config,
pkgs,
...
}: {
imports = [ imports = [
(import ./utils/desktop.nix {inherit inputs config pkgs;}) (import ./utils/desktop.nix { inherit inputs config pkgs; })
]; ];
programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Asturia/id_ed25519"; programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Asturia/id_ed25519";

View File

@ -1,13 +1,9 @@
{ inputs, config, pkgs, ... }:
{ {
inputs,
config,
pkgs,
...
}: {
home.username = "user"; home.username = "user";
home.homeDirectory = "/home/user"; home.homeDirectory = "/home/user";
imports = [ imports = [
(import ./utils/common.nix {inherit inputs config pkgs;}) (import ./utils/common.nix { inherit inputs config pkgs; })
]; ];
} }

View File

@ -1,9 +1,5 @@
{ { inputs, config, pkgs, ... }:
inputs, let
config,
pkgs,
...
}: let
fzgo_paths = { fzgo_paths = {
files = [ files = [
"/home/user/.dotfiles" "/home/user/.dotfiles"
@ -16,10 +12,11 @@
"/home/server/.cache/fzgo/entries/d/|home|server|Storage|Shared" "/home/server/.cache/fzgo/entries/d/|home|server|Storage|Shared"
]; ];
}; };
in { in
{
imports = [ imports = [
(import ./utils/desktop.nix {inherit inputs config pkgs;}) (import ./utils/desktop.nix { inherit inputs config pkgs; })
(import ./utils/fzgo_links.nix {inherit config pkgs fzgo_paths;}) (import ./utils/fzgo_links.nix { inherit config pkgs fzgo_paths; })
]; ];
programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Kell/id_ed25519"; programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Kell/id_ed25519";
@ -36,8 +33,18 @@ in {
moonlight-qt moonlight-qt
vscode vscode
jetbrains.rider jetbrains.rider
discord
]; ];
services.hyprpaper = {
settings = {
wallpaper = [
"DP-1,${./hyprland/files/wallpaper.png}"
"DP-2,${./hyprland/files/wallpaper.png}"
"HDMI-A-1,${./hyprland/files/wallpaper.png}"
];
};
};
wayland.windowManager.hyprland.settings = { wayland.windowManager.hyprland.settings = {
monitor = [ monitor = [
"DP-2,preferred,0x550,1" "DP-2,preferred,0x550,1"

View File

@ -1,13 +1,9 @@
{ { inputs, config, pkgs, ... }:
inputs, let
config,
pkgs,
...
}: let
username = "server"; username = "server";
home_dir = "/home/${username}"; home_dir = "/home/${username}";
scripts = { scripts = {
disk_check = import ./utils/disk_check.nix {inherit pkgs;}; disk_check = import ./utils/disk_check.nix { inherit pkgs; };
# vdirsyncer = { # vdirsyncer = {
# when = "*:0/15"; # when = "*:0/15";
# script = toString (pkgs.writeShellScript "script" '' ${pkgs.vdirsyncer}/bin/vdirsyncer sync imec/pair ''); # script = toString (pkgs.writeShellScript "script" '' ${pkgs.vdirsyncer}/bin/vdirsyncer sync imec/pair '');
@ -27,30 +23,30 @@
${pkgs.notmuch}/bin/notmuch new ${pkgs.notmuch}/bin/notmuch new
''); '');
}; };
# sync_vault = { sync_vault = {
# when = "*-*-* 02:00:00"; when = "*-*-* 02:00:00";
# script = toString (pkgs.writeShellScript "script" '' script = toString (pkgs.writeShellScript "script" ''
# source $HOME/.secrets/Backup/env.sh source $HOME/.secrets/Backup/env.sh
# for _ in {1..2}; do for _ in {1..2}; do
# OUTPUT=$(echo "$ZFS_PASSPHRASE" | ssh 10.4.0.1 zfs load-key Vault/Thomas/Encrypted 2>&1); 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 if [ "$OUTPUT" == "Key load error: Key already loaded for 'Vault/Thomas/Encrypted'." ]; then
# echo "Key successfully loaded, starting syncoid" 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/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/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/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/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 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 ssh 10.4.0.1 zfs unload-key Vault/Thomas/Encrypted
# ${pkgs.curl}/bin/curl https://uptime.thomasave.be/api/push/s39pIIrB0R ${pkgs.curl}/bin/curl https://uptime.thomasave.be/api/push/s39pIIrB0R
# exit 0 exit 0
# fi fi
# done done
#
# echo "Found output instead: $OUTPUT" echo "Found output instead: $OUTPUT"
# echo "Failed to load key: $OUTPUT" | sendmail echo "Failed to load key: $OUTPUT" | sendmail
# exit 1 exit 1
# ''); '');
# }; };
backup = { backup = {
when = "*-*-* 04:00:00"; when = "*-*-* 04:00:00";
script = toString (pkgs.writeShellScript "script" '' script = toString (pkgs.writeShellScript "script" ''
@ -78,7 +74,7 @@ in {
nix = { nix = {
package = pkgs.nix; package = pkgs.nix;
settings = { settings = {
trusted-users = [username]; trusted-users = [ username ];
use-xdg-base-directories = true; use-xdg-base-directories = true;
}; };
}; };
@ -86,9 +82,9 @@ in {
xdg.enable = true; xdg.enable = true;
imports = [ imports = [
(import ./utils/common.nix {inherit inputs config pkgs;}) (import ./utils/common.nix { inherit inputs config pkgs; })
(import ./utils/services.nix {inherit pkgs scripts;}) (import ./utils/services.nix { inherit pkgs scripts; })
(import ./utils/fzgo_links.nix {inherit config pkgs fzgo_paths;}) (import ./utils/fzgo_links.nix { inherit config pkgs fzgo_paths; })
./ssh ./ssh
]; ];
programs.ssh.matchBlocks."*".identityFile = "${home_dir}/.secrets/SSH/Mallorea/id_ed25519"; programs.ssh.matchBlocks."*".identityFile = "${home_dir}/.secrets/SSH/Mallorea/id_ed25519";

View File

@ -1,10 +1,7 @@
{ { inputs, config, pkgs, ... }:
inputs, let
config, in
pkgs, {
...
}: let
in {
home.username = "user"; home.username = "user";
home.homeDirectory = "/home/user"; home.homeDirectory = "/home/user";
nix = { nix = {
@ -15,7 +12,7 @@ in {
xdg.enable = true; xdg.enable = true;
imports = [ imports = [
(import ./utils/common.nix {inherit inputs config pkgs;}) (import ./utils/common.nix { inherit inputs config pkgs; })
./ssh ./ssh
]; ];
programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Pi/id_ed25519"; programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Pi/id_ed25519";

View File

@ -1,9 +1,5 @@
{ { inputs, config, pkgs, ... }:
inputs, let
config,
pkgs,
...
}: let
fzgo_paths = { fzgo_paths = {
files = [ files = [
"/home/user/.dotfiles" "/home/user/.dotfiles"
@ -16,10 +12,11 @@
"/home/server/.cache/fzgo/entries/d/|home|server|Storage|Shared" "/home/server/.cache/fzgo/entries/d/|home|server|Storage|Shared"
]; ];
}; };
in { in
{
imports = [ imports = [
(import ./utils/fzgo_links.nix {inherit config pkgs fzgo_paths;}) (import ./utils/fzgo_links.nix { inherit config pkgs fzgo_paths; })
(import ./utils/desktop.nix {inherit inputs config pkgs;}) (import ./utils/desktop.nix { inherit inputs config pkgs; })
./ssh ./ssh
]; ];
@ -30,6 +27,13 @@ in {
jq jq
rclone rclone
]; ];
services.hyprpaper = {
settings = {
wallpaper = [
"Virtual-1,${./hyprland/files/wallpaper.png}"
];
};
};
wayland.windowManager.hyprland.settings = { wayland.windowManager.hyprland.settings = {
monitor = [ monitor = [
"Virtual-1,2560x1440,0x0,1" "Virtual-1,2560x1440,0x0,1"

View File

@ -1,22 +1,19 @@
{ inputs, config, pkgs, ... }:
{ {
inputs,
config,
pkgs,
...
}: {
home.username = "user"; home.username = "user";
home.homeDirectory = "/home/user"; home.homeDirectory = "/home/user";
nix = { nix = {
package = pkgs.nix; package = pkgs.nix;
settings = { settings = {
trusted-users = ["user"]; trusted-users = [ "user" ];
use-xdg-base-directories = true; use-xdg-base-directories = true;
}; };
}; };
xdg.enable = true; xdg.enable = true;
imports = [ imports = [
(import ./utils/common.nix {inherit inputs config pkgs;}) (import ./utils/common.nix { inherit inputs config pkgs; })
./alacritty ./alacritty
./ssh ./ssh
]; ];

View File

@ -1,9 +1,5 @@
{ { inputs, config, pkgs, ... }:
inputs, let
config,
pkgs,
...
}: let
scripts = { scripts = {
disk_check = { disk_check = {
when = "*-*-* *:00:00"; when = "*-*-* *:00:00";
@ -51,7 +47,8 @@
''); '');
}; };
}; };
in { in
{
home.username = "server"; home.username = "server";
home.homeDirectory = "/home/server"; home.homeDirectory = "/home/server";
nix = { nix = {
@ -61,11 +58,8 @@ in {
xdg.enable = true; xdg.enable = true;
imports = [ imports = [
(import ./utils/common.nix {inherit inputs config pkgs;}) (import ./utils/common.nix { inherit inputs config pkgs; })
(import ./utils/services.nix { (import ./utils/services.nix { inherit pkgs; scripts = scripts; })
inherit pkgs;
scripts = scripts;
})
./ssh ./ssh
]; ];

View File

@ -1,19 +1,16 @@
{ inputs, pkgs, ... }:
{ {
inputs,
pkgs,
...
}: {
# add the home manager module # add the home manager module
imports = [inputs.ags.homeManagerModules.default]; imports = [ inputs.ags.homeManagerModules.default ];
programs.ags = { programs.ags = {
enable = true; enable = true;
configDir = ./files; configDir = ./files;
extraPackages = with inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}; [ extraPackages = with inputs.ags.packages.${pkgs.system}; [
pkgs.gtksourceview pkgs.gtksourceview
pkgs.accountsservice pkgs.accountsservice
pkgs.libadwaita
battery battery
hyprland hyprland

View File

@ -1,172 +1,135 @@
import { Astal, Gdk, Gtk } from "ags/gtk4"; import { Astal, Gdk } from "ags/gtk4";
import app from "ags/gtk4/app"; import app from "ags/gtk4/app"
import { createBinding, createState, For, With, Accessor } from "ags"; import Gtk from "gi://Gtk?version=4.0"
import { createPoll } from "ags/time"; import { createBinding, createState } from "ags"
import { subprocess, execAsync } from "ags/process";
import Tray from "gi://AstalTray"; import Tray from "gi://AstalTray";
import { execAsync } from "ags/process"
import Hyprland from "gi://AstalHyprland";
import { getIconName } from "./utils"; import { getIconName } from "./utils";
import Wp from "gi://AstalWp"; import Wp from "gi://AstalWp"
import Battery from "gi://AstalBattery"; import Battery from "gi://AstalBattery"
import GLib from "gi://GLib";
const battery = Battery.get_default(); const battery = Battery.get_default()
const sensorsAvailable = await execAsync(["sensors"]) const sensorsAvailable = await execAsync(['sensors']).then(() => true).catch(() => false);
.then(() => true)
.catch(() => false);
const wirePlumber = Wp.get_default(); const wirePlumber = Wp.get_default();
// --- NIRI IPC INTEGRATION ---
const [workspaces, setWorkspaces] = createState<any[]>([]);
const [windows, setWindows] = createState<any[]>([]);
async function updateNiriState() {
try {
const wsOut = await execAsync(["niri", "msg", "-j", "workspaces"]);
setWorkspaces(JSON.parse(wsOut) || []);
const winOut = await execAsync(["niri", "msg", "-j", "windows"]);
setWindows(JSON.parse(winOut) || []);
} catch (e) {
console.error("Failed to fetch Niri state:", e);
}
}
// Initialize state immediately
updateNiriState();
// Subscribe to Niri's native event stream
subprocess(
["niri", "msg", "-j", "event-stream"],
(line) => {
// A state change happened in Niri. Re-fetching guarantees perfect sync
updateNiriState();
},
(err) => console.error("Niri event stream error:", err)
);
// ----------------------------
function SysTray(): JSX.Element { function SysTray(): JSX.Element {
const tray = Tray.get_default(); 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 ( return (
<box> <box>
<For each={items}> {createBinding(tray, "items").as((items) =>
{(item: Tray.TrayItem) => { items.map((item) => {
if (item.iconThemePath) app.add_icons(item.iconThemePath); if (item.iconThemePath) app.add_icons(item.iconThemePath);
return ( return (
<menubutton <menubutton
$={(self) => init(self, item)}
class="systray" class="systray"
tooltipMarkup={createBinding(item, "tooltipMarkup")} tooltipMarkup={createBinding(item, "tooltipMarkup")}
menuModel={createBinding(item, "menuModel")} usePopover={false}
> actionGroup={createBinding(item, "actionGroup").as(ag => ["dbusmenu", ag])}
<image menuModel={createBinding(item, "menuModel")}>
gicon={createBinding(item, "gicon")} {/* <icon gicon={createBinding(item, "gicon")} class="systray-item" /> */}
class="systray-item"
/>
</menubutton> </menubutton>
); );
}} }),
</For> )}
</box> </box>
); );
} }
function Left({ connector }: { connector: string }): JSX.Element { function Left(): JSX.Element {
return ( return (
<box hexpand halign={Gtk.Align.START}> <box hexpand halign={Gtk.Align.START}>
<Clients connector={connector} /> <Clients />
</box> </box>
); );
} }
function Center({ connector }: { connector: string }): JSX.Element { function Center(): JSX.Element {
return ( return (
<box> <box>
<Workspaces connector={connector} /> <Workspaces />
</box> </box>
); );
} }
function Date({ format = "%Y-%m-%d" }): JSX.Element { function Date({ format = "%Y-%m-%d" }): JSX.Element {
const time = createPoll<string>( const time = createState<string>("").poll(60000, () =>
"", GLib.DateTime.new_now_local().format(format)!)
60000, return <button
() => GLib.DateTime.new_now_local().format(format)!,
);
return (
<button
class="item" class="item"
label={time} onDestroy={() => time.drop()}
onClicked={() => execAsync(["gnome-calendar"])} label={time()}
onClicked={() => execAsync(['gnome-calendar'])}
/> />
);
} }
function Time({ format = "%H:%M:%S" }): JSX.Element { function Time({ format = "%H:%M:%S" }): JSX.Element {
const time = createPoll<string>( const time = createState<string>("").poll(1000, () =>
"", GLib.DateTime.new_now_local().format(format)!)
1000, return <label
() => GLib.DateTime.new_now_local().format(format)!, class="item blue"
); onDestroy={() => time.drop()}
return <label class="item blue" label={time} />; label={time()}
/>
} }
function Temp(): JSX.Element { function Temp(): JSX.Element {
let [label, _setlabel] = createState<string>("N/A"); let label = createState<string>("N/A");
if (sensorsAvailable) { if (sensorsAvailable) {
label = createPoll<string>("", 3000, "sensors", (out) => { label = createState<string>("").poll(5000, 'sensors', out => {
const match = out const match = out.split('\n').find(line => line.includes('Tctl') || line.includes('Package'))?.match(/[0-9.]*°C/);
.split("\n")
.find((line) => line.includes("Tctl") || line.includes("Package"))
?.match(/[0-9.]*°C/);
return match ? match[0] : "N/A"; 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 { function Memory(): JSX.Element {
const memory = createPoll<string>("", 2000, "free", (out) => { const memory = createState<string>("").poll(2000, "free", out => {
const line = out.split("\n").find((line) => line.includes("Mem:")); const line = out.split('\n').find(line => line.includes('Mem:'));
if (!line) return "N/A"; if (!line) return "N/A";
const split = line.split(/\s+/).map(Number); const split = line.split(/\s+/).map(Number);
return (split[2] / 1000000).toFixed(2) + "GB"; 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 { function ClockSpeed(): JSX.Element {
const command = const command = 'bash -c "cat /proc/cpuinfo | grep \\"MHz\\" | awk \'{print \\$4}\' | sort -n | tail -1 | awk \'{printf \\"%.2fGHz\\", \\$1/1000}\'"';
'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)
const speed = createPoll<string>("", 1000, command, (out) => out); return <label
return <label class="item" label={speed} />; class="item"
onDestroy={() => speed.drop()}
label={speed()}
/>
} }
function CPU(): JSX.Element { function CPU(): JSX.Element {
const usage = createPoll<string>("", 2000, "top -b -n 1", (out) => { const usage = createState<string>("").poll(2000, "top -b -n 1", out => {
const line = out.split("\n").find((line) => line.includes("Cpu(s)")); const line = out.split("\n").find(line => line.includes('Cpu(s)'));
if (!line) return "N/A"; if (!line) return "N/A";
return line.split(/\s+/)[1].replace(",", ".").toString() + "%"; return line.split(/\s+/)[1].replace(',', '.').toString() + "%";
}); });
return ( return <box class="item">
<box class="item"> {/* <icon icon="speedometer" css="margin-right: 0.7em;" /> */}
<image iconName="speedometer" css="margin-right: 0.7em;" /> <label
<label label={usage} /> onDestroy={() => usage.drop()}
label={usage()}
/>
</box> </box>
);
} }
function Right() {
function Right(): JSX.Element {
return ( return (
<box class="right" hexpand halign={Gtk.Align.END} spacing={6}> <box class="right" hexpand halign={Gtk.Align.END} spacing={6}>
<Icons /> <Icons />
@ -181,46 +144,31 @@ function Right() {
); );
} }
function BatteryIcon(): JSX.Element { // function BatteryIcon(): JSX.Element {
if (battery.get_state() == 0) return <box />; // if (battery.get_state() == 0) return <box />;
let batteryPercentage = createBinding(battery, "percentage"); // return <button class="battery-item" onClicked={() => execAsync(['gnome-power-statistics'])}>
return ( // <box>
<button // {
class="battery-item" // createBinding(battery, "percentage").as((percentage) => {
onClicked={() => execAsync(["gnome-power-statistics"])} // const thresholds = [...Array(11).keys()].map(i => i * 10);
> // const icon = thresholds.find(threshold => threshold >= percentage * 100)
<box> // const charging_name = battery.percentage >= 0.99 ? "charged" : "charging"
<With value={batteryPercentage}> // return <icon
{(percentage) => { // icon={battery.charging ? `battery-level-${icon}-${charging_name}-symbolic` : `battery-level-${icon}-symbolic`}
const thresholds = [...Array(11).keys()].map((i) => i * 10); // />
const icon = thresholds.find( // })
(threshold) => threshold >= percentage * 100, // }
); // </box>
const charging_name = // </button>
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 Icons() { function Icons() {
return ( return (
<box class="item icon-group"> <box class="item icon-group">
<SysTray /> <SysTray />
<BatteryIcon /> {/* <BatteryIcon /> */}
</box> </box>
); )
} }
function Volume(): JSX.Element { function Volume(): JSX.Element {
@ -228,136 +176,120 @@ function Volume(): JSX.Element {
const audio = wirePlumber.audio; const audio = wirePlumber.audio;
const icon = createBinding(audio.default_speaker, "volume").as((volume) => { const icon = createBinding(audio.default_speaker, "volume").as((volume) => {
const vol = volume * 100; const vol = volume * 100
const icon = [ const icon = [
[101, "overamplified"], [101, 'overamplified'],
[67, "high"], [67, 'high'],
[34, "medium"], [34, 'medium'],
[1, "low"], [1, 'low'],
[0, "muted"], [0, 'muted'],
].find(([threshold]) => Number(threshold) <= vol)?.[1]; ].find(([threshold]) => Number(threshold) <= vol)?.[1]
return `audio-volume-${icon}-symbolic`; return `audio-volume-${icon}-symbolic`
}); });
const css = createBinding(audio.default_speaker, "mute").as((mute) => { 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 ( return (
<button <button class="item blue" onClicked={() => audio.default_speaker.mute = !audio.default_speaker.mute}>
class="item blue" <box>
onClicked={() => {/* <icon icon={icon} /> */}
(audio.default_speaker.mute = !audio.default_speaker.mute) {
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>
<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>
</box> </box>
</button> </button>
); );
} }
function Workspaces({ connector }: { connector: string }): JSX.Element {
function Workspaces(): JSX.Element {
const hyprland = Hyprland.get_default();
return ( return (
<box class="workspaces"> <box class="workspaces">
{/* Generate a derived binding by passing a transformation function into the `workspaces` state */} {createBinding(hyprland, "workspaces").as((wss) =>
<For each={workspaces((wss: any[]) => <box>
wss.filter((ws) => ws.output === connector) {createBinding(hyprland, "focusedMonitor").as((fm) =>
.filter((ws) => ws.is_active || windows().some((w: any) => w.workspace_id === ws.id)) wss.sort((a, b) => a.id - b.id)
.sort((a, b) => a.idx - b.idx) .filter(ws => ws && ws.get_monitor() && ws.get_monitor().get_id() === fm.get_id())
)}> .map((ws) => (
{(ws: any) => (
<button <button
class={ws.is_active ? "focused" : ""} class={createBinding(hyprland, "focusedWorkspace").as((fw) => ws === fw ? "focused" : "",)}
onClicked={() => execAsync(["niri", "msg", "action", "focus-workspace", ws.idx.toString()])} onClicked={() => ws.focus()}
> >
{ws.name || ws.idx.toString()} {`${ws.id}`.slice(-1)}
</button> </button>
)))}
</box>
)} )}
</For>
</box> </box>
); );
} }
function shorten(title: string) { function shorten(title: string) {
return title.length > 40 ? title.slice(0, 20) + "..." : title; return title.length > 40 ? title.slice(0, 20) + "..." : title
} }
function Clients({ connector }: { connector: string }): JSX.Element { function Clients(): JSX.Element {
return ( const hyprland = Hyprland.get_default();
<box class="clients">
{/* Use With to react to workspace changes, so we know which WS is active */}
<With value={workspaces}>
{(wss: any[]) => {
let active_ws_for_monitor = wss.find((ws: any) => ws.is_active && ws.output === connector)?.id;
return ( return (
<box> <box>
{/* Generate a derived binding for windows, depending on the active workspace */} {
<For each={windows((wins: any[]) => createBinding(hyprland, "focusedWorkspace").as(fw => (
wins.filter((w: any) => !w.title?.includes("rofi")) <box class="clients">
.filter((w: any) => w.workspace_id === active_ws_for_monitor) {
.sort((a: any, b: any) => { createBinding(hyprland, "clients").as(cls =>
const posA = a.layout?.pos_in_scrolling_layout?.[0] ?? 0; cls
const posB = b.layout?.pos_in_scrolling_layout?.[0] ?? 0; .sort((a, b) => a.pid - b.pid)
return posA - posB; .filter(cl => !cl.title.includes("rofi"))
}) .filter(cl => fw && cl.get_workspace().get_id() === fw.get_id())
)}> .map(cl => (
{(win: any) => ( <box
<box class={win.is_focused ? "focused" : "unfocused"}> class={createBinding(hyprland, "focusedClient").as(a => a && a.address === cl.address ? "focused" : "unfocused")}
<image iconName={getIconName(win.app_id, win.title)} class="app-icon" />
<label label={shorten(win.title || "")} />
</box>
)}
</For>
</box>
);
}}
</With>
</box>
);
}
export default function Bar(gdkmonitor: Gdk.Monitor, scaleFactor: number = 1) {
console.log("Creating Bar on monitor:", gdkmonitor.get_connector());
const connector = gdkmonitor.get_connector() || "";
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-${connector}`}
> >
<centerbox class="window-box"> {/* <icon */}
<Left $type="start" connector={connector} /> {/* icon={getIconName(cl)} */}
<Center $type="center" connector={connector} /> {/* class="app-icon" */}
<Right $type="end" /> {/* /> */}
</centerbox> <label label={createBinding(cl, 'title').as(title => shorten(title))} />
</window> </box>
)
)
)
}
</box>
)
)
}
</box>
); );
} }
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>
})
}

View File

@ -1,19 +1,60 @@
import app from "ags/gtk4/app"; 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 Gtk from "gi://Gtk?version=4.0";
import { Gdk } from "ags/gtk4"; import { Gdk } from "ags/gtk4";
import style from "./style.scss";
import Bar from "./Bar";
import NotificationPopups from "./notifications/NotificationPopups";
function register_windows(monitor: Gdk.Monitor) { const hyprland = Hyprland.get_default();
let scale = (monitor.get_geometry().width >= 3000) ? 1.2 : 1;
Bar(monitor, scale); function find_main_monitor(): Hyprland.Monitor {
NotificationPopups(); 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)
if (monitors[i].get_name() == monitor + "-" + j) {
return monitors[i]
}
}
}
}
return monitors[0]
} }
function register_windows(monitor: Hyprland.Monitor) {
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()
for (var wd of app.get_windows()) {
wd.destroy();
}
register_windows(mainMonitor);
}
hyprland.connect("monitor-added", (_, _monitor: Hyprland.Monitor) => {
switch_to_best_monitor()
})
hyprland.connect("monitor-removed", () => {
switch_to_best_monitor()
})
app.start({ app.start({
css: style, css: style,
iconTheme: "Papirus", iconTheme: "Papirus",
main() { main() {
register_windows(app.get_monitors()[0]); switch_to_best_monitor()
}, },
}); })

View File

@ -5,7 +5,7 @@
} }
// https://gitlab.gnome.org/GNOME/gtk/-/blob/gtk-3-24/gtk/theme/Adwaita/_colors-public.scss // 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; $bg-color: #1f2430;
$error: red; $error: red;
@ -13,63 +13,78 @@ window.NotificationPopups {
all: unset; all: unset;
} }
.Notification { eventbox.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);
&.critical { &:first-child>box {
border: 1pt solid gtkalpha($error, 0.4); 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 { .header {
.app-name { .app-name {
color: gtkalpha($error, 0.8); color: gtkalpha($error, .8);
} }
.app-icon { .app-icon {
color: gtkalpha($error, 0.6); color: gtkalpha($error, .6);
} }
} }
} }
.header { .header {
padding: 0.5rem; padding: .5rem;
color: gtkalpha($fg-color, 0.5); color: gtkalpha($fg-color, 0.5);
.app-icon { .app-icon {
margin: 0 0.4rem; margin: 0 .4rem;
} }
.app-name { .app-name {
margin-right: 0.3rem; margin-right: .3rem;
font-weight: bold; font-weight: bold;
&:first-child { &:first-child {
margin-left: 0.4rem; margin-left: .4rem;
} }
} }
.time { .time {
margin: 0 0.4rem; margin: 0 .4rem;
} }
button { button {
padding: 0.2rem; padding: .2rem;
min-width: 0; min-width: 0;
min-height: 0; min-height: 0;
} }
} }
separator { separator {
margin: 0 0.4rem; margin: 0 .4rem;
background-color: gtkalpha($fg-color, 0.1); background-color: gtkalpha($fg-color, .1);
} }
.content { .content {
margin: 1rem; margin: 1rem;
margin-top: 0.5rem; margin-top: .5rem;
.summary { .summary {
font-size: 1.2em; font-size: 1.2em;
@ -81,8 +96,8 @@ window.NotificationPopups {
} }
.image { .image {
border: 1px solid gtkalpha($fg-color, 0.02); border: 1px solid gtkalpha($fg-color, .02);
margin-right: 0.5rem; margin-right: .5rem;
border-radius: 9px; border-radius: 9px;
min-width: 100px; min-width: 100px;
min-height: 100px; min-height: 100px;
@ -96,7 +111,7 @@ window.NotificationPopups {
margin-top: 0; margin-top: 0;
button { button {
margin: 0 0.3rem; margin: 0 .3rem;
&:first-child { &:first-child {
margin-left: 0; margin-left: 0;

View File

@ -1,156 +1,107 @@
import { Gtk, Gdk } from "ags/gtk4"; import { Gtk, Astal } from "ags/gtk4"
import Adw from "gi://Adw"; import { EventBox } from "ags"
import GLib from "gi://GLib"; import Notifd from "gi://AstalNotifd"
import AstalNotifd from "gi://AstalNotifd"; import GLib from "gi://GLib"
import Pango from "gi://Pango";
import { timeout } from "ags/time";
function isIcon(icon?: string | null) { const isIcon = (icon: string) =>
const iconTheme = Gtk.IconTheme.get_for_display(Gdk.Display.get_default()!); !!Astal.Icon.lookup_icon(icon)
return icon && iconTheme.has_icon(icon);
}
function fileExists(path: string) { const fileExists = (path: string) =>
return GLib.file_test(path, GLib.FileTest.EXISTS); GLib.file_test(path, GLib.FileTest.EXISTS)
}
function time(time: number, format = "%H:%M") { const time = (time: number, format = "%H:%M") => GLib.DateTime
return GLib.DateTime.new_from_unix_local(time).format(format)!; .new_from_unix_local(time)
} .format(format)!
function urgency(n: AstalNotifd.Notification) { const urgency = (n: Notifd.Notification) => {
const { LOW, NORMAL, CRITICAL } = AstalNotifd.Urgency; const { LOW, NORMAL, CRITICAL } = Notifd.Urgency
// match operator when?
switch (n.urgency) { switch (n.urgency) {
case LOW: case LOW: return "low"
return "low"; case CRITICAL: return "critical"
case CRITICAL:
return "critical";
case NORMAL: case NORMAL:
default: default: return "normal"
return "normal";
} }
} }
export default function Notification({ type Props = {
notification: n, setup(self: EventBox): void
onHoverLost, onHoverLost(self: EventBox): void
}: { notification: Notifd.Notification
notification: AstalNotifd.Notification; }
onHoverLost: () => void;
}) {
const timer = timeout(3000, () => {
try {
onHoverLost();
} catch (error) {
console.error("Failed to handle onHoverLost:", error);
}
});
const handleDismiss = () => { export default function Notification(props: Props) {
try { const { notification: n, onHoverLost, setup } = props
n.dismiss(); const { START, CENTER, END } = Gtk.Align
} catch (error) {
console.error("Failed to dismiss notification:", error);
}
};
const handleInvoke = (id: string) => { return <eventbox
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)}`} class={`Notification ${urgency(n)}`}
orientation={Gtk.Orientation.VERTICAL} setup={setup}
> onHoverLost={onHoverLost}>
<Gtk.EventControllerMotion <box vertical>
onEnter={() => timer.cancel()}
onLeave={onHoverLost}
/>
<box class="header"> <box class="header">
{(n.appIcon || isIcon(n.desktopEntry)) && ( {(n.appIcon || n.desktopEntry) && <icon
<image
class="app-icon" class="app-icon"
visible={Boolean(n.appIcon || n.desktopEntry)} visible={Boolean(n.appIcon || n.desktopEntry)}
iconName={n.appIcon || n.desktopEntry} icon={n.appIcon || n.desktopEntry}
/> />}
)}
<label <label
class="app-name" class="app-name"
halign={Gtk.Align.START} halign={START}
ellipsize={Pango.EllipsizeMode.END} truncate
label={n.appName || "Unknown"} label={n.appName || "Unknown"}
/> />
<label <label
class="time" class="time"
hexpand hexpand
halign={Gtk.Align.END} halign={END}
label={handleTime(n.time)} label={time(n.time)}
/> />
<button onClicked={handleDismiss}> <button onClicked={() => n.dismiss()}>
<image iconName="window-close-symbolic" /> <icon icon="window-close-symbolic" />
</button> </button>
</box> </box>
<Gtk.Separator visible /> <Gtk.Separator visible />
<box class="content"> <box class="content">
{n.image && fileExists(n.image) && ( {n.image && fileExists(n.image) && <box
<image valign={Gtk.Align.START} class="image" file={n.image} /> valign={START}
)} class="image"
{n.image && isIcon(n.image) && ( css={`background-image: url('${n.image}')`}
<box valign={Gtk.Align.START} class="icon-image"> />}
<image {n.image && isIcon(n.image) && <box
iconName={n.image} expand={false}
halign={Gtk.Align.CENTER} valign={START}
valign={Gtk.Align.CENTER} class="icon-image">
/> <icon icon={n.image} expand halign={CENTER} valign={CENTER} />
</box> </box>}
)} <box vertical>
<box orientation={Gtk.Orientation.VERTICAL}>
<label <label
class="summary" class="summary"
halign={Gtk.Align.START} halign={START}
xalign={0} xalign={0}
label={n.summary} label={n.summary}
ellipsize={Pango.EllipsizeMode.END} truncate
/> />
{n.body && ( {n.body && <label
<label
class="body" class="body"
wrap wrap
useMarkup useMarkup
halign={Gtk.Align.START} halign={START}
xalign={0} xalign={0}
justify={Gtk.Justification.FILL} justifyFill
label={n.body} label={n.body}
/> />}
)}
</box> </box>
</box> </box>
{n.actions.length > 0 && ( {n.get_actions().length > 0 && <box class="actions">
<box class="actions"> {n.get_actions().map(({ label, id }) => (
{n.actions.map(({ label, id }) => ( <button
<button hexpand onClicked={() => handleInvoke(id)}> hexpand
<label label={label} halign={Gtk.Align.CENTER} hexpand /> onClicked={() => n.invoke(id)}>
<label label={label} halign={CENTER} hexpand />
</button> </button>
))} ))}
</box>}
</box> </box>
)} </eventbox>
</box>
</Adw.Clamp>
);
} }

View File

@ -1,79 +1,107 @@
import app from "ags/gtk4/app"; import { Astal, Gtk, Gdk } from "ags/gtk4"
import { Astal, Gtk } from "ags/gtk4"; import Notifd from "gi://AstalNotifd"
import AstalNotifd from "gi://AstalNotifd"; import Notification from "./Notification"
import Notification from "./Notification"; import { type Subscribable } from "astal/binding"
import { createBinding, For, createState, onCleanup } from "ags"; import { timeout } from "ags/time"
import { createBinding, createState } from "ags"
import GLib from "gi://GLib"
export default function NotificationPopups() { // see comment below in constructor
const monitors = createBinding(app, "monitors"); 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( // it makes sense to use a Variable under the hood and use its
new Array<AstalNotifd.Notification>(), // reactivity implementation instead of keeping track of subscribers ourselves
); private var: Array<Gtk.Widget> = createState([])
const notifiedHandler = notifd.connect("notified", (_, id, replaced) => { // notify subscribers to rerender when state changes
try { private notifiy() {
const notification = notifd.get_notification(id); this.var.set([...this.map.values()].reverse())
if (!notification) {
console.error(`Failed to get notification with id: ${id}`);
return;
} }
if (replaced && notifications.get().some((n) => n.id === id)) { private constructor() {
setNotifications((ns) => const notifd = Notifd.get_default()
ns.map((n) => (n.id === id ? notification : n)),
);
} else {
setNotifications((ns) => [notification, ...ns]);
}
} catch (error) {
console.error("Failed to handle notification:", error);
}
});
const resolvedHandler = notifd.connect("resolved", (_, id) => { /**
try { * uncomment this if you want to
setNotifications((ns) => ns.filter((n) => n.id !== id)); * ignore timeout by senders and enforce our own timeout
} catch (error) { * note that if the notification has any actions
console.error("Failed to resolve notification:", error); * 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 notifd.connect("notified", (_, id) => {
// and this cleanup function is only called when the program exits, but exiting will cleanup either way this.set(id, Notification({
// but it's here to remind you that you should not forget to cleanup signal connections notification: notifd.get_notification(id)!,
onCleanup(() => {
notifd.disconnect(notifiedHandler);
notifd.disconnect(resolvedHandler);
});
return ( // once hovering over the notification is done
<For each={monitors} cleanup={(win) => (win as Gtk.Window).destroy()}> // destroy the widget without calling notification.dismiss()
{(monitor) => ( // so that it acts as a "popup" and we can still display it
<window // in a notification center like widget
class="NotificationPopups" // but clicking on the close button will close it
gdkmonitor={monitor} onHoverLost: () => this.delete(id),
visible={notifications((ns) => ns.length > 0)}
anchor={Astal.WindowAnchor.TOP | Astal.WindowAnchor.RIGHT} // notifd by default does not close notifications
> // until user input or the timeout specified by sender
<box orientation={Gtk.Orientation.VERTICAL}> // which we set to ignore above
<For each={notifications}> setup: () => timeout(TIMEOUT_DELAY, () => {
{(notification) => ( /**
<Notification * uncomment this if you want to "hide" the notifications
notification={notification} * after TIMEOUT_DELAY
onHoverLost={() => */
setNotifications((ns) => this.delete(id)
ns.filter((n) => n.id !== notification.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) {
</For> // 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> </box>
</window> </window>
)}
</For>
);
} }

View File

@ -17,7 +17,7 @@ window.Bar {
margin-top: 0.2em; margin-top: 0.2em;
} }
.clients box box { .clients box {
margin-right: 0.3em; margin-right: 0.3em;
} }
@ -27,13 +27,11 @@ window.Bar {
border-radius: 0.3em; border-radius: 0.3em;
background: #1f2430; background: #1f2430;
} }
.battery-item:hover { .battery-item:hover {
background: #023269; background: #023269;
} }
.item, .item, .clients box {
.clients box box {
background: #1f2430; background: #1f2430;
padding-left: 0.7em; padding-left: 0.7em;
padding-right: 0.7em; padding-right: 0.7em;
@ -51,14 +49,12 @@ window.Bar {
button { button {
background: #1f2430; background: #1f2430;
border: none; border:none;
padding: 0.2em; padding: 0.2em;
border-radius: 0.3em; border-radius: 0.3em;
font-weight: normal;
} }
.focused, .focused, .clients box.focused {
.clients box.focused {
background: #023269; background: #023269;
} }

View File

@ -1,53 +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( const app_icons = new Apps.Apps().list.reduce(
(acc, app) => { (acc, app) => {
// keys from AstalApps entries are typically wm_class (snake_case) or name if (app.icon_name) {
const key = app.wm_class ?? app.name; acc.classOrNames[app.wm_class ?? app.name] = app.icon_name;
if (key) {
acc.classOrNames[key] = app.icon_name;
}
if (app.executable) {
acc.executables[app.executable] = app.icon_name; acc.executables[app.executable] = app.icon_name;
} }
return acc; return acc;
}, },
{ classOrNames: {} as Record<string, string>, executables: {} as Record<string, string> }, { classOrNames: {}, executables: {} },
); );
export function getIconName(app_id: string | null | undefined, title: string | null | undefined) { export function getIconName(client: AstalHyprland.Client) {
if (!app_id && !title) return ""; if (!client) {
// try fields matching Niri outputs
const possibleKeys = [
app_id,
title
].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
const cacheKey = app_id ?? title ?? k;
app_icons.classOrNames[cacheKey] = icon;
return icon;
}
}
// 2) fuzzy match: see if any stored key includes any of the client strings (title, name, etc.)
for (const s of possibleKeys) {
const matchKey = Object.keys(app_icons.classOrNames).find((key) => key.includes(s));
if (matchKey) {
const icon = app_icons.classOrNames[matchKey];
const cacheKey = app_id ?? title ?? s;
app_icons.classOrNames[cacheKey] = icon;
return icon;
}
}
// nothing found — cache empty string so we don't repeat work
const cacheKey = app_id ?? title ?? "";
if (cacheKey) app_icons.classOrNames[cacheKey] = "";
return ""; return "";
}
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;
}
}
if (!icon) {
app_icons.classOrNames[client.class] = "";
}
return icon;
} }

View File

@ -16,12 +16,12 @@
}: let }: let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
extraPackages = with ags.packages.${pkgs.stdenv.hostPlatform.system}; [ extraPackages = with ags.packages.${pkgs.system}; [
pkgs.gtksourceview pkgs.gtksourceview
pkgs.accountsservice pkgs.accountsservice
battery battery
# hyprland hyprland
tray tray
powerprofiles powerprofiles
wireplumber wireplumber

View File

@ -1,4 +1,6 @@
{pkgs, ...}: { { pkgs, ... }:
{
programs.alacritty = { programs.alacritty = {
enable = true; enable = true;
settings = { settings = {
@ -38,8 +40,27 @@
}; };
}; };
font = { font = {
size = pkgs.lib.mkDefault 13; size = pkgs.lib.mkDefault 15;
normal.family = "DejaVu Sans Mono"; 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 = [ keyboard.bindings = [
{ {

View File

@ -1,9 +1,6 @@
{ config, inputs, pkgs, ... }:
{ {
config,
inputs,
pkgs,
...
}: {
programs.starship = { programs.starship = {
enable = true; enable = true;
enableBashIntegration = true; enableBashIntegration = true;

View File

@ -1,23 +1,22 @@
{ config, pkgs, ... }:
{ {
config,
pkgs,
...
}: {
home.file = { home.file = {
".mailcap".text = "text/html; w3m -dump -o -document_charset=%{charset} %s; nametemplate=%s.html; copiousoutput"; ".mailcap".text =
"text/html; w3m -dump -o -document_charset=%{charset} %s; nametemplate=%s.html; copiousoutput";
}; };
home.packages = with pkgs; [mailcap]; home.packages = with pkgs; [ mailcap ];
programs.notmuch = { programs.notmuch = {
enable = true; enable = true;
extraConfig = { extraConfig = {
database = {path = "/home/server/Storage/Thomas/Mail";}; database = { path = "/home/server/Storage/Thomas/Mail"; };
user = { user = {
name = "Thomas Avé"; name = "Thomas Avé";
primary_email = "email@thomasave.be"; primary_email = "email@thomasave.be";
other_email = "Thomas.Ave@uantwerpen.be;Thomas.Ave@imec.be;"; other_email = "Thomas.Ave@uantwerpen.be;Thomas.Ave@imec.be;";
}; };
maildir = {synchronize_flags = "true";}; maildir = { synchronize_flags = "true"; };
}; };
}; };
programs.aerc = { programs.aerc = {
@ -178,11 +177,13 @@
dirlist-tree = true; dirlist-tree = true;
}; };
viewer = { viewer = {
pager = "${pkgs.neovim}/bin/nvim -u ${config.xdg.configHome}/nvim/aerc.lua"; pager =
"${pkgs.neovim}/bin/nvim -u ${config.xdg.configHome}/nvim/aerc.lua";
}; };
compose = {address-book-cmd = ''notmuch address "%s"'';}; compose = { address-book-cmd = ''notmuch address "%s"''; };
multipart-converters = { multipart-converters = {
"text/html" = "${pkgs.w3m}/bin/w3m -dump -o display_link_number=1 -T text/html"; "text/html" =
"${pkgs.w3m}/bin/w3m -dump -o display_link_number=1 -T text/html";
}; };
filters = { filters = {
"text/plain" = "cat"; "text/plain" = "cat";
@ -197,17 +198,22 @@
Zoho = { Zoho = {
outgoing = "smtps://email%40thomasave.be@smtp.zoho.com"; outgoing = "smtps://email%40thomasave.be@smtp.zoho.com";
outgoing-cred-cmd = "cat ~/.secrets/Aerc/Zoho.key"; outgoing-cred-cmd = "cat ~/.secrets/Aerc/Zoho.key";
source = "maildir:///home/server/Storage/Thomas/Mail/email@thomasave.be/"; source =
check-mail-cmd = "ssh server@10.1 /home/server/Containers/mbsync/sync.sh"; "maildir:///home/server/Storage/Thomas/Mail/email@thomasave.be/";
check-mail-cmd =
"ssh server@10.1 /home/server/Containers/mbsync/sync.sh";
check-mail-timeout = "60s"; check-mail-timeout = "60s";
default = "Inbox"; default = "Inbox";
from = ''"Thomas Avé" <email@thomasave.be>''; from = ''"Thomas Avé" <email@thomasave.be>'';
cache-headers = true; cache-headers = true;
}; };
UAntwerpen = { UAntwerpen = {
outgoing = "ssh server@192.168.1.2 /home/server/Containers/mbsync/send.sh"; outgoing =
source = "maildir:///home/server/Storage/Thomas/Mail/Thomas.Ave@uantwerpen.be"; "ssh server@192.168.1.2 /home/server/Containers/mbsync/send.sh";
check-mail-cmd = "ssh server@10.1 /home/server/Containers/mbsync/sync.sh"; source =
"maildir:///home/server/Storage/Thomas/Mail/Thomas.Ave@uantwerpen.be";
check-mail-cmd =
"ssh server@10.1 /home/server/Containers/mbsync/sync.sh";
check-mail-timeout = "60s"; check-mail-timeout = "60s";
default = "Inbox"; default = "Inbox";
from = ''"Thomas Avé" <Thomas.Ave@uantwerpen.be>''; from = ''"Thomas Avé" <Thomas.Ave@uantwerpen.be>'';
@ -216,8 +222,10 @@
IMEC = { IMEC = {
outgoing = "smtp+insecure://ave57%40imec.be@smtp.thomasave.be:1025"; outgoing = "smtp+insecure://ave57%40imec.be@smtp.thomasave.be:1025";
outgoing-cred-cmd = "cat ~/.secrets/Aerc/IMEC.key"; outgoing-cred-cmd = "cat ~/.secrets/Aerc/IMEC.key";
source = "maildir:///home/server/Storage/Thomas/Mail/Thomas.Ave@imec.be/"; source =
check-mail-cmd = "ssh server@10.1 /home/server/Containers/mbsync/sync.sh"; "maildir:///home/server/Storage/Thomas/Mail/Thomas.Ave@imec.be/";
check-mail-cmd =
"ssh server@10.1 /home/server/Containers/mbsync/sync.sh";
check-mail-timeout = "60s"; check-mail-timeout = "60s";
default = "Inbox"; default = "Inbox";
from = ''"Thomas Avé" <Thomas.Ave@imec.be>''; from = ''"Thomas Avé" <Thomas.Ave@imec.be>'';
@ -225,7 +233,8 @@
}; };
NotMuch = { NotMuch = {
source = "notmuch:///home/server/Storage/Thomas/Mail/"; source = "notmuch:///home/server/Storage/Thomas/Mail/";
check-mail-cmd = "ssh server@10.1 /home/server/Containers/mbsync/sync.sh"; check-mail-cmd =
"ssh server@10.1 /home/server/Containers/mbsync/sync.sh";
check-mail-timeout = "60s"; check-mail-timeout = "60s";
from = ''"Thomas Avé" <Thomas.Ave@uantwerpen.be>''; from = ''"Thomas Avé" <Thomas.Ave@uantwerpen.be>'';
query-map = "${config.xdg.configHome}/aerc/map.conf"; query-map = "${config.xdg.configHome}/aerc/map.conf";
@ -235,7 +244,8 @@
}; };
}; };
home.file."${config.xdg.configHome}/aerc/map.conf".text = "Inbox=tag:inbox and not tag:archived and not tag:deleted"; home.file."${config.xdg.configHome}/aerc/map.conf".text =
"Inbox=tag:inbox and not tag:archived and not tag:deleted";
home.file."${config.xdg.configHome}/aerc/stylesets/catppuccin-mocha".text = '' home.file."${config.xdg.configHome}/aerc/stylesets/catppuccin-mocha".text = ''
*.default=true *.default=true
*.normal=true *.normal=true

View File

@ -1,9 +1,11 @@
{pkgs, ...}: let { pkgs, ... }:
let
lock-false = { lock-false = {
Value = false; Value = false;
Status = "locked"; Status = "locked";
}; };
in { in
{
programs.firefox = { programs.firefox = {
enable = true; enable = true;
package = pkgs.wrapFirefox pkgs.firefox-unwrapped { package = pkgs.wrapFirefox pkgs.firefox-unwrapped {
@ -22,7 +24,8 @@ in {
}; };
ExtensionSettings = { ExtensionSettings = {
"{3e4d2037-d300-4e95-859d-3cba866f46d3}" = { "{3e4d2037-d300-4e95-859d-3cba866f46d3}" = {
install_url = "https://addons.mozilla.org/firefox/downloads/latest/private-internet-access-ext/latest.xpi"; install_url =
"https://addons.mozilla.org/firefox/downloads/latest/private-internet-access-ext/latest.xpi";
installation_mode = "force_installed"; installation_mode = "force_installed";
}; };
"{c7c120ff-2878-4e59-a5a3-cd4d1655bc13}" = { "{c7c120ff-2878-4e59-a5a3-cd4d1655bc13}" = {
@ -47,7 +50,6 @@ in {
Status = "locked"; Status = "locked";
}; };
"privacy.trackingprotection.enabled" = true; "privacy.trackingprotection.enabled" = true;
"media.webrtc.camera.allow-pipewire" = true;
}; };
}; };
}; };
@ -59,7 +61,7 @@ in {
search = { search = {
force = true; force = true;
default = "ddg"; default = "ddg";
order = ["ddg" "google"]; order = [ "ddg" "google" ];
}; };
extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [ extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [
ublock-origin ublock-origin
@ -81,20 +83,20 @@ in {
}; };
}; };
# xdg.mimeApps.defaultApplications = { xdg.mimeApps.defaultApplications = {
# "application/json" = [ "firefox.desktop" ]; "application/json" = [ "firefox.desktop" ];
# "application/x-extension-htm" = [ "firefox.desktop" ]; "application/x-extension-htm" = [ "firefox.desktop" ];
# "application/x-extension-html" = [ "firefox.desktop" ]; "application/x-extension-html" = [ "firefox.desktop" ];
# "application/x-extension-shtml" = [ "firefox.desktop" ]; "application/x-extension-shtml" = [ "firefox.desktop" ];
# "application/x-extension-xhtml" = [ "firefox.desktop" ]; "application/x-extension-xhtml" = [ "firefox.desktop" ];
# "application/x-extension-xht" = [ "firefox.desktop" ]; "application/x-extension-xht" = [ "firefox.desktop" ];
# "application/xhtml+xml" = [ "firefox.desktop" ]; "application/xhtml+xml" = [ "firefox.desktop" ];
# "text/html" = [ "firefox.desktop" ]; "text/html" = [ "firefox.desktop" ];
# "text/xml" = [ "firefox.desktop" ]; "text/xml" = [ "firefox.desktop" ];
# "x-scheme-handler/about" = [ "firefox.desktop" ]; "x-scheme-handler/about" = [ "firefox.desktop" ];
# "x-scheme-handler/ftp" = [ "firefox.desktop" ]; "x-scheme-handler/ftp" = [ "firefox.desktop" ];
# "x-scheme-handler/http" = [ "firefox.desktop" ]; "x-scheme-handler/http" = [ "firefox.desktop" ];
# "x-scheme-handler/unknown" = [ "firefox.desktop" ]; "x-scheme-handler/unknown" = [ "firefox.desktop" ];
# "x-scheme-handler/https" = [ "firefox.desktop" ]; "x-scheme-handler/https" = [ "firefox.desktop" ];
# }; };
} }

View File

@ -1,18 +1,17 @@
{...}: { { ... }:
{
programs.foot = { programs.foot = {
enable = true; enable = true;
server.enable = true; server.enable = true;
settings = { settings = {
main = { main = {
font = "DejaVu Sans Mono:size=13"; font = "Iosevka:size=14:style=Extended:fontfeatures=+ss05";
term = "xterm-256color"; term = "xterm-256color";
line-height = "18";
}; };
tweak = { tweak = {
sixel = "yes"; sixel = "yes";
}; };
scrollback.lines = 100000; colors = {
colors-dark = {
background = "000010"; background = "000010";
foreground = "F8F8F2"; foreground = "F8F8F2";
regular0 = "121212"; regular0 = "121212";

View File

@ -1,5 +1,6 @@
{...}: { { ... }:
programs.ghostty = { {
programs.ghostty= {
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;
installVimSyntax = true; installVimSyntax = true;
@ -38,6 +39,7 @@
font-family = "JetBrains Mono"; font-family = "JetBrains Mono";
window-decoration = false; window-decoration = false;
# adjust-cell-height = "10%"; # adjust-cell-height = "10%";
}; };
}; };
} }

View File

@ -1,32 +1,24 @@
{pkgs, ...}: { { pkgs, ... }:
{
programs.git = { programs.git = {
enable = true; enable = true;
userName = "Thomas Avé";
userEmail = "email@thomasave.be";
lfs.enable = true; lfs.enable = true;
aliases = {
# 1. Update the signing configuration
signing = {
format = "ssh";
key = "/home/user/.secrets/SSH/Aloria/id_ed25519";
signByDefault = true;
};
settings = {
alias = {
s = "status"; s = "status";
a = "add"; a = "add";
}; };
user = { ignores = [
name = "Thomas Avé"; "*.direnv/"
email = "email@thomasave.be"; ".dmypy.json"
}; ];
extraConfig = {
# 2. Tell Git where your allowed_signers file is located
gpg.ssh.allowedSignersFile = "~/.ssh/allowed_signers";
credentials.helper = "store"; credentials.helper = "store";
pull.rebase = false; pull.rebase = false;
push.autoSetupRemove = true; push.autoSetupRemove = true;
branch.autoSetupMerge = true; branch.autoSetupMerge = "simple";
init.defaultBranch = "master"; init.defaultBranch = "master";
diff.noprefix = true; diff.noprefix = true;
color.ui = "auto"; color.ui = "auto";
@ -36,27 +28,13 @@
}; };
rerere.enabled = true; rerere.enabled = true;
}; };
ignores = [
"*.direnv/"
"*.nix/"
"uv.lock"
".dmypy.json"
];
}; };
programs.lazygit = { programs.lazygit = {
enable = true; enable = true;
settings = { settings = {
os = { os = {
editPreset = "nvim"; editPreset = "nvim";
autoStageResolvedConflicts = false;
}; };
}; };
}; };
# 3. Declaratively create the allowed_signers file (Assuming Home Manager)
home.file.".ssh/allowed_signers".text = ''
email@thomasave.be namespaces="git" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBxMq4kubz4wWr4S8xU3GRkPcn6XRS3y7IP+qylN5QAp user@Aloria
'';
} }

View File

@ -1,58 +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.9.4.1/helium-0.9.4.1-x86_64.AppImage";
sha256 = "sha256-N5gdWuxOrIudJx/4nYo4/SKSxakpTFvL4zzByv6Cnug=";
};
})
];
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"];
};
}

View File

@ -1,15 +1,32 @@
{pkgs, ...}: let { inputs, pkgs, ... }:
let
playerctl = "${pkgs.playerctl}/bin/playerctl"; playerctl = "${pkgs.playerctl}/bin/playerctl";
wl-paste = "${pkgs.wl-clipboard}/bin/wl-paste";
nautilus = "${pkgs.nautilus}/bin/nautilus"; nautilus = "${pkgs.nautilus}/bin/nautilus";
gnome-calendar = "${pkgs.gnome-calendar}/bin/gnome-calendar"; gnome-calendar = "${pkgs.gnome-calendar}/bin/gnome-calendar";
wpctl = "${pkgs.wireplumber}/bin/wpctl"; wpctl = "${pkgs.wireplumber}/bin/wpctl";
terminal-name = "foot"; terminal-name = ".kitty-wrapped";
terminal = "${pkgs.foot}/bin/footclient"; terminal = "${pkgs.kitty}/bin/kitty -1";
rofi = "${pkgs.rofi-wayland}/bin/rofi";
jq = "${pkgs.jq}/bin/jq"; 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 # Disable split-monitor-workspaces
workspace_command_prefix = ""; # workspace_command_prefix = "";
hyprland_plugins = []; # hyprland_plugins = [];
launch_terminal = pkgs.writeShellScriptBin "launch_terminal" '' launch_terminal = pkgs.writeShellScriptBin "launch_terminal" ''
function find_leaf_pid(){ function find_leaf_pid(){
@ -64,12 +81,13 @@ in {
services.hyprpaper = { services.hyprpaper = {
enable = true; enable = true;
settings = { settings = {
ipc = "on"; ipc = "off";
splash = false; splash = false;
wallpaper = { preload = [ "${./files/wallpaper.png}" ];
path = "${./files/wallpaper.png}"; wallpaper = [
monitor = ""; # Fill in by host-specific config!
}; # "Display,${./files/wallpaper.png}"
];
}; };
}; };
@ -106,56 +124,40 @@ in {
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
systemd.enable = false; systemd.variables = [ "--all" ];
systemd.enable = true;
systemd.enableXdgAutostart = true;
xwayland.enable = true; xwayland.enable = true;
plugins = [] ++ hyprland_plugins; plugins = [ ] ++ hyprland_plugins;
settings = { settings = {
"$mainMod" = pkgs.lib.mkDefault "SUPER_L"; "$mainMod" = pkgs.lib.mkDefault "SUPER_L";
"$altMod" = pkgs.lib.mkDefault "ALT_L"; "$altMod" = pkgs.lib.mkDefault "ALT_L";
exec-once = [ exec-once = [
"uwsm app -- hyprpaper" "hyprpaper"
"uwsm app -- foot --server" "hyprctl dispatch exec ags run"
"uwsm app -- hyprctl dispatch exec ags run" "${wl-paste} --type text --watch cliphist store"
"uwsm app -- ${pkgs.mate-polkit}/bin/polkit-mate" "${wl-paste} --type image --watch cliphist store"
"${pkgs.mate.mate-polkit}/bin/polkit-mate"
]; ];
env = [ env = [
"WLR_NO_HARDWARE_CURSORS,1" "WLR_NO_HARDWARE_CURSORS,1"
"TERMINAL,${terminal}" "TERMINAL,${terminal}"
"WLR_RENDERER_ALLOW_SOFTWARE,1" "WLR_RENDERER_ALLOW_SOFTWARE,1"
]; ];
debug = {disable_logs = false;}; debug = { disable_logs = false; };
windowrulev2 = [
# UPDATED: New Window Rule Syntax (0.53.0) "float, title:^(rofi)(.*)$"
windowrule = [ "center, title:^(rofi)(.*)$"
"float on, match:title ^(rofi)(.*)$" "noborder, title:^(rofi)(.*)$"
"center on, match:title ^(rofi)(.*)$" "stayfocused, title:^()$,class:^(steam)$"
"border_size 0, match:title ^(rofi)(.*)$" # 'noborder' is replaced by border_size 0 "minsize 1 1, title:^()$,class:^(steam)$"
"stayfocused, title:^()$,class:^(steam)$"
# Combined matches (replaces old multi-rule logic) "bordersize 0, floating:0, onworkspace:w[tv1]"
"stay_focused on, match:title ^()$, match:class ^(steam)$" "rounding 0, floating:0, onworkspace:w[tv1]"
"min_size 1 1, match:title ^()$, match:class ^(steam)$" "bordersize 0, floating:0, onworkspace:f[1]"
"stay_focused on, match:title ^()$, match:class ^(steam)$" "rounding 0, floating:0, onworkspace:f[1]"
"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]"
]; ];
layerrule = [ "noanim,ags_bar_0" "noanim,selection" ];
# 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"
];
general = { general = {
gaps_in = 1; gaps_in = 1;
gaps_out = pkgs.lib.mkDefault 5; gaps_out = pkgs.lib.mkDefault 5;
@ -167,18 +169,18 @@ in {
input = { input = {
kb_layout = "us"; kb_layout = "us";
follow_mouse = 1; 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; numlock_by_default = true;
}; };
binds = {scroll_event_delay = 1;}; binds = { scroll_event_delay = 1; };
xwayland = {force_zero_scaling = true;}; xwayland = { force_zero_scaling = true; };
misc = { misc = {
disable_hyprland_logo = 1; disable_hyprland_logo = 1;
# Removed 'enable_anr_dialog' (deprecated/removed in recent versions) enable_anr_dialog = false;
}; };
decoration = { decoration = {
rounding = 1; rounding = 1;
blur = {enabled = false;}; blur = { enabled = false; };
}; };
animations = { animations = {
enabled = "yes"; enabled = "yes";
@ -196,11 +198,8 @@ in {
preserve_split = "yes"; preserve_split = "yes";
force_split = 2; force_split = 2;
}; };
gesture = [
"3, horizontal, workspace"
];
gestures = { gestures = {
workspace_swipe = "on";
workspace_swipe_invert = false; workspace_swipe_invert = false;
}; };
device = [ device = [
@ -218,7 +217,7 @@ in {
"f[1], gapsout:0, gapsin:0" "f[1], gapsout:0, gapsin:0"
]; ];
bindr = [ bindr = [
"$mainMod, $mainMod, exec, vicinae toggle" "$mainMod, $mainMod, exec, pkill rofi || ${rofi} -show drun"
]; ];
bindm = [ bindm = [
"$mainMod, mouse:272, movewindow" "$mainMod, mouse:272, movewindow"
@ -230,29 +229,30 @@ in {
"$mainMod $altMod, K, resizeactive, 0 -20" "$mainMod $altMod, K, resizeactive, 0 -20"
"$mainMod $altMod, J, resizeactive, 0 20" "$mainMod $altMod, J, resizeactive, 0 20"
]; ];
bind = bind = [
[
"$mainMod, return, exec, ${launch_terminal}/bin/launch_terminal $(hyprctl activewindow -j | ${jq} .pid)" "$mainMod, return, exec, ${launch_terminal}/bin/launch_terminal $(hyprctl activewindow -j | ${jq} .pid)"
"$mainMod SHIFT, return, exec, ${terminal}" "$mainMod SHIFT, return, exec, ${terminal}"
"$mainMod, Q, killactive," "$mainMod, Q, killactive,"
"$mainMod, A, exec, ${nautilus}" "$mainMod, A, exec, ${nautilus}"
"$mainMod, S, exec, LC_TIME=\"en_GB.UTF-8\" ${gnome-calendar}" "$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, M, fullscreen, 1"
"$mainMod, F11, fullscreen" "$mainMod, F11, fullscreen"
"$mainMod, F, togglefloating," "$mainMod, F, togglefloating,"
"$mainMod, SPACE, layoutmsg, togglesplit" "$mainMod, SPACE, togglesplit, # dwindle"
"CONTROL_L ALT_L, L, exec, ${pkgs.hyprlock}/bin/hyprlock" "CONTROL_L ALT_L, L, exec, ${pkgs.hyprlock}/bin/hyprlock"
"$mainMod, C, exec, vicinae vicinae://extensions/vicinae/clipboard/history" ''$mainMod, C, exec, cliphist list | awk '{print $0, "\0icon\x1fcom.github.davidmhewitt.clipped"; }' | ${rofi} -dmenu -display-columns 2 | cliphist decode | wl-copy''
"$mainMod, N, exec, vicinae vicinae://extensions/vicinae/wm/switch-windows" "$mainMod, Y, exec, ${rofi-ykman}/bin/rofi-ykman"
"$mainMod, Escape, exec, vicinae open -q \"Power Management \"" "$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%" ",XF86MonBrightnessUp, exec, ${pkgs.brightnessctl}/bin/brightnessctl set +10%"
",XF86MonBrightnessDown, 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" ",XF86AudioRaiseVolume, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 10%+ --limit 1.0"
",XF86AudioLowerVolume, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 10%-" ",XF86AudioLowerVolume, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 10%-"
",XF86AudioMicMute, exec, ${wpctl} set-mute @DEFAULT_AUDIO_SOURCE@ toggle" ",XF86AudioMicMute, exec, ${wpctl} set-mute @DEFAULT_AUDIO_SOURCE@ toggle"
# ",mouse:273, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 1%+ --limit 1.0" ",mouse_right, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 1%+ --limit 1.0"
# ",mouse:272, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 1%-" ",mouse_left, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 1%-"
",XF86AudioMute, exec, ${wpctl} set-mute @DEFAULT_AUDIO_SINK@ toggle" ",XF86AudioMute, exec, ${wpctl} set-mute @DEFAULT_AUDIO_SINK@ toggle"
",XF86AudioNext, exec, ${playerctl} next" ",XF86AudioNext, exec, ${playerctl} next"
",XF86AudioPrev, exec, ${playerctl} previous" ",XF86AudioPrev, exec, ${playerctl} previous"
@ -281,17 +281,17 @@ in {
"$mainMod SHIFT, TAB, ${workspace_command_prefix}workspace, m-1" "$mainMod SHIFT, TAB, ${workspace_command_prefix}workspace, m-1"
"$mainMod, Caps_Lock, ${workspace_command_prefix}workspace, m+1" "$mainMod, Caps_Lock, ${workspace_command_prefix}workspace, m+1"
"$mainMod SHIFT, Caps_Lock, ${workspace_command_prefix}workspace, m-1" "$mainMod SHIFT, Caps_Lock, ${workspace_command_prefix}workspace, m-1"
] ] ++ (
++ (
# workspaces # workspaces
builtins.concatLists (builtins.genList (x: let # 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)); ws = let c = (x + 1) / 10; in builtins.toString (x + 1 - (c * 10));
in [ in
[
"$mainMod, ${ws}, ${workspace_command_prefix}workspace, ${toString (x + 1)}" "$mainMod, ${ws}, ${workspace_command_prefix}workspace, ${toString (x + 1)}"
"$mainMod SHIFT, ${ws}, ${workspace_command_prefix}movetoworkspace, ${toString (x + 1)}" "$mainMod SHIFT, ${ws}, ${workspace_command_prefix}movetoworkspace, ${toString (x + 1)}"
]) ]) 10));
10)
);
}; };
}; };
} }

View File

@ -1,10 +1,13 @@
{lib, ...}: { { config, pkgs, lib, ... }:
{
programs.kitty = { programs.kitty = {
enable = true; enable = true;
shellIntegration.enableZshIntegration = true; shellIntegration.enableZshIntegration = true;
font = { font = {
name = "'ZedMono Nerd Font' style='Extended Light' features=+ss05"; name = "'ZedMono Nerd Font' style='Extended Light' features=+ss05";
size = lib.mkDefault 13; size = lib.mkDefault 14;
}; };
keybindings = { keybindings = {
"kitty_mod+h" = "kitty_scrollback_nvim"; "kitty_mod+h" = "kitty_scrollback_nvim";
@ -12,11 +15,8 @@
"kitty_mod+enter" = "nop"; "kitty_mod+enter" = "nop";
"kitty_mod+equal" = "change_font_size current +1.0"; "kitty_mod+equal" = "change_font_size current +1.0";
"kitty_mod+minus" = "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 = { settings = {
kitty_mod = "ctrl+alt";
cursor_shape = "block"; cursor_shape = "block";
cursor_beam_thickness = 1; cursor_beam_thickness = 1;
scrollback_lines = 100000; scrollback_lines = 100000;

View File

@ -1,8 +1,6 @@
{ config, pkgs, ... }:
{ {
config,
pkgs,
...
}: {
home.file."${config.xdg.configHome}/lf" = { home.file."${config.xdg.configHome}/lf" = {
source = ./files; source = ./files;
recursive = true; recursive = true;
@ -22,7 +20,7 @@
*.zip) unzip -l "''$1";; *.zip) unzip -l "''$1";;
*.rar) unrar l "''$1";; *.rar) unrar l "''$1";;
*.7z) 7z 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";; *) ${pkgs.highlight}/bin/highlight -O ansi "''$1";;
esac esac
''); '');
@ -44,6 +42,6 @@
}} }}
''; '';
}; };
cmdKeybindings = {q = "quit";}; cmdKeybindings = { q = "quit"; };
}; };
} }

View File

@ -1,11 +1,9 @@
{ config, pkgs, ... }:
{ {
config,
pkgs,
...
}: {
home.file."${config.xdg.configHome}/mpv" = { home.file."${config.xdg.configHome}/mpv" = {
source = ./files; source = ./files;
recursive = true; recursive = true;
}; };
programs.mpv = {enable = true;}; programs.mpv = { enable = true; };
} }

View File

@ -7,8 +7,8 @@ cscale=ewa_lanczossharp
video-sync=display-resample video-sync=display-resample
interpolation interpolation
tscale=oversample tscale=oversample
vo=gpu vo=gpu-next
hwdec=auto gpu-api=opengl
force-window=yes force-window=yes
keep-open=yes keep-open=yes

View File

@ -1,180 +0,0 @@
-- frame-seek.lua
-- Allows seeking to a specific frame number or timestamp
local input = require("mp.input")
local jump_mode = nil -- "frame" or "time"
local relative = false
local minus = false
local fps = 0
function parse_timestamp(input_str)
-- Formats:
-- HH:MM:SS.ms
-- MM:SS.ms
-- SS.ms
-- .ms
-- More than 60 minutes or seconds can be entered - it will seek any amount accurately
-- First try to match HH:MM:SS.ms
local hours, minutes, seconds = input_str:match("^(%d+):(%d+):(%d+%.?%d*)$")
if hours and minutes and seconds then
return tonumber(hours) * 3600 + tonumber(minutes) * 60 + tonumber(seconds)
end
-- Try to match MM:SS.ms
local minutes, seconds = input_str:match("^(%d+):(%d+%.?%d*)$")
if minutes and seconds then
return tonumber(minutes) * 60 + tonumber(seconds)
end
-- Try to match just seconds (with or without decimal)
local seconds = input_str:match("^(%d+%.?%d*)$")
if seconds then
return tonumber(seconds)
end
local milliseconds = input_str:match("^%.(%d+)$")
if milliseconds ~= nil then
return tonumber("0." .. milliseconds)
end
return nil
end
function seek_to_frame(frame_num)
fps = mp.get_property_number("estimated-vf-fps")
if not fps or fps <= 0 then
mp.osd_message("Error: Cannot determine framerate")
return
end
local timestamp = frame_num / fps
seek_to_timestamp(timestamp)
end
function seek_to_timestamp(timestamp)
if minus then timestamp = -timestamp end
local cur_time = mp.get_property_number("time-pos")
if not cur_time then return end
if relative then
if timestamp == 0 then return end
if math.abs(timestamp) < 10 then
mp.commandv("seek", timestamp, "exact")
else
-- Only show OSD if seek >10s
mp.command("seek " .. timestamp .. " exact")
end
else
-- Handle imprecise float
if math.abs(timestamp - cur_time) < 1e-7 then return end
mp.command("seek " .. timestamp .. " absolute+exact")
end
mp.observe_property("time-pos", "number", display_osd_message)
end
function display_osd_message(_, timestamp)
if timestamp == nil then return end
mp.unobserve_property(display_osd_message)
-- Format the display nicely
local hours = math.floor(timestamp / 3600)
local minutes = math.floor((timestamp % 3600) / 60)
local seconds = math.floor(timestamp % 60)
local milliseconds = math.floor((timestamp % 1) * 1000 + 0.5)
local display_time = string.format("%02d:%02d", minutes, seconds)
if hours ~= 0 then
display_time = string.format("%d:", hours) .. display_time
end
if milliseconds ~= 0 or jump_mode == "frame" then
display_time = display_time .. string.format(".%03d", milliseconds)
end
if jump_mode == "frame" and fps and fps > 0 then
local frame_num = math.floor(timestamp * fps + 0.5)
mp.osd_message(string.format("Seeking to frame %d (%s)", frame_num, display_time))
else
mp.osd_message(string.format("Seeking to %s", display_time))
end
end
function jump_submit(input)
if not input or input == "" then
reset()
return
end
-- Handle relative marker
if input:sub(1, 1) == "r" then
relative = true
input = input:sub(2)
end
-- Handle negative input
minus = false
if input:sub(1, 1) == "-" then
minus = true
input = input:sub(2)
end
if jump_mode == "frame" then
local frame_num = tonumber(input)
if frame_num then
seek_to_frame(math.floor(frame_num))
else
mp.osd_message("Invalid frame number")
end
elseif jump_mode == "time" then
local timestamp = parse_timestamp(input)
if timestamp then
seek_to_timestamp(timestamp)
else
mp.osd_message("Invalid timestamp format")
end
end
end
function reset()
jump_mode = nil
relative = false
minus = false
end
function run_script(mode, prompt, relative_flag)
if mp.get_property("path") == nil then return end
reset()
jump_mode = mode
relative = relative_flag
input.get({
prompt = prompt,
submit = jump_submit,
})
end
-- Register key bindings
mp.add_key_binding("ctrl+t", "seek-timestamp", function()
run_script("time", "Seek to time:", false)
end)
mp.add_key_binding("ctrl+T", "seek-frame", function()
run_script("frame", "Seek to frame:", false)
end)
mp.add_key_binding(nil, "seek-timestamp-relative", function()
run_script("time", "Seek forward by time:", true)
end)
mp.add_key_binding(nil, "seek-frame-relative", function()
run_script("frame", "Seek forward by frame:", true)
end)

View File

@ -1,232 +0,0 @@
{pkgs, ...}: let
terminal = "${pkgs.foot}/bin/footclient";
nautilus = "${pkgs.nautilus}/bin/nautilus";
playerctl = "${pkgs.playerctl}/bin/playerctl";
wpctl = "${pkgs.wireplumber}/bin/wpctl";
brightnessctl = "${pkgs.brightnessctl}/bin/brightnessctl";
terminal-name = "foot";
launch_terminal = pkgs.writeShellScriptBin "launch_terminal" ''
function find_leaf_pid(){
local PID
local RET
local NAME
PID=$1
for CHILD_PID in $(pgrep -P "$PID"); do
RET=$(find_leaf_pid "$CHILD_PID")
if [ "$RET" != "" ]; then
PID="$RET"
fi
done
NAME=$(ps -p "$PID" -o comm=)
if [ "$NAME" == "zsh" ]; then
echo "$PID"
elif [ "$NAME" == "ssh" ]; then
echo "$PID"
fi
}
LEAF_PID=$(find_leaf_pid "$1")
if [ "$(ps -p "$LEAF_PID" -o comm=)" == "ssh" ]; then
SSH_COMMAND=$(ps -p "$LEAF_PID" -o args --no-headers)
if [[ "$SSH_COMMAND" == *"waypipe"* ]]; then
CLIENT=$(echo "$SSH_COMMAND" | awk '{ print $5 }')
PREVIOUS_SESSION_ID=$(grep -z "SSH_SESSION_ID" "/proc/$LEAF_PID/environ" | xargs -0 -n 1 | grep -oP "[0-9]*")
SSH_SESSION_ID=$RANDOM
${terminal} -e zsh -c "SSH_SESSION_ID=$SSH_SESSION_ID waypipe ssh -t \"$CLIENT\" env SSH_SESSION_ID=\"$SSH_SESSION_ID\" PREVIOUS_SESSION_ID=\"$PREVIOUS_SESSION_ID\" \"zsh --login\""
else
${terminal} -e zsh -c "ssh -t \"$(echo "$SSH_COMMAND" | awk '{ print $2 }')\""
fi
else # Not an ssh session
if [ "$(ps -p "$1" -o comm=)" == "${terminal-name}" ]; then
CWD=$(readlink -e /proc/"$LEAF_PID"/cwd)
if [ "$CWD" != "" ]; then
${terminal} --working-directory "$CWD"
else
${terminal}
fi
else
${terminal}
fi
fi
'';
in {
# Since native Home Manager doesn't have a programs.niri module yet,
# we generate the KDL configuration file directly.
services.hyprpaper = {
enable = true;
settings = {
ipc = "off";
splash = false;
wallpaper = {
path = "${../hyprland/files/wallpaper.png}";
monitor = "";
};
};
};
programs.hyprlock = {
enable = true;
settings = {
input-field = [
{
size = "200, 50";
position = "0, -80";
monitor = "";
dots_center = true;
fade_on_empty = true;
font_color = "rgb(202, 211, 245)";
inner_color = "rgb(91, 96, 120)";
outer_color = "rgb(24, 25, 38)";
outline_thickness = 3;
placeholder_text = "<span foreground=\"##cad3f5\">Password...</span>";
shadow_passes = 2;
}
];
general = {
no_fade_in = false;
};
background = [
{
path = "screenshot";
blur_passes = 3;
blur_size = 8;
}
];
};
};
xdg.configFile."niri/config.kdl".text = ''
spawn-at-startup "${pkgs.hyprpaper}/bin/hyprpaper"
spawn-at-startup "foot" "--server"
spawn-at-startup "ags" "run"
spawn-at-startup "${pkgs.mate-polkit}/bin/polkit-mate"
prefer-no-csd
hotkey-overlay {
skip-at-startup
}
gestures {
hot-corners {
off
}
}
layout {
gaps 5
border {
off
}
focus-ring {
width 4
active-color "rgba(0, 47, 95, 238)"
inactive-color "rgba(255, 255, 255, 0)"
}
}
input {
touchpad {
tap
}
keyboard {
xkb {
options "compose:rctrl"
}
}
focus-follows-mouse max-scroll-amount="10%"
warp-mouse-to-focus
}
output "eDP-1" {
scale 1.2
}
window-rule {
match app-id="vicinae"
open-floating true
}
binds {
// General Binds
Mod+Return { spawn "sh" "-c" "${launch_terminal}/bin/launch_terminal $(niri msg --json focused-window | ${pkgs.jq}/bin/jq .pid)"; }
Mod+Shift+Return { spawn "${terminal}"; }
Mod+Q { close-window; }
Mod+A { spawn "${nautilus}"; }
Mod+B { spawn "Helium"; }
Mod+M { maximize-column; }
Mod+F {maximize-window-to-edges;}
Mod+Tab { toggle-overview; }
// Vicinae Binds
Mod+C { spawn "vicinae" "vicinae://extensions/vicinae/clipboard/history"; }
Mod+N { spawn "vicinae" "vicinae://extensions/vicinae/wm/switch-windows"; }
Mod+Escape { spawn "vicinae" "open" "-q" "Power Management "; }
Mod+Space { spawn "vicinae" "toggle"; }
Mod+Comma { consume-or-expel-window-left; }
Mod+Period { consume-or-expel-window-right; }
Mod+Alt+H { set-column-width "-5%"; }
Mod+Alt+L { set-column-width "+5%"; }
Mod+Alt+K { set-window-height "-5%"; }
Mod+Alt+J { set-window-height "+5%"; }
// Movement
Mod+H { focus-column-left; }
Mod+J { focus-window-down; }
Mod+K { focus-window-up; }
Mod+L { focus-column-right; }
Mod+Shift+H { move-column-left; }
Mod+Shift+L { move-column-right; }
Mod+Shift+J { move-window-down; }
Mod+Shift+K { move-window-up; }
// Workspaces
Mod+Shift+U { move-column-to-workspace-down; }
Mod+Shift+I { move-column-to-workspace-up; }
Mod+I { focus-workspace-up; }
Mod+U { focus-workspace-down; }
Mod+1 { focus-workspace 1; }
Mod+2 { focus-workspace 2; }
Mod+3 { focus-workspace 3; }
Mod+4 { focus-workspace 4; }
Mod+5 { focus-workspace 5; }
Mod+6 { focus-workspace 6; }
Mod+7 { focus-workspace 7; }
Mod+8 { focus-workspace 8; }
Mod+9 { focus-workspace 9; }
// Move to workspace
Mod+Shift+1 { move-column-to-workspace 1; }
Mod+Shift+2 { move-column-to-workspace 2; }
Mod+Shift+3 { move-column-to-workspace 3; }
Mod+Shift+4 { move-column-to-workspace 4; }
Mod+Shift+5 { move-column-to-workspace 5; }
Mod+Shift+6 { move-column-to-workspace 6; }
Mod+Shift+7 { move-column-to-workspace 7; }
Mod+Shift+8 { move-column-to-workspace 8; }
Mod+Shift+9 { move-column-to-workspace 9; }
Print { screenshot; }
Ctrl+Alt+L {spawn "${pkgs.hyprlock}/bin/hyprlock"; }
XF86MonBrightnessUp { spawn "${brightnessctl}" "set" "+10%"; }
XF86MonBrightnessDown { spawn "${brightnessctl}" "set" "10%-"; }
// Volume
XF86AudioRaiseVolume { spawn "${wpctl}" "set-volume" "@DEFAULT_AUDIO_SINK@" "10%+" "--limit" "1.0"; }
XF86AudioLowerVolume { spawn "${wpctl}" "set-volume" "@DEFAULT_AUDIO_SINK@" "10%-"; }
XF86AudioMute { spawn "${wpctl}" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"; }
XF86AudioMicMute { spawn "${wpctl}" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"; }
// Media
XF86AudioNext { spawn "${playerctl}" "next"; }
XF86AudioPrev { spawn "${playerctl}" "previous"; }
Mod+XF86AudioMute { spawn "${playerctl}" "play-pause"; }
Mod+XF86AudioRaiseVolume { spawn "${playerctl}" "next"; }
Mod+XF86AudioLowerVolume { spawn "${playerctl}" "previous"; }
}
'';
}

View File

@ -1,12 +1,9 @@
{ config, pkgs, ... }:
{ {
config,
pkgs,
...
}: {
home.packages = with pkgs; [ home.packages = with pkgs; [
# codeium # codeium
nixd nixd
alejandra
clang-tools clang-tools
llvmPackages.libcxxClang llvmPackages.libcxxClang
go go
@ -31,7 +28,7 @@
yaml-language-server yaml-language-server
bash-language-server bash-language-server
docker-compose-language-service docker-compose-language-service
dockerfile-language-server dockerfile-language-server-nodejs
lua-language-server lua-language-server
rust-analyzer rust-analyzer
gopls gopls

View File

@ -1,6 +1,6 @@
vim.keymap.set("i", "jj", "<Esc>", {}) vim.keymap.set("i", "jj", "<Esc>", {})
vim.keymap.set({ "n", "v" }, "k", "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true }) vim.keymap.set({ "n", "v" }, "k", "v:count == 0 ? 'gk' : 'k'", { expr = true })
vim.keymap.set({ "n", "v" }, "j", "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true }) vim.keymap.set({ "n", "v" }, "j", "v:count == 0 ? 'gj' : 'j'", { expr = true })
vim.keymap.set("n", "<S-k>", "<Nop>", {}) vim.keymap.set("n", "<S-k>", "<Nop>", {})
vim.keymap.set("t", "jj", "<C-\\><C-n>", { noremap = true, silent = true }) vim.keymap.set("t", "jj", "<C-\\><C-n>", { noremap = true, silent = true })
vim.keymap.set("n", "<Backspace>", ":q<cr>", { noremap = true, silent = true }) vim.keymap.set("n", "<Backspace>", ":q<cr>", { noremap = true, silent = true })
@ -15,16 +15,15 @@ vim.keymap.set("n", "<C-I>", "<C-I>", { noremap = true, silent = true })
vim.keymap.set("n", "n", "nzz", { noremap = true }) vim.keymap.set("n", "n", "nzz", { noremap = true })
vim.keymap.set("n", "N", "Nzz", { noremap = true }) vim.keymap.set("n", "N", "Nzz", { noremap = true })
vim.keymap.set("x", "<leader>p", [["_dP]], { noremap = true }) vim.keymap.set("x", "<leader>p", [["_dP]], { noremap = true })
vim.keymap.set({ "n", "v" }, "<leader>y", [["+y]]) vim.keymap.set({"n", "v"}, "<leader>y", [["+y]])
vim.keymap.set({ "n", "v" }, "<leader>Y", [["+Y]]) vim.keymap.set({"n", "v"}, "<leader>Y", [["+Y]])
vim.keymap.set("n", "<Tab>", "<Nop>", { noremap = true }) vim.keymap.set("n", "<Tab>", "<Nop>", { noremap = true })
vim.keymap.set("n", "<leader><space>", ":noh<cr>", { noremap = true, silent = true }) vim.keymap.set("n", "<leader><space>", ":noh<cr>", { noremap = true, silent = true })
vim.keymap.set("n", "gn", ":n<cr>", { noremap = true, silent = true }) vim.keymap.set("n", "gn", ":n<cr>", { noremap = true, silent = true })
-- vim.keymap.set("n", "gi", ":ClangdSwitchSourceHeader<cr>", { noremap = true, silent = true }) -- vim.keymap.set("n", "gi", ":ClangdSwitchSourceHeader<cr>", { noremap = true, silent = true })
vim.keymap.set("n", "-", function() require("oil").open() end, { desc = "Open parent directory" }) vim.keymap.set("n", "-", function () require("oil").open() end, { desc = "Open parent directory" })
vim.keymap.set("n", "<leader>-", function() require("oil").open() end, { desc = "Open parent directory" }) vim.keymap.set("n", "<leader>-", function () require("oil").open() end, { desc = "Open parent directory" })
vim.keymap.set("n", "<leader>g", function() require("neogit").open({ kind = "replace" }) end, vim.keymap.set("n", "<leader>g", function () require("neogit").open({kind="replace"}) end, { noremap = true, silent = true })
{ noremap = true, silent = true })
vim.keymap.set("x", "<leader>a", "<C-A>", { noremap = true, silent = true }) vim.keymap.set("x", "<leader>a", "<C-A>", { noremap = true, silent = true })
vim.keymap.set("x", "<leader>x", "<C-X>", { noremap = true, silent = true }) vim.keymap.set("x", "<leader>x", "<C-X>", { noremap = true, silent = true })
vim.keymap.set("x", "<leader>ga", "g<C-A>", { noremap = true, silent = true }) vim.keymap.set("x", "<leader>ga", "g<C-A>", { noremap = true, silent = true })

View File

@ -12,14 +12,8 @@ return {
}, },
}, },
filetypes = { filetypes = {
["*"] = true, -- Enable for all filetypes by default markdown = true,
["dap-repl"] = false, tex = true,
["dapui_scopes"] = false,
["dapui_stacks"] = false,
["dapui_watches"] = false,
["dapui_breakpoints"] = false,
["TelescopePrompt"] = false,
["Trouble"] = false,
} }
} }
} }

View File

@ -0,0 +1,60 @@
return {
"yetone/avante.nvim",
event = "VeryLazy",
version = false, -- Set this to "*" to always pull the latest release version, or set it to false to update to the latest code changes.
opts = {
providers = {
copilot = {
model = "claude-3.5-sonnet"
},
ollama = {
model = "llama3.2:1b"
},
copilot_claude_new = {
__inherited_from = "copilot",
model = "claude-3.7-sonnet",
},
copilot_claude_old = {
__inherited_from = "copilot",
model = "claude-3.5-sonnet",
},
copilot_claude_thinking = {
__inherited_from = "copilot",
model = "claude-3.7-sonnet-thought",
},
copilot_o3_mini = {
__inherited_from = "copilot",
model = "o3-mini",
},
copilot_gemini = {
__inherited_from = "copilot",
model = "gemini-2.0-flash-001",
},
},
provider = "copilot",
-- cursor_applying_provider = 'ollama',
behaviour = {
enable_cursor_planning_mode = false, -- enable cursor planning mode!
},
hints = { enabled = false },
},
-- if you want to build from source then do `make BUILD_FROM_SOURCE=true`
build = "nix-shell -p cmake --command make",
-- build = "powershell -ExecutionPolicy Bypass -File Build.ps1 -BuildFromSource false" -- for windows
dependencies = {
"nvim-treesitter/nvim-treesitter",
"stevearc/dressing.nvim",
"nvim-lua/plenary.nvim",
"MunifTanjim/nui.nvim",
--- The below dependencies are optional,
"zbirenbaum/copilot.lua", -- for providers='copilot'
{
-- Make sure to set this up properly if you have lazy=true
'MeanderingProgrammer/render-markdown.nvim',
opts = {
file_types = { "Avante" },
},
ft = { "Avante" },
},
},
}

View File

@ -88,6 +88,7 @@ return {
lazy = false, lazy = false,
config = function(_, opts) config = function(_, opts)
require('blink.cmp').setup(opts) require('blink.cmp').setup(opts)
local lspconfig = require('lspconfig')
local filetypes = { "bibtex", "gitcommit", "markdown", "org", "tex", "restructuredtext", "rsweave", "latex", local filetypes = { "bibtex", "gitcommit", "markdown", "org", "tex", "restructuredtext", "rsweave", "latex",
"quarto", "rmd", "context", "html", "xhtml", "typst", "mail" } "quarto", "rmd", "context", "html", "xhtml", "typst", "mail" }
local lsp_opts = { local lsp_opts = {
@ -195,8 +196,7 @@ return {
} }
for server, config in pairs(lsp_opts.servers) do for server, config in pairs(lsp_opts.servers) do
config.capabilities = require('blink.cmp').get_lsp_capabilities(config.capabilities) config.capabilities = require('blink.cmp').get_lsp_capabilities(config.capabilities)
vim.lsp.enable(server) lspconfig[server].setup(config)
vim.lsp.config(server, config)
end end
vim.diagnostic.config({ vim.diagnostic.config({
virtual_text = false virtual_text = false

View File

@ -3,7 +3,6 @@ return {
opts = { opts = {
formatters_by_ft = { formatters_by_ft = {
python = { 'ruff_format' }, python = { 'ruff_format' },
nix = { 'alejandra' },
}, },
format_on_save = { format_on_save = {
-- These options will be passed to conform.format() -- These options will be passed to conform.format()

View File

@ -9,7 +9,9 @@ return {
}, },
config = function() config = function()
local dap = require "dap" local dap = require "dap"
require('dap.ext.vscode').load_launchjs("launch.json")
-- dap.defaults.fallback.exception_breakpoints = {'raised'} -- dap.defaults.fallback.exception_breakpoints = {'raised'}
local ui = require "dapui" local ui = require "dapui"
require("dapui").setup({ require("dapui").setup({
@ -82,7 +84,7 @@ return {
require('dap').set_breakpoint(vim.fn.input('Breakpoint condition: ')) require('dap').set_breakpoint(vim.fn.input('Breakpoint condition: '))
end, {}) end, {})
vim.api.nvim_create_user_command("DapToggleScopes", function() vim.api.nvim_create_user_command("DapToggleScopes", function()
require("dapui").float_element("scopes", { enter = true, width = 250, height = 50, position = "center" }) require("dapui").float_element("scopes", {enter = true, width=250, height=50, position="center"})
end, {}) end, {})
-- dap.listeners.before.event_terminated.dapui_config = function() -- dap.listeners.before.event_terminated.dapui_config = function()
-- ui.close() -- ui.close()

View File

@ -1,37 +1,68 @@
return { return {
'nvim-treesitter/nvim-treesitter', 'nvim-treesitter/nvim-treesitter',
branch = 'main', dependencies = {
lazy = false, "luckasRanarison/tree-sitter-hyprlang",
config = function() "nvim-treesitter/nvim-treesitter-textobjects",
-- 1. Install Parsers },
require('nvim-treesitter').install({ build = ":TSUpdate",
"typst", "cpp", "c", "lua", "vim", "dockerfile", "python", "java", config = function ()
"cmake", "diff", "gitcommit", "html", "css", "javascript", "json", require("nvim-treesitter.configs").setup({
"rust", "sql", "yaml", "markdown", "markdown_inline", "nix", "bibtex" 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 = {
-- 2. Safe Autocmd for Highlighting & Indent enable = true,
vim.api.nvim_create_autocmd('FileType', { sync_install = true,
callback = function(args) additional_vim_regex_highlighting = false,
-- Get the language associated with the filetype disable = function(lang, buf) -- Disable if file size is too big
local lang = vim.treesitter.language.get_lang(vim.bo[args.buf].filetype) if lang == "ini" or lang == "markdown" then
if not lang then return end return true
end
-- IGNORE specific filetypes or large files
if lang == "ini" then return end
local max_filesize = 2000 * 1024 -- 2MB local max_filesize = 2000 * 1024 -- 2MB
local ok, stats = pcall(vim.uv.fs_stat, vim.api.nvim_buf_get_name(args.buf)) 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 end if ok and stats and stats.size > max_filesize then
return true
-- 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
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, end,
} }

View File

@ -1,13 +1,11 @@
{ config, pkgs, ... }:
{ {
config, home.packages = with pkgs; [ papirus-icon-theme ];
pkgs,
...
}: {
home.packages = with pkgs; [papirus-icon-theme];
programs.rofi = { programs.rofi = {
enable = true; enable = true;
package = pkgs.rofi; package = pkgs.rofi-wayland;
font = "SF Pro Rounded 13"; font = "SF Pro Rounded 13";
extraConfig = { extraConfig = {
show-icons = true; show-icons = true;
@ -15,8 +13,8 @@
kb-cancel = "Super_L+XF86Launch5,Escape"; kb-cancel = "Super_L+XF86Launch5,Escape";
combi-hide-mode-prefix = true; combi-hide-mode-prefix = true;
}; };
theme = let theme =
inherit (config.lib.formats.rasi) mkLiteral; let inherit (config.lib.formats.rasi) mkLiteral;
in { in {
"*" = { "*" = {
background = mkLiteral "#0f111a"; background = mkLiteral "#0f111a";
@ -116,7 +114,7 @@
padding = mkLiteral "10px 10px 10px 10px"; padding = mkLiteral "10px 10px 10px 10px";
}; };
"element-text" = {padding = mkLiteral "20px 0px 0px 10px";}; "element-text" = { padding = mkLiteral "20px 0px 0px 10px"; };
"element selected" = { "element selected" = {
background-color = mkLiteral "@selected"; background-color = mkLiteral "@selected";

View File

@ -56,7 +56,6 @@ echo -e '\n\n\n'
echo "Running git.thomasave.be Backups" echo "Running git.thomasave.be Backups"
borg create -s --progress \ borg create -s --progress \
--exclude /home/server/Containers/git.thomasave.be/gitea/gitea/sessions \ --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/gitea/jwt \
--exclude /home/server/Containers/git.thomasave.be/gitea/ssh \ --exclude /home/server/Containers/git.thomasave.be/gitea/ssh \
10.4.0.1:Storage/Thomas/Borg/Containers/git.thomasave.be::'{hostname}-{now}' \ 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 -e '\n\n\n'
echo "Running Workspace Backups" echo "Running Workspace Backups"
borg create -s --progress \ borg create -s --progress \
--exclude /home/server/Workspace/TrackBox/Resources \
10.4.0.1:Storage/Thomas/Borg/Workspace::'{hostname}-{now}' \ 10.4.0.1:Storage/Thomas/Borg/Workspace::'{hostname}-{now}' \
/home/server/Workspace/ /home/server/Workspace/
borg prune --keep-daily 7 --keep-weekly 4 --keep-monthly -1 --save-space 10.4.0.1:Storage/Thomas/Borg/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 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 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 # # Perpare Cloud Backup #
########################################## ##########################################
@ -172,7 +187,7 @@ ssh vault /home/server/Storage/Thomas/Scripts/Mount/borg_lock.sh
# Backups to Oracle Cloud # # 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 \ borg create -s --progress \
--exclude /home/server/Containers/pw.thomasave.be/data/icon_cache \ --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/git.thomasave.be/gitea/gitea/jwt \
--exclude /home/server/Containers/stats.thomasave.be/logs \ --exclude /home/server/Containers/stats.thomasave.be/logs \
--exclude /home/server/Containers/Caddy/Data\ --exclude /home/server/Containers/Caddy/Data\
--exclude /home/server/Storage/Niels/Backups \
ubuntu@10.0.0.6:~/Backups/Borg::'{hostname}-{now}' \ ubuntu@10.0.0.6:~/Backups/Borg::'{hostname}-{now}' \
/home/server/Containers/pw.thomasave.be\ /home/server/Containers/pw.thomasave.be\
/home/server/Containers/robbertave.com\ /home/server/Containers/robbertave.com\
@ -191,3 +207,4 @@ borg create -s --progress \
/home/server/Containers/Caddy \ /home/server/Containers/Caddy \
/home/server/Containers/cal.thomasave.be\ /home/server/Containers/cal.thomasave.be\
/home/server/Containers/stats.thomasave.be \ /home/server/Containers/stats.thomasave.be \
/home/server/Storage/Niels \

View File

@ -1,12 +1,9 @@
{ inputs, config, pkgs, ... }:
{ {
inputs,
config,
pkgs,
...
}: {
programs.ssh = { programs.ssh = {
enable = true; enable = true;
enableDefaultConfig = false; includes = [ "gpulab_hosts_config" ];
matchBlocks = { matchBlocks = {
"*" = { "*" = {
host = "*"; host = "*";
@ -81,13 +78,6 @@
user = "server"; user = "server";
forwardAgent = true; forwardAgent = true;
}; };
gcp = {
host = "gcp";
hostname = "34.126.140.76";
port = 22;
user = "user";
forwardAgent = true;
};
}; };
}; };
} }

View File

@ -1,4 +1,5 @@
{pkgs, ...}: { { pkgs, ... }:
{
programs.tmux = { programs.tmux = {
shell = "${pkgs.zsh}/bin/zsh"; shell = "${pkgs.zsh}/bin/zsh";
terminal = "screen-256color"; terminal = "screen-256color";

View File

@ -1,19 +1,15 @@
{ inputs, config, pkgs, ... }:
{ {
inputs,
config,
pkgs,
...
}: {
imports = [ imports = [
(import ../zsh {inherit inputs config pkgs;}) (import ../zsh { inherit inputs config pkgs; })
(import ../bash {inherit inputs config pkgs;}) (import ../bash { inherit inputs config pkgs; })
../git ../git
../nvim ../nvim
../email ../email
../lf ../lf
../tmux ../tmux
../yazi ../yazi
../zellij
]; ];
home.stateVersion = "24.11"; home.stateVersion = "24.11";
@ -21,15 +17,16 @@
programs.home-manager.enable = true; programs.home-manager.enable = true;
home.packages = with pkgs; [ home.packages = with pkgs; [
htop htop
ghostscript
waypipe waypipe
tree inputs.worktimer.packages.${pkgs.system}.default
inputs.worktimer.packages.${pkgs.stdenv.hostPlatform.system}.default
usbutils usbutils
gocryptfs
sshfs
ncdu
]; ];
programs.nh = {
enable = true;
clean.enable = true;
flake = "/home/user/.dotfiles";
};
home.sessionVariables = { home.sessionVariables = {
XDG_CONFIG_HOME = "${config.xdg.configHome}"; XDG_CONFIG_HOME = "${config.xdg.configHome}";
XDG_CACHE_HOME = "${config.xdg.cacheHome}"; XDG_CACHE_HOME = "${config.xdg.cacheHome}";
@ -52,4 +49,5 @@
$pdf_mode = 1; $pdf_mode = 1;
$pdf_previewer = 'evince %O %S'; $pdf_previewer = 'evince %O %S';
''; '';
} }

View File

@ -1,39 +1,25 @@
{ inputs, config, pkgs, ... }:
{ {
inputs,
config,
pkgs,
...
}: {
imports = [ imports = [
(import ./common.nix {inherit inputs config pkgs;}) (import ./common.nix { inherit inputs config pkgs; })
(import ./python.nix {inherit inputs config pkgs;}) (import ./python.nix { inherit inputs config pkgs; })
# (import ../hyprland {inherit inputs pkgs;}) (import ../hyprland { inherit inputs pkgs; })
(import ../niri {inherit inputs config pkgs;}) (import ../ags { inherit inputs pkgs; })
(import ../ags {inherit inputs pkgs;})
../rofi ../rofi
../vicinae
../alacritty ../alacritty
../foot ../foot
../kitty ../kitty
../ghostty
../firefox ../firefox
../helium
../ssh ../ssh
../mpv ../mpv
]; ];
home.packages = with pkgs; [ home.packages = with pkgs; [
spotify spotify
(pkgs.symlinkJoin { slack
name = "slack-pipewire";
paths = [pkgs.slack];
buildInputs = [pkgs.makeWrapper];
postBuild = ''
wrapProgram $out/bin/slack \
--add-flags "--enable-features=WebRTCPipeWireCamera"
'';
})
eid-mw eid-mw
onlyoffice-desktopeditors onlyoffice-bin
libreoffice libreoffice
telegram-desktop telegram-desktop
signal-desktop signal-desktop
@ -49,6 +35,8 @@
zip zip
heroic heroic
cmake cmake
jellyfin-media-player
chromium
nmap nmap
arp-scan arp-scan
virt-manager virt-manager
@ -59,7 +47,6 @@
yubioath-flutter yubioath-flutter
obsidian obsidian
nautilus nautilus
appimage-run
]; ];
services.kdeconnect = { services.kdeconnect = {
@ -92,6 +79,8 @@
package = pkgs.adwaita-icon-theme; package = pkgs.adwaita-icon-theme;
}; };
services.cliphist = { enable = true; };
services.mpris-proxy.enable = true; # Bluetooth media control services.mpris-proxy.enable = true; # Bluetooth media control
xdg.mimeApps = { xdg.mimeApps = {
@ -99,7 +88,6 @@
defaultApplications = { defaultApplications = {
"x-scheme-handler/mailto" = "userapp-Thunderbird-7GETV2.desktop"; "x-scheme-handler/mailto" = "userapp-Thunderbird-7GETV2.desktop";
"x-scheme-handler/mid" = "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"; "message/rfc822" = "userapp-Thunderbird-7GETV2.desktop";
"application/pdf" = "org.gnome.Evince.desktop"; "application/pdf" = "org.gnome.Evince.desktop";
"x-scheme-handler/tg" = "org.telegram.desktop.desktop"; "x-scheme-handler/tg" = "org.telegram.desktop.desktop";
@ -112,12 +100,8 @@
"x-scheme-handler/tg" = "org.telegram.desktop.desktop"; "x-scheme-handler/tg" = "org.telegram.desktop.desktop";
"x-scheme-handler/mailto" = "userapp-Thunderbird-7GETV2.desktop"; "x-scheme-handler/mailto" = "userapp-Thunderbird-7GETV2.desktop";
"x-scheme-handler/mid" = "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/jpeg" = "org.gnome.Loupe.desktop";
"image/png" = "org.gnome.Loupe.desktop"; "image/png" = "org.gnome.Loupe.desktop";
}; };
}; };
fonts.fontconfig.enable = true;
gtk.gtk4.theme = config.gtk.theme; # Silence warning
} }

View File

@ -1,4 +1,5 @@
{pkgs}: { { pkgs }:
{
when = "*-*-* *:00:00"; when = "*-*-* *:00:00";
script = toString (pkgs.writeShellScript "script" '' script = toString (pkgs.writeShellScript "script" ''
REPORT_EMAIL=email@thomasave.be REPORT_EMAIL=email@thomasave.be

View File

@ -1,12 +1,9 @@
{ { config, pkgs, fzgo_paths }:
config, let
pkgs,
fzgo_paths,
}: let
mkLink = source_path: file_type: { mkLink = source_path: file_type: {
"${source_path}-${file_type}" = { "${source_path}-${file_type}" = {
source = config.lib.file.mkOutOfStoreSymlink source_path; source = config.lib.file.mkOutOfStoreSymlink source_path;
target = ".config/fzgo/entries/${file_type}/${pkgs.lib.strings.replaceStrings ["/"] ["|"] source_path}"; target = ".config/fzgo/entries/${file_type}/${pkgs.lib.strings.replaceStrings [ "/" ] [ "|" ] source_path}";
}; };
}; };
links = (map (source_path: mkLink source_path "f") fzgo_paths.files) ++ (map (source_path: mkLink source_path "d") fzgo_paths.dirs); links = (map (source_path: mkLink source_path "f") fzgo_paths.files) ++ (map (source_path: mkLink source_path "d") fzgo_paths.dirs);

View File

@ -1,11 +1,11 @@
{pkgs, ...}: let { pkgs, ... }:
let
pythonldlibpath = pkgs.lib.makeLibraryPath (with pkgs; [ pythonldlibpath = pkgs.lib.makeLibraryPath (with pkgs; [
libGL libGL
glib glib
zlib zlib
zstd zstd
stdenv.cc.cc stdenv.cc.cc
stdenv.cc.cc.lib
curl curl
openssl openssl
attr attr
@ -19,22 +19,19 @@
systemd systemd
]); ]);
# Darwin requires a different library path prefix # Darwin requires a different library path prefix
wrapPrefix = wrapPrefix = if (!pkgs.stdenv.isDarwin) then "LD_LIBRARY_PATH" else "DYLD_LIBRARY_PATH";
if (!pkgs.stdenv.isDarwin)
then "LD_LIBRARY_PATH"
else "DYLD_LIBRARY_PATH";
# pythonOverlay = (pkgs.python313.withPackages (ps: [ # pythonOverlay = (pkgs.python313.withPackages (ps: [
# (ps.torch.override { rocmSupport = true; }) # (ps.torch.override { rocmSupport = true; })
# ])); # ]));
patchedpython = pkgs.symlinkJoin { patchedpython = (pkgs.symlinkJoin {
name = "python"; name = "python";
paths = [pkgs.python313]; paths = [ pkgs.python313 ];
buildInputs = [pkgs.makeWrapper]; buildInputs = [ pkgs.makeWrapper ];
postBuild = '' postBuild = ''
wrapProgram "$out/bin/python3.13" --prefix ${wrapPrefix} : "${pythonldlibpath}" wrapProgram "$out/bin/python3.13" --prefix ${wrapPrefix} : "${pythonldlibpath}"
''; '';
}; });
in { in {
home.packages = [ home.packages = [
patchedpython patchedpython

View File

@ -1,11 +1,8 @@
{ { pkgs, scripts }:
pkgs, let
scripts, notify_script = (pkgs.writers.writePython3Bin "telegram-notify.py"
}: let
notify_script =
pkgs.writers.writePython3Bin "telegram-notify.py"
{ {
libraries = [pkgs.python3Packages.python-telegram-bot]; libraries = [ pkgs.python3Packages.python-telegram-bot ];
} '' } ''
import telegram import telegram
import asyncio import asyncio
@ -55,10 +52,10 @@
loop = asyncio.get_event_loop() loop = asyncio.get_event_loop()
loop.run_until_complete(asyncio.wait([loop.create_task(run())])) loop.run_until_complete(asyncio.wait([loop.create_task(run())]))
loop.close() loop.close()
''; '');
mkTimer = name: cfg: { mkTimer = name: cfg: {
Install.WantedBy = ["timers.target"]; Install.WantedBy = [ "timers.target" ];
Timer = { Timer = {
Persistent = true; Persistent = true;
OnCalendar = cfg.when; OnCalendar = cfg.when;
@ -69,11 +66,11 @@
Unit.Description = name; Unit.Description = name;
Unit.OnFailure = "status_notify@${name}.service"; Unit.OnFailure = "status_notify@${name}.service";
# Install = { WantedBy = [ "default.target" ]; }; # Install = { WantedBy = [ "default.target" ]; };
Service = {ExecStart = cfg.script;}; Service = { ExecStart = cfg.script; };
}; };
in { in
systemd.user.services = {
pkgs.lib.mapAttrs mkService scripts systemd.user.services = pkgs.lib.mapAttrs mkService scripts
// (pkgs.lib.mapAttrs mkService { // (pkgs.lib.mapAttrs mkService {
"status_notify@" = { "status_notify@" = {
script = "${notify_script}/bin/telegram-notify.py %i"; script = "${notify_script}/bin/telegram-notify.py %i";

View File

@ -1,17 +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";
};
};
};
}

View File

@ -1,9 +1,5 @@
{ inputs, config, pkgs, ... }:
{ {
inputs,
config,
pkgs,
...
}: {
imports = [inputs.walker.homeManagerModules.walker]; imports = [inputs.walker.homeManagerModules.walker];
programs.walker = { programs.walker = {
enable = true; enable = true;

View File

@ -1,19 +1,17 @@
{ inputs, pkgs, ... }:
{ {
inputs,
pkgs,
...
}: {
programs.waybar = { programs.waybar = {
enable = true; enable = true;
package = inputs.waybar.packages.${pkgs.stdenv.hostPlatform.system}.waybar; package = inputs.waybar.packages.${pkgs.system}.waybar;
settings = { settings = {
mainBar = { mainBar = {
layer = "top"; layer = "top";
height = pkgs.lib.mkDefault 35; height = pkgs.lib.mkDefault 35;
spacing = 4; spacing = 4;
# output = "DP-2"; # Fill in with host-specific config! # output = "DP-2"; # Fill in with host-specific config!
modules-left = ["wlr/taskbar"]; modules-left = [ "wlr/taskbar" ];
modules-center = ["hyprland/workspaces"]; modules-center = [ "hyprland/workspaces" ];
modules-right = [ modules-right = [
"tray" "tray"
"wireplumber" "wireplumber"
@ -35,7 +33,7 @@
format = "{icon} {volume}%"; format = "{icon} {volume}%";
format-muted = ""; format-muted = "";
on-click = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"; on-click = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
format-icons = ["" "" ""]; format-icons = [ "" "" "" ];
}; };
"hyprland/workspaces" = { "hyprland/workspaces" = {
disable-scroll = true; disable-scroll = true;
@ -43,15 +41,15 @@
warp-on-scroll = false; warp-on-scroll = false;
format = "{name}"; format = "{name}";
}; };
"hyprland/window" = {max-length = 50;}; "hyprland/window" = { max-length = 50; };
tray = {spacing = 10;}; tray = { spacing = 10; };
"clock#clock2" = { "clock#clock2" = {
timezone = "Asia/Bangkok"; timezone = "Europe/Brussels";
format = "{:%H:%M:%S}"; format = "{:%H:%M:%S}";
interval = 1; interval = 1;
}; };
clock = { clock = {
timezone = "Asia/Bangkok"; timezone = "Europe/Brussels";
format = "{:%Y-%m-%d}"; format = "{:%Y-%m-%d}";
interval = 3600; interval = 3600;
}; };
@ -80,7 +78,7 @@
}; };
format = "{icon}"; format = "{icon}";
tooltip-format = "{capacity}% ({time})"; tooltip-format = "{capacity}% ({time})";
format-icons = [" " " " " " " " " "]; format-icons = [ " " " " " " " " " " ];
format-charging = "{capacity}% "; format-charging = "{capacity}% ";
format-full = "{capacity}% "; format-full = "{capacity}% ";
format-alt = "{capacity}% {time} [{power:.2} W]"; format-alt = "{capacity}% {time} [{power:.2} W]";

View File

@ -1,67 +1,13 @@
{...}: { { inputs, config, pkgs, ... }:
{
programs.yazi = { programs.yazi = {
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;
shellWrapperName = "y";
settings = { settings = {
mgr = { mgr = {
sort_by = "natural"; 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";
}
];
};
}; };
} }

View File

@ -1,9 +0,0 @@
{config, ...}: {
programs.zellij = {
enable = true;
};
home.file."${config.xdg.configHome}/zellij" = {
source = ./files;
recursive = true;
};
}

View File

@ -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

View File

@ -1,9 +1,6 @@
{ config, inputs, pkgs, ... }:
{ {
config,
inputs,
pkgs,
...
}: {
home.packages = [ home.packages = [
pkgs.fzy pkgs.fzy
pkgs.lf pkgs.lf
@ -15,10 +12,10 @@
pkgs.ripgrep pkgs.ripgrep
pkgs.rsync pkgs.rsync
pkgs.moreutils pkgs.moreutils
inputs.fzgo.packages.${pkgs.stdenv.hostPlatform.system}.default inputs.fzgo.packages.${pkgs.system}.default
]; ];
home.sessionVariables = { home.sessionVariables = {
BROWSER = "Helium"; BROWSER = "firefox";
PDF_VIEWER = "evince"; PDF_VIEWER = "evince";
GPULAB_CERT = "${config.xdg.configHome}/../.secrets/GPULab/certificate.pem"; GPULAB_CERT = "${config.xdg.configHome}/../.secrets/GPULab/certificate.pem";
GPULAB_DEV = "False"; GPULAB_DEV = "False";
@ -52,7 +49,7 @@
)}" )}"
} }
''; '';
programs.fzf = {enable = true;}; programs.fzf = { enable = true; };
programs.zsh = { programs.zsh = {
enable = true; enable = true;
enableCompletion = true; enableCompletion = true;
@ -81,9 +78,6 @@
function o() { function o() {
${pkgs.handlr-regex}/bin/handlr open $@ < /dev/null &> /dev/null & disown ${pkgs.handlr-regex}/bin/handlr open $@ < /dev/null &> /dev/null & disown
} }
precmd() {
print -Pn "\e]133;A\e\\"
}
''; '';
shellAliases = { shellAliases = {

View File

@ -16,5 +16,3 @@ function run_waypipe() {
REMOTE_PATH=$(echo $(pwd) | sed "s|/home/[a-z]*|\$HOME|g") REMOTE_PATH=$(echo $(pwd) | sed "s|/home/[a-z]*|\$HOME|g")
SSH_SESSION_ID=$SSH_SESSION_ID waypipe -n ssh -t $1 env REMOTE_PATH=\"$REMOTE_PATH\" SSH_SESSION_ID=$SSH_SESSION_ID "zsh --login" SSH_SESSION_ID=$SSH_SESSION_ID waypipe -n ssh -t $1 env REMOTE_PATH=\"$REMOTE_PATH\" SSH_SESSION_ID=$SSH_SESSION_ID "zsh --login"
} }
alias s='run_waypipe'

View File

@ -1,17 +1,13 @@
{ { pkgs, lib, inputs, config, ... }:
pkgs, let
lib, serverIP = "10.0.0.1";
inputs,
config,
...
}: let
# serverIP = "10.0.0.1";
in { in {
imports = [ imports = [
(import ../Common/default.nix {inherit inputs pkgs config;}) (import ../Common/default.nix { inherit inputs pkgs config; })
(import ../Common/desktop.nix {inherit inputs pkgs config;}) (import ../Common/desktop.nix { inherit inputs pkgs config; })
# (import ../Common/nfs.nix {inherit pkgs serverIP;}) (import ../Common/nfs.nix { inherit pkgs serverIP; })
(import ../Common/zfs.nix {inherit inputs pkgs config;}) (import ../Common/zfs.nix {inherit inputs pkgs config; })
(import ../Common/android.nix { inherit pkgs; })
]; ];
hardware.graphics.extraPackages = [ hardware.graphics.extraPackages = [
@ -21,48 +17,9 @@ in {
zramSwap.enable = true; zramSwap.enable = true;
services.upower.enable = true; services.upower.enable = true;
services.logind.settings.Login = { services.logind.extraConfig = ''HandlePowerKey=ignore'';
HandlePowerKey = "suspend";
};
services.throttled.enable = true; services.throttled.enable = true;
services.thinkfan.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 = { programs.steam = {
enable = true; enable = true;
@ -71,11 +28,10 @@ in {
networking.hostId = "4e859062"; networking.hostId = "4e859062";
networking.interfaces.wlan0.useDHCP = lib.mkDefault true; networking.interfaces.wlan0.useDHCP = lib.mkDefault true;
networking.enableIPv6 = false;
networking.wireless.iwd.enable = true; networking.wireless.iwd.enable = true;
networking.wireless.iwd.settings = { networking.wireless.iwd.settings = {
IPv6 = { IPv6 = {
Enabled = false; Enabled = true;
}; };
Settings = { Settings = {
AutoConnect = true; AutoConnect = true;
@ -83,7 +39,7 @@ in {
}; };
systemd.services.fprintd = { systemd.services.fprintd = {
wantedBy = ["multi-user.target"]; wantedBy = [ "multi-user.target" ];
serviceConfig.Type = "simple"; serviceConfig.Type = "simple";
}; };
services.fprintd = { services.fprintd = {
@ -96,9 +52,10 @@ in {
# virtualisation # virtualisation
virtualisation.libvirtd.enable = true; virtualisation.libvirtd.enable = true;
virtualisation.libvirtd.qemu.ovmf.enable = true;
virtualisation.spiceUSBRedirection.enable = true; virtualisation.spiceUSBRedirection.enable = true;
programs.virt-manager.enable = true; programs.virt-manager.enable = true;
users.users.user.extraGroups = ["libvirtd"]; users.users.user.extraGroups = [ "libvirtd" ];
services.tlp = { services.tlp = {
enable = true; enable = true;
@ -119,71 +76,36 @@ in {
networking.wg-quick.interfaces = { networking.wg-quick.interfaces = {
Tunnel = { 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"; privateKeyFile = "/home/user/.secrets/Wireguard/Aloria.key";
listenPort = 51820; listenPort = 51820;
autostart = false; autostart = false;
postUp = "resolvectl dns Tunnel 10.0.0.1; resolvectl domain Tunnel ~thomasave.be;"; postUp = "resolvectl dns Tunnel 10.0.0.1; resolvectl domain Tunnel ~thomasave.be;";
dns = ["10.0.0.1"]; dns = ["10.0.0.1"];
peers = [ peers = [{
{
publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c="; publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";
allowedIPs = ["0.0.0.0/0" "::/0"]; allowedIPs = [ "0.0.0.0/0" "::/0" ];
endpoint = "external.thomasave.be:13231"; endpoint = "external.thomasave.be:13231";
persistentKeepalive = 25; persistentKeepalive = 25;
} }];
];
}; };
OPNsense = { 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"; privateKeyFile = "/home/user/.secrets/Wireguard/Aloria.key";
listenPort = 51820; listenPort = 51820;
autostart = true; autostart = true;
postUp = "resolvectl dns OPNsense 10.0.0.1; resolvectl domain OPNsense ~thomasave.be;"; postUp = "resolvectl dns OPNsense 10.0.0.1; resolvectl domain OPNsense ~thomasave.be;";
dns = ["10.0.0.1"]; dns = ["10.0.0.1"];
peers = [ peers = [{
{
publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c="; publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";
allowedIPs = ["10.0.0.1/8" "192.168.1.2/32"]; allowedIPs = [ "10.0.0.1/8" "192.168.1.2/32" ];
endpoint = "external.thomasave.be:13231"; endpoint = "external.thomasave.be:13231";
persistentKeepalive = 25; 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" = { systemd.services."wg-quick-OPNsense" = {
serviceConfig = { serviceConfig = { Restart = "on-failure"; RestartSec = "2s"; };
Restart = "on-failure";
RestartSec = "2s";
};
unitConfig.StartLimitIntervalSec = 0; unitConfig.StartLimitIntervalSec = 0;
}; };
services.usbmuxd.enable = true;
environment.systemPackages = with pkgs; [
libcamera
ifuse
libimobiledevice
scrcpy
v4l-utils
];
boot.kernel.sysctl = {
"net.ipv6.conf.all.disable_ipv6" = 1;
"net.ipv6.conf.default.disable_ipv6" = 1;
"net.ipv6.conf.lo.disable_ipv6" = 1;
};
} }

View File

@ -1,45 +1,35 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{ {
config, imports =
lib, [ (modulesPath + "/installer/scan/not-detected.nix")
pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod"]; boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = []; boot.initrd.kernelModules = [ ];
boot.kernelModules = ["kvm-intel" "v4l2loopback" "intel_vsc" "intel_vsc_csi" "intel_vsc_vbus"]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = with config.boot.kernelPackages; [v4l2loopback tp_smapi ipu6-drivers]; boot.extraModulePackages = [ ];
boot.extraModprobeConfig = ''
options thinkpad_acpi fan_control=1
options v4l2loopback exclusive_caps=1 card_label="Android Virtual Camera"
options v4l2loopback exclusive_caps=1 video_nr=42 card_label="IPU6 Virtual Camera"
'';
# boot.kernelParams = ["ipv6.disable=1"];
fileSystems."/" = { fileSystems."/" =
device = "rpool/root"; { device = "rpool/root";
fsType = "zfs"; fsType = "zfs";
}; };
fileSystems."/home" = { fileSystems."/home" =
device = "rpool/home"; { device = "rpool/home";
fsType = "zfs"; fsType = "zfs";
}; };
fileSystems."/boot" = { fileSystems."/boot" =
device = "/dev/disk/by-uuid/5C58-A909"; { device = "/dev/disk/by-uuid/5C58-A909";
fsType = "vfat"; fsType = "vfat";
options = ["fmask=0022" "dmask=0022"]; options = [ "fmask=0022" "dmask=0022" ];
}; };
swapDevices = []; swapDevices = [ ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's
@ -53,48 +43,20 @@
hardware.trackpoint.enable = lib.mkDefault true; hardware.trackpoint.enable = lib.mkDefault true;
hardware.trackpoint.emulateWheel = lib.mkDefault config.hardware.trackpoint.enable; hardware.trackpoint.emulateWheel = lib.mkDefault config.hardware.trackpoint.enable;
hardware.trackpoint.device = "TPPS/2 Synaptics TrackPoint"; hardware.trackpoint.device = "TPPS/2 Synaptics TrackPoint";
nixpkgs.config.packageOverrides = pkgs: { hardware.ipu6.enable = true;
zfs = pkgs.zfs_unstable; hardware.ipu6.platform = "ipu6ep";
}; # boot.kernelPackages = pkgs.linuxPackages_latest.extend ( self: super: {
boot.kernelPackages = pkgs.linuxPackages_6_19; # ipu6-drivers = super.ipu6-drivers.overrideAttrs (
hardware.firmware = with pkgs; [ # final: previous: rec {
ipu6-camera-bins # src = builtins.fetchGit {
ivsc-firmware # url = "https://github.com/intel/ipu6-drivers.git";
]; # ref = "master";
services.udev.extraRules = '' # rev = "b4ba63df5922150ec14ef7f202b3589896e0301a";
SUBSYSTEM=="intel-ipu6-psys", MODE="0660", GROUP="video" # };
''; # patches = [
systemd.services.ipu6-v4l2-proxy = { # "${src}/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch"
description = "IPU6 Libcamera to V4L2Loopback Proxy"; # ] ;
# wantedBy = ["multi-user.target"]; # }
after = ["systemd-udev-settle.service"]; # );
# } );
serviceConfig = {
ExecStart = let
gstPluginPath = pkgs.lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" (with pkgs.gst_all_1;
[
gstreamer
gst-plugins-base
gst-plugins-good
gst-plugins-bad
]
++ [pkgs.libcamera]);
in ''
${pkgs.gst_all_1.gstreamer}/bin/gst-launch-1.0 \
--gst-plugin-path=${gstPluginPath} \
libcamerasrc \
! video/x-raw \
! vapostproc contrast=1.3 saturation=1.4 brightness=-0.15 \
! video/x-raw,width=1280,height=720 \
! videoconvert \
! gamma gamma=0.7 \
! videoconvert \
! video/x-raw,format=YUY2 \
! v4l2sink device=/dev/video42
'';
Restart = "always";
RestartSec = "3";
};
};
} }

View File

@ -1,18 +1,13 @@
{ { pkgs, lib, inputs, config, nixos-06cb-009a-fingerprint-sensor, ... }:
pkgs, let
lib,
inputs,
config,
nixos-06cb-009a-fingerprint-sensor,
...
}: let
serverIP = "10.0.0.1"; serverIP = "10.0.0.1";
in { in {
imports = [ imports = [
(import ../Common/default.nix {inherit inputs pkgs config;}) (import ../Common/default.nix { inherit inputs pkgs config; })
(import ../Common/desktop.nix {inherit inputs pkgs config;}) (import ../Common/desktop.nix { inherit inputs pkgs config; })
(import ../Common/nfs.nix {inherit pkgs serverIP;}) (import ../Common/nfs.nix { inherit pkgs serverIP; })
(import ../Common/zfs.nix {inherit inputs pkgs config;}) (import ../Common/zfs.nix {inherit inputs pkgs config; })
(import ../Common/android.nix {inherit inputs pkgs config; })
]; ];
hardware.graphics.extraPackages = [ hardware.graphics.extraPackages = [
@ -31,9 +26,7 @@ in {
zramSwap.enable = true; zramSwap.enable = true;
services.upower.enable = true; services.upower.enable = true;
services.thermald.enable = true; services.thermald.enable = true;
services.logind.settings.Login = { services.logind.extraConfig = ''HandlePowerKey=ignore'';
HandlePowerKey = "suspend";
};
services.throttled = { services.throttled = {
enable = true; enable = true;
}; };
@ -47,7 +40,6 @@ in {
}; };
Settings = { Settings = {
AutoConnect = true; AutoConnect = true;
Country = "ES";
}; };
General = { General = {
EnableNetworkConfiguration = true; EnableNetworkConfiguration = true;
@ -65,9 +57,10 @@ in {
# virtualisation # virtualisation
virtualisation.libvirtd.enable = true; virtualisation.libvirtd.enable = true;
virtualisation.libvirtd.qemu.ovmf.enable = true;
virtualisation.spiceUSBRedirection.enable = true; virtualisation.spiceUSBRedirection.enable = true;
programs.virt-manager.enable = true; programs.virt-manager.enable = true;
users.users.user.extraGroups = ["libvirtd"]; users.users.user.extraGroups = [ "libvirtd" ];
services.tlp = { services.tlp = {
enable = true; enable = true;
@ -89,43 +82,36 @@ in {
systemd.services.systemd-networkd-wait-online.enable = lib.mkForce false; systemd.services.systemd-networkd-wait-online.enable = lib.mkForce false;
networking.wg-quick.interfaces = { networking.wg-quick.interfaces = {
Tunnel = { Tunnel = {
address = ["10.0.0.7/24" "2a02:a03f:83ad:2101::7/128"]; address = [ "10.0.0.7/24" "2a02:a03f:83ad:2101::7/128" ];
privateKeyFile = "/home/user/.secrets/Wireguard/Arendia.key"; privateKeyFile = "/home/user/.secrets/Wireguard/Arendia.key";
listenPort = 51820; listenPort = 51820;
autostart = false; autostart = false;
postUp = "resolvectl dns Tunnel 10.0.0.1; resolvectl domain Tunnel ~thomasave.be;"; postUp = "resolvectl dns Tunnel 10.0.0.1; resolvectl domain Tunnel ~thomasave.be;";
dns = ["10.0.0.1"]; dns = ["10.0.0.1"];
peers = [ peers = [{
{
publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c="; publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";
allowedIPs = ["0.0.0.0/0" "::/0"]; allowedIPs = [ "0.0.0.0/0" "::/0" ];
endpoint = "ipv4.thomasave.be:13231"; endpoint = "ipv4.thomasave.be:13231";
persistentKeepalive = 25; persistentKeepalive = 25;
} }];
];
}; };
OPNsense = { OPNsense = {
address = ["10.0.0.7/24" "2a02:a03f:83ad:2101::7/128"]; address = [ "10.0.0.7/24" "2a02:a03f:83ad:2101::7/128" ];
privateKeyFile = "/home/user/.secrets/Wireguard/Arendia.key"; privateKeyFile = "/home/user/.secrets/Wireguard/Arendia.key";
listenPort = 51820; listenPort = 51820;
autostart = true; autostart = true;
postUp = "resolvectl dns OPNsense 10.0.0.1; resolvectl domain OPNsense ~thomasave.be;"; postUp = "resolvectl dns OPNsense 10.0.0.1; resolvectl domain OPNsense ~thomasave.be;";
dns = ["10.0.0.1"]; dns = ["10.0.0.1"];
peers = [ peers = [{
{
publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c="; publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";
allowedIPs = ["10.0.0.1/8" "192.168.1.2/32"]; allowedIPs = [ "10.0.0.1/8" "192.168.1.2/32" ];
endpoint = "ipv4.thomasave.be:13231"; endpoint = "ipv4.thomasave.be:13231";
persistentKeepalive = 25; persistentKeepalive = 25;
} }];
];
}; };
}; };
systemd.services."wg-quick-OPNsense" = { systemd.services."wg-quick-OPNsense" = {
serviceConfig = { serviceConfig = { Restart = "on-failure"; RestartSec = "2s"; };
Restart = "on-failure";
RestartSec = "2s";
};
unitConfig.StartLimitIntervalSec = 0; unitConfig.StartLimitIntervalSec = 0;
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@ -133,5 +119,4 @@ in {
]; ];
fonts.fontDir.enable = true; fonts.fontDir.enable = true;
services.flatpak.enable = true; services.flatpak.enable = true;
boot.kernel.sysctl."net.ipv4.ip_forward" = 1;
} }

View File

@ -1,17 +1,14 @@
{ config, lib, modulesPath, ... }:
{ {
config,
lib,
modulesPath,
...
}: {
imports = [ imports = [
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod"]; boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = []; boot.initrd.kernelModules = [ ];
boot.kernelModules = ["kvm-intel"]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = []; boot.extraModulePackages = [ ];
fileSystems."/" = { fileSystems."/" = {
device = "rpool/root"; device = "rpool/root";
@ -26,10 +23,10 @@
fileSystems."/boot" = { fileSystems."/boot" = {
device = "/dev/disk/by-uuid/12CE-A600"; device = "/dev/disk/by-uuid/12CE-A600";
fsType = "vfat"; fsType = "vfat";
options = ["fmask=0022" "dmask=0022"]; options = [ "fmask=0022" "dmask=0022" ];
}; };
swapDevices = []; swapDevices = [ ];
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
# networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;

105
hosts/Arm/flake.lock Normal file
View File

@ -0,0 +1,105 @@
{
"nodes": {
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
"fzgo",
"nixpkgs"
]
},
"locked": {
"lastModified": 1719994518,
"narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"fzgo": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1722536372,
"narHash": "sha256-kcaCZFYKWlGyyL1y5MQ/3LVNw+5GfW2kSYDixdrDJl0=",
"ref": "refs/heads/master",
"rev": "430ff540f5cedb42cbd9267094d45f275cd480d4",
"revCount": 13,
"type": "git",
"url": "https://git.thomasave.be/thomasave/fzgo.git"
},
"original": {
"type": "git",
"url": "https://git.thomasave.be/thomasave/fzgo.git"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1726222338,
"narHash": "sha256-KuA8ciNR8qCF3dQaCaeh0JWyQUgEwkwDHr/f49Q5/e8=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "503af483e1b328691ea3a434d331995595fb2e3d",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1722421184,
"narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1726062873,
"narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"fzgo": "fzgo",
"home-manager": "home-manager",
"nixpkgs": "nixpkgs_2"
}
}
},
"root": "root",
"version": 7
}

33
hosts/Arm/flake.nix Normal file
View File

@ -0,0 +1,33 @@
{
description = "Home Manager configuration of Arm VPS";
inputs = {
# Specify the source of Home Manager and Nixpkgs.
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
fzgo.url = "git+https://git.thomasave.be/thomasave/fzgo.git";
};
outputs = { nixpkgs, home-manager, ... }@inputs:
let
system = "aarch64-linux";
pkgs = nixpkgs.legacyPackages.${system};
in {
homeConfigurations."ubuntu" = home-manager.lib.homeManagerConfiguration {
inherit pkgs;
# Specify your home configuration modules here, for example,
# the path to your home.nix.
modules = [ ../../home/Arm.nix ];
# Optionally use extraSpecialArgs
# to pass through arguments to home.nix
extraSpecialArgs = {
inherit inputs;
}; # allows access to flake inputs in hm modules
};
};
}

42
hosts/Asturia/default.nix Normal file
View File

@ -0,0 +1,42 @@
{ lib, inputs, config, pkgs, ... }:
let
serverIP = "192.168.1.2";
in {
imports = [
(import ../Common/default.nix { inherit inputs pkgs; })
(import ../Common/nvidia.nix { inherit inputs pkgs config; })
(import ../Common/desktop.nix { inherit inputs pkgs config; })
(import ../Common/nfs.nix { inherit pkgs serverIP; })
];
networking.wg-quick.interfaces = {
wg0 = {
address = [ "10.0.0.8/24" " 2a02:a03f:83ad:2101::8/128" ];
dns = [ "10.0.0.1" "fdc9:281f:04d7:9ee9::1" ];
privateKeyFile = "/home/user/.secrets/Wireguard/Asturia.key";
listenPort = 51820;
peers = [{
publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";
allowedIPs = [ "10.0.0.1/8" ];
endpoint = "192.168.1.1:13231";
}];
};
};
# Programs & Services
programs.gnupg.agent.enable = true;
services.sunshine = {
enable = true;
autoStart = true;
capSysAdmin = true;
openFirewall = true;
};
programs.steam = {
enable = true;
gamescopeSession.enable = true;
};
fileSystems."/mnt/host" = {
device = "host";
fsType = "virtiofs";
};
}

View File

@ -0,0 +1,37 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{
imports =
[ (modulesPath + "/profiles/qemu-guest.nix")
];
boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "usbhid" "sd_mod" "sr_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/721d0462-9488-435e-9690-f13f11557edc";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/CE52-0414";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
};
swapDevices = [ ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true;
# networking.interfaces.enp1s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
}

8
hosts/Common/android.nix Normal file
View File

@ -0,0 +1,8 @@
{ pkgs, ... }:
{
programs.adb.enable = true;
users.users.user.extraGroups = ["adbusers"];
services.udev.packages = [
pkgs.android-udev-rules
];
}

View File

@ -1,4 +1,5 @@
{pkgs, ...}: { { pkgs, ... }:
{
environment.sessionVariables.NIXOS_OZONE_WL = "1"; # hint electron apps to use wayland: environment.sessionVariables.NIXOS_OZONE_WL = "1"; # hint electron apps to use wayland:
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
@ -6,73 +7,14 @@
security.rtkit.enable = true; security.rtkit.enable = true;
programs.zsh.enable = true; programs.zsh.enable = true;
networking.firewall.enable = false; networking.firewall.enable = false;
programs.nix-ld = { programs.nix-ld.enable = true;
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
libx11
libxext
libxfixes
libxdamage
libxcomposite
libxrandr
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
];
};
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.systemd-boot.memtest86.enable = true; boot.loader.systemd-boot.memtest86.enable = true;
boot.loader.systemd-boot.netbootxyz.enable = true; boot.loader.systemd-boot.netbootxyz.enable = true;
boot.loader.timeout = 1; boot.loader.timeout = 1;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
systemd.settings.Manager.DefaultTimeoutStopSec = "10s"; systemd.extraConfig = "DefaultTimeoutStopSec=10s";
systemd.settings.Manager.DefaultTimeoutStartSec = "10s";
systemd.settings.Manager.DefaultTimeoutAbortSec = "10s";
systemd.settings.Manager.DefaultDeviceTimeoutSec = "10s";
systemd.services.systemd-user-sessions.enable = false; systemd.services.systemd-user-sessions.enable = false;
boot.tmp.cleanOnBoot = true; boot.tmp.cleanOnBoot = true;
@ -93,7 +35,7 @@
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
noto-fonts noto-fonts
noto-fonts-cjk-sans noto-fonts-cjk-sans
noto-fonts-color-emoji noto-fonts-emoji
iosevka iosevka
roboto roboto
font-awesome font-awesome
@ -104,7 +46,6 @@
]; ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
android-tools
virtiofsd virtiofsd
wget wget
curl curl
@ -134,8 +75,8 @@
}; };
services.resolved = { services.resolved = {
enable = pkgs.lib.mkDefault true; enable = true;
settings.Resolve.FallbackDNS = ["1.1.1.1" "1.0.0.1"]; 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"];
} }

View File

@ -1,11 +1,6 @@
{ inputs, pkgs, ... }:
{ {
inputs, services.udev.packages = [ pkgs.yubikey-personalization ];
pkgs,
...
}: {
services.udev.packages = [pkgs.yubikey-personalization];
programs.appimage.enable = true;
programs.appimage.binfmt = true;
hardware.graphics = { hardware.graphics = {
enable = true; enable = true;
@ -15,17 +10,14 @@
vulkan-extension-layer vulkan-extension-layer
]; ];
}; };
# programs.hyprland = { programs.hyprland = {
# enable = true; enable = true;
# withUWSM = true; };
# };
programs.niri.enable = true;
services.greetd = { services.greetd = {
enable = pkgs.lib.mkDefault true; enable = pkgs.lib.mkDefault true;
settings = rec { settings = rec {
initial_session = { initial_session = {
# command = "uwsm start hyprland-uwsm.desktop"; command = "Hyprland";
command = "niri-session";
user = "user"; user = "user";
}; };
default_session = initial_session; default_session = initial_session;
@ -50,20 +42,12 @@
services.gnome.sushi.enable = true; services.gnome.sushi.enable = true;
services.pipewire = { services.pipewire = {
wireplumber.enable = true;
enable = true; enable = true;
alsa.enable = true; alsa.enable = true;
alsa.support32Bit = true; alsa.support32Bit = true;
pulse.enable = true; pulse.enable = true;
jack.enable = true; jack.enable = true;
}; };
services.pipewire.wireplumber.extraConfig = {
"99-libcamera" = {
"wireplumber.settings" = {
"camera.use-libcamera" = true;
};
};
};
hardware.bluetooth = { hardware.bluetooth = {
enable = true; enable = true;

View File

@ -1,8 +1,6 @@
{ {pkgs, serverIP, ...}:
pkgs,
serverIP, let
...
}: let
sharePath = "/home/server"; sharePath = "/home/server";
mountPath = "/home/server"; mountPath = "/home/server";
common_options = [ common_options = [
@ -11,7 +9,7 @@
"soft" "soft"
"bg" "bg"
"intr" "intr"
# "x-systemd.automount" "x-systemd.automount"
"x-systemd.idle-timeout=600" "x-systemd.idle-timeout=600"
"x-systemd.device-timeout=2s" "x-systemd.device-timeout=2s"
"x-systemd.mount-timeout=2s" "x-systemd.mount-timeout=2s"
@ -20,29 +18,25 @@
"x-systemd.after=network-online.target" "x-systemd.after=network-online.target"
"x-systemd.requires=network-online.target" "x-systemd.requires=network-online.target"
]; ];
bind_options = bind_options = [
[
"bind" "bind"
"x-systemd.after=${builtins.replaceStrings ["/"] ["-"] mountPath}.mount" "x-systemd.after=${builtins.replaceStrings ["/"] ["-"] mountPath}.mount"
] ] ++ common_options;
++ common_options;
in { in {
services.rpcbind.enable = true; services.rpcbind.enable = true;
boot.supportedFilesystems = ["nfs"]; boot.supportedFilesystems = [ "nfs" ];
fileSystems.${mountPath} = { fileSystems.${mountPath} = {
device = "${serverIP}:${sharePath}"; device = "${serverIP}:${sharePath}";
fsType = "nfs"; fsType = "nfs";
options = options = [
[
"x-systemd.after=wg-quick-Tunnel.service" "x-systemd.after=wg-quick-Tunnel.service"
"x-systemd.after=wg-quick-OPNsense.service" "x-systemd.after=wg-quick-OPNsense.service"
] ] ++ common_options;
++ common_options;
}; };
systemd.services."${builtins.replaceStrings ["/"] ["-"] mountPath}-unmount" = { systemd.services."${builtins.replaceStrings ["/"] ["-"] mountPath}-unmount" = {
description = "Unmount NFS share before shutdown"; description = "Unmount NFS share before shutdown";
wantedBy = ["shutdown.target"]; wantedBy = [ "shutdown.target" ];
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
RemainAfterExit = true; RemainAfterExit = true;
@ -67,4 +61,10 @@ in {
device = "/home/server/Storage/Thomas/Videos"; device = "/home/server/Storage/Thomas/Videos";
options = bind_options; options = bind_options;
}; };
systemd.extraConfig = ''
DefaultTimeoutStartSec=15s
DefaultTimeoutStopSec=15s
DefaultTimeoutAbortSec=15s
DefaultDeviceTimeoutSec=15s
'';
} }

View File

@ -1,9 +1,6 @@
{ pkgs, config, ... }:
{ {
pkgs, services.xserver.videoDrivers = [ "nvidia" ];
config,
...
}: {
services.xserver.videoDrivers = ["nvidia"];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
pciutils pciutils
file file

View File

@ -1,6 +1,7 @@
{...}: { { inputs, config, pkgs, ... }:
boot.initrd.supportedFilesystems = ["zfs"]; {
boot.supportedFilesystems = ["zfs"]; boot.initrd.supportedFilesystems = [ "zfs" ];
boot.supportedFilesystems = [ "zfs" ];
services.zfs.autoScrub.enable = true; services.zfs.autoScrub.enable = true;
services.sanoid = { services.sanoid = {
enable = true; enable = true;
@ -17,17 +18,6 @@
autoprune = true; autoprune = true;
autosnap = true; autosnap = true;
}; };
"rpool/storage" = {
frequently = 8;
yearly = 0;
monthly = 0;
weekly = 0;
daily = 0;
hourly = 0;
frequent_period = 15;
autoprune = true;
autosnap = true;
};
}; };
}; };
} }

163
hosts/Docker/flake.lock Normal file
View File

@ -0,0 +1,163 @@
{
"nodes": {
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
"fzgo",
"nixpkgs"
]
},
"locked": {
"lastModified": 1719994518,
"narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": [
"worktimer",
"nixpkgs"
]
},
"locked": {
"lastModified": 1727826117,
"narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"fzgo": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1737991358,
"narHash": "sha256-Xye+N7I2FMb+GC96xMDjWi/HX5XCoFCz1Ak+KvP9jUQ=",
"ref": "refs/heads/master",
"rev": "a005938761624fd8d3ab7cbb64fe57a40a9b36e9",
"revCount": 14,
"type": "git",
"url": "https://git.thomasave.be/thomasave/fzgo.git"
},
"original": {
"type": "git",
"url": "https://git.thomasave.be/thomasave/fzgo.git"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1743648554,
"narHash": "sha256-23JFd+zd2GamTTdnGuFVeIg8x8C3hLpQJRh/PGTORzo=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "107352dde4ff3c01cb5a0b3fe17f5beef37215bc",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1722421184,
"narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"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_3": {
"locked": {
"lastModified": 1730200266,
"narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"fzgo": "fzgo",
"home-manager": "home-manager",
"nixpkgs": "nixpkgs_2",
"worktimer": "worktimer"
}
},
"worktimer": {
"inputs": {
"flake-parts": "flake-parts_2",
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1739738223,
"narHash": "sha256-p14lbBwGNJilt2J8y6mCg2pSHM9Bs7vbICYoyUy3XMM=",
"ref": "cli",
"rev": "eeae39d050f22edcae63ac8b3afa797dab8955b2",
"revCount": 6,
"type": "git",
"url": "https://git.thomasave.be/thomasave/WorkTimer"
},
"original": {
"ref": "cli",
"type": "git",
"url": "https://git.thomasave.be/thomasave/WorkTimer"
}
}
},
"root": "root",
"version": 7
}

38
hosts/Docker/flake.nix Normal file
View File

@ -0,0 +1,38 @@
{
description = "Home Manager configuration used in Docker";
inputs = {
# Specify the source of Home Manager and Nixpkgs.
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
fzgo.url = "git+https://git.thomasave.be/thomasave/fzgo.git";
worktimer = {
type = "git";
url = "https://git.thomasave.be/thomasave/WorkTimer";
ref = "cli";
};
};
outputs = { nixpkgs, home-manager, ... }@inputs:
let
system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system};
in {
homeConfigurations."user" = home-manager.lib.homeManagerConfiguration {
inherit pkgs;
# Specify your home configuration modules here, for example,
# the path to your home.nix.
modules = [ ../../home/Docker.nix ];
# Optionally use extraSpecialArgs
# to pass through arguments to home.nix
extraSpecialArgs = {
inherit inputs;
}; # allows access to flake inputs in hm modules
};
};
}

View File

@ -1,27 +1,23 @@
{ { lib, inputs, config, pkgs, ... }:
lib, let
inputs,
config,
pkgs,
...
}: let
serverIP = "192.168.1.2"; serverIP = "192.168.1.2";
in { in {
imports = [ imports = [
(import ../Common/default.nix {inherit inputs pkgs;}) (import ../Common/default.nix { inherit inputs pkgs; })
# (import ../Common/nvidia.nix { inherit inputs pkgs config; }) # (import ../Common/nvidia.nix { inherit inputs pkgs config; })
(import ../Common/desktop.nix {inherit inputs pkgs config;}) (import ../Common/desktop.nix { inherit inputs pkgs config; })
(import ../Common/nfs.nix {inherit pkgs serverIP;}) (import ../Common/nfs.nix { inherit pkgs serverIP; })
(import ../Common/android.nix { inherit pkgs; })
]; ];
# Kernel # Kernel
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;
# AMD CPU # AMD CPU
boot.extraModulePackages = [config.boot.kernelPackages.zenpower]; boot.extraModulePackages = [ config.boot.kernelPackages.zenpower ];
boot.kernelModules = ["zenpower amd_pstate=active"]; boot.kernelModules = [ "zenpower amd_pstate=active" ];
boot.kernelParams = ["amd_pstate=active"]; boot.kernelParams = ["amd_pstate=active"];
boot.initrd.kernelModules = ["amdgpu"]; boot.initrd.kernelModules = [ "amdgpu" ];
hardware.graphics.extraPackages = with pkgs; [ hardware.graphics.extraPackages = with pkgs; [
rocmPackages.clr.icd rocmPackages.clr.icd
@ -39,37 +35,34 @@ in {
nixpkgs.config.rocmSupport = true; nixpkgs.config.rocmSupport = true;
services.ollama = { services.ollama = {
enable = true; enable = true;
acceleration = "rocm";
}; };
# nixpkgs.config.cudaSupport = true; # nixpkgs.config.cudaSupport = true;
services.logind.settings.Login = { services.logind.extraConfig = ''HandlePowerKey=suspend'';
HandlePowerKey = "suspend";
};
# Virtualization # Virtualization
virtualisation.libvirtd.enable = true; virtualisation.libvirtd.enable = true;
virtualisation.spiceUSBRedirection.enable = true; virtualisation.spiceUSBRedirection.enable = true;
programs.virt-manager.enable = true; programs.virt-manager.enable = true;
users.users.user.extraGroups = ["libvirtd"]; users.users.user.extraGroups = [ "libvirtd" ];
networking.wg-quick.interfaces = { networking.wg-quick.interfaces = {
wg0 = { wg0 = {
address = ["10.0.0.10/24" " 2a02:a03f:83ad:2101::2/128"]; address = [ "10.0.0.10/24" " 2a02:a03f:83ad:2101::2/128" ];
dns = ["10.0.0.1" "fdc9:281f:04d7:9ee9::1"]; dns = [ "10.0.0.1" "fdc9:281f:04d7:9ee9::1" ];
privateKeyFile = "/home/user/.secrets/Wireguard/Kell.key"; privateKeyFile = "/home/user/.secrets/Wireguard/Kell.key";
listenPort = 51820; listenPort = 51820;
peers = [ peers = [{
{
publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c="; publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";
allowedIPs = ["10.0.0.1/8"]; allowedIPs = [ "10.0.0.1/8" ];
endpoint = "192.168.1.1:13231"; endpoint = "192.168.1.1:13231";
} }];
];
}; };
}; };
networking.bridges = { networking.bridges = {
"br0" = { "br0" = {
interfaces = ["enp5s0"]; interfaces = [ "enp5s0" ];
}; };
}; };
networking.interfaces.br0.useDHCP = lib.mkDefault true; networking.interfaces.br0.useDHCP = lib.mkDefault true;
@ -86,6 +79,7 @@ in {
# }; # };
# }; # };
# Programs & Services # Programs & Services
programs.gnupg.agent.enable = true; programs.gnupg.agent.enable = true;
services.sunshine = { services.sunshine = {
@ -101,7 +95,7 @@ in {
specialisation = { specialisation = {
vfio.configuration = { vfio.configuration = {
boot.blacklistedKernelModules = ["k10temp" "nvidia" "nouveau" "radeon" "amdgpu"]; boot.blacklistedKernelModules = [ "k10temp" "nvidia" "nouveau" "radeon" "amdgpu"];
boot = { boot = {
initrd.kernelModules = [ initrd.kernelModules = [
"kvm-amd" "kvm-amd"
@ -131,7 +125,7 @@ in {
services.greetd.enable = lib.mkForce false; services.greetd.enable = lib.mkForce false;
}; };
vfio-nvidia.configuration = { vfio-nvidia.configuration = {
boot.blacklistedKernelModules = ["k10temp" "nvidia" "nouveau"]; boot.blacklistedKernelModules = [ "k10temp" "nvidia" "nouveau" ];
boot = { boot = {
initrd.kernelModules = [ initrd.kernelModules = [
"kvm-amd" "kvm-amd"
@ -160,10 +154,7 @@ in {
hardware.sane = { hardware.sane = {
enable = true; enable = true;
extraBackends = [ extraBackends = [
(pkgs.epsonscan2.override { (pkgs.epsonscan2.override { withNonFreePlugins = true; withGui = true; } )
withNonFreePlugins = true;
withGui = true;
})
]; ];
}; };
} }

View File

@ -1,15 +1,12 @@
{ { config, lib, pkgs, modulesPath, ... }:
config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [(modulesPath + "/installer/scan/not-detected.nix")];
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"]; {
boot.kernelModules = ["kvm-amd"]; imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.extraModulePackages = [];
boot.initrd.availableKernelModules =
[ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
fileSystems."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/daf843cd-8e63-48ed-831a-e055929e86cb"; device = "/dev/disk/by-uuid/daf843cd-8e63-48ed-831a-e055929e86cb";
@ -19,10 +16,10 @@
fileSystems."/boot" = { fileSystems."/boot" = {
device = "/dev/disk/by-uuid/E1D9-7A48"; device = "/dev/disk/by-uuid/E1D9-7A48";
fsType = "vfat"; fsType = "vfat";
options = ["fmask=0077" "dmask=0077"]; options = [ "fmask=0077" "dmask=0077" ];
}; };
swapDevices = []; swapDevices = [ ];
networking.useDHCP = lib.mkDefault false; networking.useDHCP = lib.mkDefault false;

163
hosts/Mallorea/flake.lock Normal file
View File

@ -0,0 +1,163 @@
{
"nodes": {
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
"fzgo",
"nixpkgs"
]
},
"locked": {
"lastModified": 1719994518,
"narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": [
"worktimer",
"nixpkgs"
]
},
"locked": {
"lastModified": 1727826117,
"narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"fzgo": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1737991358,
"narHash": "sha256-Xye+N7I2FMb+GC96xMDjWi/HX5XCoFCz1Ak+KvP9jUQ=",
"ref": "refs/heads/master",
"rev": "a005938761624fd8d3ab7cbb64fe57a40a9b36e9",
"revCount": 14,
"type": "git",
"url": "https://git.thomasave.be/thomasave/fzgo.git"
},
"original": {
"type": "git",
"url": "https://git.thomasave.be/thomasave/fzgo.git"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1740208222,
"narHash": "sha256-FqgPcK5BK+Mc4cGBCGz555UsVd/TQK9FvmuamBWu+ZY=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "f4a07823a298deff0efb0db30f9318511de7c232",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1722421184,
"narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1739866667,
"narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1730200266,
"narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"fzgo": "fzgo",
"home-manager": "home-manager",
"nixpkgs": "nixpkgs_2",
"worktimer": "worktimer"
}
},
"worktimer": {
"inputs": {
"flake-parts": "flake-parts_2",
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1739738223,
"narHash": "sha256-p14lbBwGNJilt2J8y6mCg2pSHM9Bs7vbICYoyUy3XMM=",
"ref": "cli",
"rev": "eeae39d050f22edcae63ac8b3afa797dab8955b2",
"revCount": 6,
"type": "git",
"url": "https://git.thomasave.be/thomasave/WorkTimer"
},
"original": {
"ref": "cli",
"type": "git",
"url": "https://git.thomasave.be/thomasave/WorkTimer"
}
}
},
"root": "root",
"version": 7
}

38
hosts/Mallorea/flake.nix Normal file
View File

@ -0,0 +1,38 @@
{
description = "Home Manager configuration of server";
inputs = {
# Specify the source of Home Manager and Nixpkgs.
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
fzgo.url = "git+https://git.thomasave.be/thomasave/fzgo.git";
worktimer = {
type = "git";
url = "https://git.thomasave.be/thomasave/WorkTimer";
ref = "cli";
};
};
outputs = { nixpkgs, home-manager, ... }@inputs:
let
system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system};
in {
homeConfigurations."server" = home-manager.lib.homeManagerConfiguration {
inherit pkgs;
# Specify your home configuration modules here, for example,
# the path to your home.nix.
modules = [ ../../home/Mallorea.nix ];
# Optionally use extraSpecialArgs
# to pass through arguments to home.nix
extraSpecialArgs = {
inherit inputs;
}; # allows access to flake inputs in hm modules
};
};
}

105
hosts/Pi/flake.lock Normal file
View File

@ -0,0 +1,105 @@
{
"nodes": {
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
"fzgo",
"nixpkgs"
]
},
"locked": {
"lastModified": 1719994518,
"narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"fzgo": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1722536372,
"narHash": "sha256-kcaCZFYKWlGyyL1y5MQ/3LVNw+5GfW2kSYDixdrDJl0=",
"ref": "refs/heads/master",
"rev": "430ff540f5cedb42cbd9267094d45f275cd480d4",
"revCount": 13,
"type": "git",
"url": "https://git.thomasave.be/thomasave/fzgo.git"
},
"original": {
"type": "git",
"url": "https://git.thomasave.be/thomasave/fzgo.git"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1726222338,
"narHash": "sha256-KuA8ciNR8qCF3dQaCaeh0JWyQUgEwkwDHr/f49Q5/e8=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "503af483e1b328691ea3a434d331995595fb2e3d",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1722421184,
"narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1726062873,
"narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"fzgo": "fzgo",
"home-manager": "home-manager",
"nixpkgs": "nixpkgs_2"
}
}
},
"root": "root",
"version": 7
}

33
hosts/Pi/flake.nix Normal file
View File

@ -0,0 +1,33 @@
{
description = "Home Manager configuration of Pi";
inputs = {
# Specify the source of Home Manager and Nixpkgs.
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
fzgo.url = "git+https://git.thomasave.be/thomasave/fzgo.git";
};
outputs = { nixpkgs, home-manager, ... }@inputs:
let
system = "aarch64-linux";
pkgs = nixpkgs.legacyPackages.${system};
in {
homeConfigurations."user" = home-manager.lib.homeManagerConfiguration {
inherit pkgs;
# Specify your home configuration modules here, for example,
# the path to your home.nix.
modules = [ ../../home/Pi.nix ];
# Optionally use extraSpecialArgs
# to pass through arguments to home.nix
extraSpecialArgs = {
inherit inputs;
}; # allows access to flake inputs in hm modules
};
};
}

View File

@ -1,39 +1,36 @@
{ inputs, config, pkgs, ... }:
{ {
inputs,
config,
pkgs,
...
}: {
imports = [ imports = [
(import ../Common/default.nix {inherit inputs config pkgs;}) (import ../Common/default.nix { inherit inputs config pkgs; })
(import ../Common/nvidia.nix {inherit pkgs config;}) (import ../Common/desktop.nix { inherit inputs pkgs config; })
# (import ../Common/desktop.nix { inherit inputs pkgs config; }) (import ../Common/nvidia.nix { inherit pkgs config; })
]; ];
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;
services.ollama = {
enable = true;
};
# services.sunshine = { services.sunshine = {
# enable = true; enable = true;
# autoStart = false; autoStart = false;
# capSysAdmin = true; capSysAdmin = true;
# openFirewall = true; openFirewall = true;
# }; };
boot.kernelParams = ["mitigations=off"]; boot.kernelParams = ["mitigations=off"];
zramSwap.enable = true; zramSwap.enable = true;
networking.wg-quick.interfaces = { networking.wg-quick.interfaces = {
wg0 = { wg0 = {
address = ["10.0.0.12/24"]; address = [ "10.0.0.12/24" ];
privateKeyFile = "/home/user/.secrets/Wireguard/Riva.key"; privateKeyFile = "/home/user/.secrets/Wireguard/Riva.key";
listenPort = 51820; listenPort = 51820;
peers = [ peers = [{
{
publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c="; publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";
allowedIPs = ["10.0.0.1/8"]; allowedIPs = [ "10.0.0.1/8" ];
endpoint = "192.168.1.1:13231"; endpoint = "192.168.1.1:13231";
} }];
];
}; };
}; };
fileSystems."/home/server/Workspace" = { fileSystems."/home/server/Workspace" = {
@ -48,12 +45,4 @@
device = "/home/server/Workspace"; device = "/home/server/Workspace";
options = ["bind"]; options = ["bind"];
}; };
services.resolved = {
enable = false;
};
networking.nameservers = ["192.168.1.2"];
programs.steam = {
enable = true;
gamescopeSession.enable = true;
};
} }

View File

@ -1,19 +1,16 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ { config, lib, pkgs, modulesPath, ... }:
config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [(modulesPath + "/profiles/qemu-guest.nix")];
boot.initrd.availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk"]; {
boot.initrd.kernelModules = []; imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
boot.kernelModules = ["kvm-amd"];
boot.extraModulePackages = []; boot.initrd.availableKernelModules =
[ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
fileSystems."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/563963bd-8e27-4c9c-a1d6-d204ea7c43ff"; device = "/dev/disk/by-uuid/563963bd-8e27-4c9c-a1d6-d204ea7c43ff";
@ -23,10 +20,10 @@
fileSystems."/boot" = { fileSystems."/boot" = {
device = "/dev/disk/by-uuid/9F3C-9F3B"; device = "/dev/disk/by-uuid/9F3C-9F3B";
fsType = "vfat"; fsType = "vfat";
options = ["fmask=0077" "dmask=0077"]; options = [ "fmask=0077" "dmask=0077" ];
}; };
swapDevices = []; swapDevices = [ ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's

105
hosts/Tolnedra/flake.lock Normal file
View File

@ -0,0 +1,105 @@
{
"nodes": {
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
"fzgo",
"nixpkgs"
]
},
"locked": {
"lastModified": 1719994518,
"narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"fzgo": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1722536372,
"narHash": "sha256-kcaCZFYKWlGyyL1y5MQ/3LVNw+5GfW2kSYDixdrDJl0=",
"ref": "refs/heads/master",
"rev": "430ff540f5cedb42cbd9267094d45f275cd480d4",
"revCount": 13,
"type": "git",
"url": "https://git.thomasave.be/thomasave/fzgo.git"
},
"original": {
"type": "git",
"url": "https://git.thomasave.be/thomasave/fzgo.git"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1727246346,
"narHash": "sha256-TcUaKtya339Asu+g6KTJ8h7KiKcKXKp2V+At+7tksyY=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "1e22ef1518fb175d762006f9cae7f6312b8caedb",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1722421184,
"narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1726937504,
"narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "9357f4f23713673f310988025d9dc261c20e70c6",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"fzgo": "fzgo",
"home-manager": "home-manager",
"nixpkgs": "nixpkgs_2"
}
}
},
"root": "root",
"version": 7
}

33
hosts/Tolnedra/flake.nix Normal file
View File

@ -0,0 +1,33 @@
{
description = "Home Manager configuration of Tolnedra";
inputs = {
# Specify the source of Home Manager and Nixpkgs.
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
fzgo.url = "git+https://git.thomasave.be/thomasave/fzgo.git";
};
outputs = { nixpkgs, home-manager, ... }@inputs:
let
system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system};
in {
homeConfigurations."user" = home-manager.lib.homeManagerConfiguration {
inherit pkgs;
# Specify your home configuration modules here, for example,
# the path to your home.nix.
modules = [ ../../home/Tolnedra.nix ];
# Optionally use extraSpecialArgs
# to pass through arguments to home.nix
extraSpecialArgs = {
inherit inputs;
}; # allows access to flake inputs in hm modules
};
};
}

105
hosts/Vault/flake.lock Normal file
View File

@ -0,0 +1,105 @@
{
"nodes": {
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
"fzgo",
"nixpkgs"
]
},
"locked": {
"lastModified": 1719994518,
"narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"fzgo": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1722536372,
"narHash": "sha256-kcaCZFYKWlGyyL1y5MQ/3LVNw+5GfW2kSYDixdrDJl0=",
"ref": "refs/heads/master",
"rev": "430ff540f5cedb42cbd9267094d45f275cd480d4",
"revCount": 13,
"type": "git",
"url": "https://git.thomasave.be/thomasave/fzgo.git"
},
"original": {
"type": "git",
"url": "https://git.thomasave.be/thomasave/fzgo.git"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1723986931,
"narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1722421184,
"narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1723991338,
"narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "8a3354191c0d7144db9756a74755672387b702ba",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"fzgo": "fzgo",
"home-manager": "home-manager",
"nixpkgs": "nixpkgs_2"
}
}
},
"root": "root",
"version": 7
}

33
hosts/Vault/flake.nix Normal file
View File

@ -0,0 +1,33 @@
{
description = "Home Manager configuration of vault";
inputs = {
# Specify the source of Home Manager and Nixpkgs.
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
fzgo.url = "git+https://git.thomasave.be/thomasave/fzgo.git";
};
outputs = { nixpkgs, home-manager, ... }@inputs:
let
system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system};
in {
homeConfigurations."server" = home-manager.lib.homeManagerConfiguration {
inherit pkgs;
# Specify your home configuration modules here, for example,
# the path to your home.nix.
modules = [ ../../home/Vault.nix ];
# Optionally use extraSpecialArgs
# to pass through arguments to home.nix
extraSpecialArgs = {
inherit inputs;
}; # allows access to flake inputs in hm modules
};
};
}