From 93bf379c812ff41a945bbb6dd93065e52a782dfe Mon Sep 17 00:00:00 2001 From: autumn Date: Mon, 8 Sep 2025 12:29:08 -0600 Subject: [PATCH] lotta shit tbh --- home-manager/autumn/defaults/langs.nix | 24 +++++ home-manager/autumn/home.nix | 14 --- home-manager/packages/river/river.nix | 120 ++++++++++++++----------- 3 files changed, 91 insertions(+), 67 deletions(-) create mode 100644 home-manager/autumn/defaults/langs.nix diff --git a/home-manager/autumn/defaults/langs.nix b/home-manager/autumn/defaults/langs.nix new file mode 100644 index 0000000..455e2bd --- /dev/null +++ b/home-manager/autumn/defaults/langs.nix @@ -0,0 +1,24 @@ +{config, pkgs, ...}: + +{ + home.packages = with pkgs; [ + ccls + docker-language-server + nil + ty + rustc + rustup + gleam + ruff + ruby + rubyPackages_3_4.solargraph + nim-2_0 + nimlangserver + kdlfmt + superhtml + fish-lsp + ember-cli + ember-language-server + yaml-language-server + ]; +} diff --git a/home-manager/autumn/home.nix b/home-manager/autumn/home.nix index 598ebc6..84dd953 100644 --- a/home-manager/autumn/home.nix +++ b/home-manager/autumn/home.nix @@ -11,26 +11,12 @@ nerd-fonts.hack vesktop obsidian - ccls - docker-language-server - nil - ty - rustc - rustup htop gnumake python314Full eza - gleam - ruff - ruby - vscode-extensions.castwide.solargraph - rubyPackages_3_4.solargraph - nim-2_0 - nimlangserver fm felix - kdlfmt swaybg uv ]; diff --git a/home-manager/packages/river/river.nix b/home-manager/packages/river/river.nix index 1da5d7b..3c1efba 100644 --- a/home-manager/packages/river/river.nix +++ b/home-manager/packages/river/river.nix @@ -1,5 +1,11 @@ { config, pkgs, ... }: +let + cmd = "send-layout-cmd wideriver"; + tft = "toggle-focused-tags"; + tvt = "toggle-view-tags"; + sft = "set-focused-tags"; +in { home.packages = with pkgs; [ @@ -25,66 +31,74 @@ normal = { # spawn binds "Super Return" = "spawn alacritty"; - "Super R" = "spawn fuzzel"; - "Super E" = "spawn fm"; - "Super O" = "spawn obsidian"; - + "Super R" = "spawn fuzzel"; + "Super E" = "spawn fm"; + "Super B" = "spawn obsidian"; + + # format changes + "Super U" = "${cmd} \"--layout left\""; + "Super I" = "${cmd} \"--layout bottom\""; + "Super O" = "${cmd} \"--layout top\""; + "Super P" = "${cmd} \"--layout right\""; + "Super N" = "${cmd} \"--layout monocle\""; + "Super M" = "${cmd} \"--layout wide\""; + # globals - "Alt Q" = "close"; - "Super+Shift E" = "exit"; + "Alt Q" = "close"; + "Super+Shift E" = "exit"; "Super+Shift Return" = "zoom"; - "Super F" = "toggle-fullscreen"; + "Super F" = "toggle-fullscreen"; #movement - "Super J" = "focus-view next"; - "Super K" = "focus-view previous"; - "Super H" = "send-layout-cmd wideriver \"--count +1\""; - "Super L" = "send-layout-cmd wideriver \"--count -1\""; - "Super+Shift H" = "send-layout-cmd wideriver \"--ratio -0.05\""; - "Super+Shift J" = "swap next"; - "Super+Shift K" = "swap previous"; - "Super+Shift L" = "send-layout-cmd wideriver \"--ratio +0.05\""; - # "Super+Alt H" = "move left 100"; - # "Super+Alt J" = "move down 100"; - # "Super+Alt K" = "move up 100"; - # "Super+Alt L" = "move right 100"; - "Super Period" = "focus-output next"; - "Super Comma" = "focus-output previous"; - "Super+Shift Period" = "send-to-output next"; - "Super+Shift Comma" = "send-to-output previous"; + "Super J" = "focus-view next"; + "Super K" = "focus-view previous"; + "Super H" = "${cmd} \"--count +1\""; + "Super L" = "${cmd} \"--count -1\""; + "Super+Shift H" = "${cmd} \"--ratio -0.05\""; + "Super+Shift J" = "swap next"; + "Super+Shift K" = "swap previous"; + "Super+Shift L" = "${cmd} \"--ratio +0.05\""; + # "Super+Alt H" = "move left 100"; + # "Super+Alt J" = "move down 100"; + # "Super+Alt K" = "move up 100"; + # "Super+Alt L" = "move right 100"; + # "Super Period" = "focus-output next"; + # "Super Comma" = "focus-output previous"; + # "Super+Shift Period" = "send-to-output next"; + # "Super+Shift Comma" = "send-to-output previous"; # tag commands - "Super 1" = "set-focused-tags 2147483649"; - "Super+Shift 1" = "toggle-focused-tags 1"; - "Super+Alt 1" = "toggle-view-tags 1"; - "Super 2" = "set-focused-tags 2147483650"; - "Super+Shift 2" = "toggle-focused-tags 2"; - "Super+Alt 2" = "toggle-view-tags 2"; - "Super 3" = "set-focused-tags 2147483652"; - "Super+Shift 3" = "toggle-focused-tags 4"; - "Super+Alt 3" = "toggle-view-tags 4"; - "Super 4" = "set-focused-tags 2147483656"; - "Super+Shift 4" = "toggle-focused-tags 8"; - "Super+Alt 4" = "toggle-view-tags 8"; - "Super 5" = "set-focused-tags 2147483664"; - "Super+Shift 5" = "toggle-focused-tags 16"; - "Super+Alt 5" = "toggle-view-tags 16"; - "Super 6" = "set-focused-tags 2147483680"; - "Super+Shift 6" = "toggle-focused-tags 32"; - "Super+Alt 6" = "toggle-view-tags 32"; - "Super 7" = "set-focused-tags 2147483712"; - "Super+Shift 7" = "toggle-focused-tags 64"; - "Super+Alt 7" = "toggle-view-tags 64"; - "Super 8" = "set-focused-tags 2147483776"; - "Super+Shift 8" = "toggle-focused-tags 128"; - "Super+Alt 8" = "toggle-view-tags 128"; - "Super 9" = "set-focused-tags 2147483904"; - "Super+Shift 9" = "toggle-focused-tags 256"; - "Super+Alt 9" = "toggle-view-tags 256"; - "Super 0" = "set-focused-tags 2147483648"; - "Super+Shift 0" = "toggle-focused-tags 2147483648"; - "Super+Alt 0" = "toggle-view-tags 2147483648"; + "Super 1" = "${sft} 2147483649"; + "Super+Shift 1" = "${tft} 1"; + "Super+Alt 1" = "${tvt} 1"; + "Super 2" = "${sft} 2147483650"; + "Super+Shift 2" = "${tft} 2"; + "Super+Alt 2" = "${tvt} 2"; + "Super 3" = "${sft} 2147483652"; + "Super+Shift 3" = "${tft} 4"; + "Super+Alt 3" = "${tvt} 4"; + "Super 4" = "${sft} 2147483656"; + "Super+Shift 4" = "${tft} 8"; + "Super+Alt 4" = "${tvt} 8"; + "Super 5" = "${sft} 2147483664"; + "Super+Shift 5" = "${tft} 16"; + "Super+Alt 5" = "${tvt} 16"; + "Super 6" = "${sft} 2147483680"; + "Super+Shift 6" = "${tft} 32"; + "Super+Alt 6" = "${tvt} 32"; + "Super 7" = "${sft} 2147483712"; + "Super+Shift 7" = "${tft} 64"; + "Super+Alt 7" = "${tvt} 64"; + "Super 8" = "${sft} 2147483776"; + "Super+Shift 8" = "${tft} 128"; + "Super+Alt 8" = "${tvt} 128"; + "Super 9" = "${sft} 2147483904"; + "Super+Shift 9" = "${tft} 256"; + "Super+Alt 9" = "${tvt} 256"; + "Super 0" = "${sft} 2147483648"; + "Super+Shift 0" = "${tft} 2147483648"; + "Super+Alt 0" = "${tvt} 2147483648"; }; }; };