Merge branch 'main' into containers

This commit is contained in:
KoenDR06 2026-02-09 14:11:22 +01:00
commit d7812f37c3
22 changed files with 183 additions and 181 deletions

View file

@ -27,6 +27,7 @@ in {
jetbrains.rider
jetbrains.rust-rover
jetbrains.webstorm
libqalculate
mermaid-cli
mono
nodejs_22
@ -35,8 +36,10 @@ in {
quickemu
sqlite
sqlitebrowser
typst
xclip
uv
zed-editor
haskellPackages.ghc
haskellPackages.cabal-install
@ -53,5 +56,10 @@ in {
# QuickEMU USB Support
virtualisation.spiceUSBRedirection.enable = true;
programs.nix-ld.enable = true;
programs.nix-ld.libraries = with pkgs; [
dotnetCorePackages.sdk_9_0
];
};
}

View file

@ -53,7 +53,6 @@ in {
sops
sxiv
termdown
texliveTeTeX
tmux
unzip
wakeonlan

View file

@ -7,6 +7,7 @@ in {
settings = {
theme = "catppuccin_${flavor}";
editor = {
completion-timeout = 5;
clipboard-provider = "wayland";
cursor-shape = {
normal = "block";

View file

@ -2,7 +2,6 @@
inputs,
lib,
config,
pkgs,
...
}: let
inherit (lib) mkEnableOption mkIf;
@ -22,11 +21,6 @@ in {
nix.registry = (lib.mapAttrs (_: flake: {inherit flake;})) ((lib.filterAttrs (_: lib.isType "flake")) inputs);
programs.nix-ld.enable = true;
programs.nix-ld.libraries = with pkgs; [
dotnetCorePackages.sdk_9_0
];
nix.nixPath = ["/etc/nix/path"];
environment.etc =
lib.mapAttrs'

View file

@ -46,6 +46,10 @@ in {
pskRaw = "ext:psk_sticky";
};
"Woestgaafsecure" = {
pskRaw = "ext:psk_sticky";
};
"Utrecht University" = {
authProtocols = ["WPA-EAP"];
auth = ''

View file

@ -5,138 +5,84 @@
}: let
inherit (lib) mkIf;
cfg = config.horseman.wm.hyprland;
easeOut = {
startX = 0.23;
startY = 1.0;
endX = 0.32;
endY = 1.0;
};
easeInOut = {
startX = 0.65;
startY = 0.05;
endX = 0.36;
endY = 1.0;
};
linear = {
startX = 0.0;
startY = 0.0;
endX = 1.0;
endY = 1.0;
};
slowFade = {
startX = 0.4;
startY = 1.0;
endX = 0.4;
endY = 1.0;
};
in {
config = mkIf cfg.enable {
nix-hyprland = {
animations = {
enabled = true;
beziers = [
{
name = "easeOutQuint";
startX = 0.23;
startY = 1.0;
endX = 0.32;
endY = 1.0;
}
{
name = "easeInOutCubic";
startX = 0.65;
startY = 0.05;
endX = 0.36;
endY = 1.0;
}
{
name = "linear";
startX = 0.0;
startY = 0.0;
endX = 1.0;
endY = 1.0;
}
{
name = "almostLinear";
startX = 0.5;
startY = 0.5;
endX = 0.75;
endY = 1.0;
}
{
name = "quick";
startX = 0.15;
startY = 0.0;
endX = 0.1;
endY = 1.0;
}
];
animations = {
global = {
enabled = false;
};
animations = [
{
name = "global";
speed = 10.0;
curve = "default";
}
{
name = "border";
speed = 5.39;
curve = "easeOutQuint";
}
{
name = "windows";
speed = 4.79;
curve = "easeOutQuint";
}
{
name = "windowsIn";
speed = 4.1;
curve = "easeOutQuint";
style = "popin 87%";
}
{
name = "windowsOut";
speed = 1.49;
curve = "linear";
style = "popin 87%";
}
{
name = "fadeIn";
speed = 1.73;
curve = "almostLinear";
}
{
name = "fadeOut";
speed = 1.46;
curve = "almostLinear";
}
{
name = "fade";
speed = 3.03;
curve = "quick";
}
{
name = "layers";
speed = 3.81;
curve = "easeOutQuint";
}
{
name = "layersIn";
speed = 4.0;
curve = "easeOutQuint";
style = "fade";
}
{
name = "layersOut";
border = {
speed = 3;
curve = easeOut;
};
workspaces = {
speed = 3;
curve = easeInOut;
style = "slidefade 5%";
};
specialWorkspace = {
speed = 3;
curve = easeInOut;
style = "slidefadevert 10%";
};
fadeDpms = {
speed = 20;
curve = slowFade;
};
windows = {
speed = 3;
curve = easeOut;
style = "gnomed";
};
layers = {
speed = 1.5;
curve = "linear";
style = "fade";
}
{
name = "fadeLayersIn";
speed = 1.79;
curve = "almostLinear";
}
{
name = "fadeLayersOut";
speed = 1.39;
curve = "almostLinear";
}
{
name = "workspaces";
speed = 1.94;
curve = "almostLinear";
style = "fade";
}
{
name = "workspacesIn";
speed = 1.21;
curve = "almostLinear";
style = "fade";
}
{
name = "workspacesOut";
speed = 1.94;
curve = "almostLinear";
style = "fade";
}
];
curve = slowFade;
style = "popin";
};
fadeLayers = {
speed = 1.5;
curve = linear;
};
fadeOut = {
speed = 10;
curve = linear;
};
};
};
};
};

View file

@ -8,6 +8,9 @@
cfg = config.horseman.wm.hyprland;
colors = config.horseman.catppuccin.colors;
flavor = config.horseman.catppuccin.flavor;
cursorSize = 24;
in {
imports = [
./options.nix
@ -40,9 +43,11 @@ in {
wl-clipboard # Clipboard
fuzzel # Launcher
xdg-desktop-portal-hyprland # XDG Portal (needed but idk why)
catppuccin-cursors."${flavor}Dark" # Cursors
];
horseman.hardware.keyd.enable = true;
horseman.dots.gtk.enable = true;
nix-hyprland = {
enable = true;
@ -53,16 +58,17 @@ in {
"hyprpaper"
"systemctl --user start hyprpolkitagent"
"waybar"
"hyprctl setcursor catppuccin-${flavor}-dark-cursors 24"
];
env = [
{
name = "XCURSOR_SIZE";
value = "24";
value = toString cursorSize;
}
{
name = "HYPRCURSOR_SIZE";
value = "24";
value = toString cursorSize;
}
];
@ -72,7 +78,8 @@ in {
"float, initialTitle:^Picture-in-Picture$"
"center, initialTitle:^Picture-in-Picture$"
"size 33% 33%, initialTitle:^Picture-in-Picture$"
"size 1280 720, initialTitle:^Picture-in-Picture$"
"opacity 1.0 override, initialTitle:^Picture-in-Picture$"
"float, initialClass:CImg"
"float, initialTitle:GLFW"
@ -141,6 +148,8 @@ in {
sensitivity = 0.0;
touchpad.naturalScroll = true;
numlockByDefault = true;
touchpad.disableWhileTyping = true;
};
group = {
@ -173,6 +182,7 @@ in {
monitors = {
addDefault = true;
defaultWallpaper = ../../../misc/default-wallpaper.jpg;
};
sleep = {

View file

@ -136,7 +136,7 @@ in {
mods = ["SUPER" "SHIFT"];
key = "S";
dispatcher = "exec";
params = "hyprshot -m region --clipboard-only";
params = "pkill hyprshot || hyprshot -m region --clipboard-only";
}
{
@ -474,7 +474,7 @@ in {
mods = [];
key = "XF86AudioMute";
dispatcher = "exec";
params = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
params = "wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 0%";
}
{
flags = ["e" "l"];