From 656a359f6099b3a86df9a87a1f7ee88aa22107f1 Mon Sep 17 00:00:00 2001 From: _cry64 Date: Sat, 7 Mar 2026 13:45:31 +1000 Subject: [PATCH 01/59] use cerulean snowflakes standard --- flake.lock | 74 ++++++++++++++++++++++++++---------------------------- flake.nix | 5 ++-- snow.nix | 18 +++++-------- 3 files changed, 45 insertions(+), 52 deletions(-) diff --git a/flake.lock b/flake.lock index 3b5e897..4f1e1c5 100644 --- a/flake.lock +++ b/flake.lock @@ -146,29 +146,28 @@ "cerulean": { "inputs": { "deploy-rs": "deploy-rs", - "home-manager": "home-manager", "microvm": "microvm", "nixpkgs": [ "nixpkgs" ], "nt": "nt", + "sops-nix": "sops-nix", "systems": [ "systems" ] }, "locked": { - "lastModified": 1771409623, - "narHash": "sha256-1IhHueuQTVCVrui700IP9DfLXwb3kU2rnEWPSdxQY0k=", - "ref": "refs/heads/main", - "rev": "d5211287bd3cb96078f2053488d67d557848a8f2", - "revCount": 176, - "type": "git", - "url": "https://tearforge.net/cry/cerulean" + "lastModified": 1772852754, + "narHash": "sha256-rYmaW2+zmFXM7Mp+B/fsBkzbAoeApj04F1fSmiS3mXU=", + "owner": "cry128", + "repo": "cerulean", + "rev": "ef5bc338566670380ceec75eb692697c9e81fb7e", + "type": "github" }, "original": { - "rev": "d5211287bd3cb96078f2053488d67d557848a8f2", - "type": "git", - "url": "https://tearforge.net/cry/cerulean" + "owner": "cry128", + "repo": "cerulean", + "type": "github" } }, "crane": { @@ -484,7 +483,6 @@ "home-manager": { "inputs": { "nixpkgs": [ - "cerulean", "nixpkgs" ] }, @@ -525,27 +523,6 @@ } }, "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1772633058, - "narHash": "sha256-SO7JapRy2HPhgmqiLbfnW1kMx5rakPMKZ9z3wtRLQjI=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "080657a04188aca25f8a6c70a0fb2ea7e37f1865", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-25.11", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_3": { "inputs": { "nixpkgs": [ "zen", @@ -1056,11 +1033,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1772742184, - "narHash": "sha256-zGnRxJQZ8wZTwvSxF4SAGoefbta15/W032tK22uIF2E=", + "lastModified": 1771365290, + "narHash": "sha256-1XJOslVyF7yzf6yd/yl1VjGLywsbtwmQh3X1LuJcLI4=", "owner": "microvm-nix", "repo": "microvm.nix", - "rev": "a257ca90febb686c75826918f9f8876d74f875eb", + "rev": "789c90b164b55b4379e7a94af8b9c01489024c18", "type": "github" }, "original": { @@ -1488,7 +1465,7 @@ "cachyos": "cachyos", "cerulean": "cerulean", "fenix": "fenix", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "home-manager-unstable": "home-manager-unstable", "hyprland-git": "hyprland-git", "hyprland-plugins": "hyprland-plugins", @@ -1604,6 +1581,27 @@ "type": "github" } }, + "sops-nix": { + "inputs": { + "nixpkgs": [ + "cerulean", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1772495394, + "narHash": "sha256-hmIvE/slLKEFKNEJz27IZ8BKlAaZDcjIHmkZ7GCEjfw=", + "owner": "Mic92", + "repo": "sops-nix", + "rev": "1d9b98a29a45abe9c4d3174bd36de9f28755e3ff", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "sops-nix", + "type": "github" + } + }, "spectrum": { "flake": false, "locked": { @@ -1835,7 +1833,7 @@ }, "zen": { "inputs": { - "home-manager": "home-manager_3", + "home-manager": "home-manager_2", "nixpkgs": [ "nixpkgs-unstable" ] diff --git a/flake.nix b/flake.nix index 757fed7..4f838b5 100644 --- a/flake.nix +++ b/flake.nix @@ -19,7 +19,7 @@ }; cerulean = { - url = "git+https://tearforge.net/cry/cerulean?rev=d5211287bd3cb96078f2053488d67d557848a8f2"; + url = "github:cry128/cerulean"; inputs = { systems.follows = "systems"; nixpkgs.follows = "nixpkgs"; @@ -101,5 +101,6 @@ extra-experimental-features = "pipe-operators"; }; - outputs = inputs: import ./snow.nix inputs; + outputs = {cerulean, ...} @ inputs: + cerulean.snow.flake inputs ./.; } diff --git a/snow.nix b/snow.nix index 8a63ff9..f54f5dc 100644 --- a/snow.nix +++ b/snow.nix @@ -1,6 +1,5 @@ -{cerulean, ...} @ inputs: -cerulean.mkNexus ./. (self: { - nexus = { +{inputs, ...}: { + nodes = { args = {inherit inputs;}; modules = with inputs; []; @@ -12,12 +11,7 @@ cerulean.mkNexus ./. (self: { servers = {}; }; - nodes = let - inherit - (self.nexus) - groups - ; - in { + nodes = { nixarawrui = { system = "x86_64-linux"; @@ -33,7 +27,7 @@ cerulean.mkNexus ./. (self: { arcturus = { system = "x86_64-linux"; - groups = [ + groups = groups: [ groups.servers ]; @@ -120,7 +114,7 @@ cerulean.mkNexus ./. (self: { lyra = { system = "x86_64-linux"; - groups = [ + groups = groups: [ groups.servers ]; @@ -132,4 +126,4 @@ cerulean.mkNexus ./. (self: { }; }; }; -}) +} From adcfc52c60de7a3f1f1d3ad367c07a80d3c2666d Mon Sep 17 00:00:00 2001 From: foxora Date: Sat, 7 Mar 2026 16:00:41 +0000 Subject: [PATCH 02/59] added submap to taskbar for hyprland :3 --- homes/modules/de/waybar/style.css | 8 +++++++- homes/modules/de/waybar/waybar.nix | 9 ++++++++- homes/modules/wm/hyprland/hypr/keybinds/virtual.conf | 6 +++--- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/homes/modules/de/waybar/style.css b/homes/modules/de/waybar/style.css index 254e789..54ae077 100644 --- a/homes/modules/de/waybar/style.css +++ b/homes/modules/de/waybar/style.css @@ -37,6 +37,7 @@ tooltip label { #network, #workspaces, #taskbar, +#submap, #cpu, #pulseaudio, #privacy, @@ -74,6 +75,7 @@ right-side modules #cpu, #pulseaudio, #tray, +#submap, #privacy { margin: 4px 0px 4px 4px; } @@ -96,6 +98,10 @@ right-side modules border: none; } +#submap.name { + color: @colorfg; +} + /* connects the workspace and taskbar together :3 */ @@ -114,7 +120,7 @@ right-side modules */ #cpu { - margin: 4px 0 4px 0; + margin: 4px 0 4px 4px; border-radius: 32px 0px 0px 32px; } #memory { diff --git a/homes/modules/de/waybar/waybar.nix b/homes/modules/de/waybar/waybar.nix index 71e1f20..d1da186 100644 --- a/homes/modules/de/waybar/waybar.nix +++ b/homes/modules/de/waybar/waybar.nix @@ -8,7 +8,7 @@ height = 20; modules-left = ["hyprland/workspaces" "wlr/taskbar" "custom/media"]; modules-center = ["clock"]; - modules-right = ["cpu" "memory" "network" "pulseaudio" "privacy" "tray"]; + modules-right = ["hyprland/submap" "cpu" "memory" "network" "pulseaudio" "privacy" "tray"]; # left "hyprland/workspaces" = { @@ -39,6 +39,13 @@ }; # right + "hyprland/submap" = { + format = "{}"; + # always-on = true; + # default-submap = "normal"; + max-length = 12; + tooltip = false; + }; "cpu" = { format = " {usage}%"; interval = 1; diff --git a/homes/modules/wm/hyprland/hypr/keybinds/virtual.conf b/homes/modules/wm/hyprland/hypr/keybinds/virtual.conf index 076c602..d396c7e 100644 --- a/homes/modules/wm/hyprland/hypr/keybinds/virtual.conf +++ b/homes/modules/wm/hyprland/hypr/keybinds/virtual.conf @@ -1,7 +1,7 @@ # a submap for emulating keys/buttons/functions on the keyboard or mouse -bind = $mod+shift+alt, a, submap, virtual -submap = virtual +bind = $mod+shift, c, submap, cursor +submap = cursor # exit submap bind = , escape, submap, reset @@ -38,6 +38,6 @@ binde = alt, e, exec, wlrctl pointer scroll -15 0 # scroll left binde = alt, y, exec, wlrctl pointer scroll 0 15 # scroll right # catches all other keys and keeps us in the submap -bind = , catchall, submap, virtual +bind = , catchall, submap, cursor submap = reset From ff97832d9f9b9d697100cf6ad6e7ddc52ded1d39 Mon Sep 17 00:00:00 2001 From: foxora Date: Sat, 7 Mar 2026 19:11:14 +0000 Subject: [PATCH 03/59] put servers on 6.12 LTS <3 --- hosts/arcturus/default.nix | 2 +- hosts/lyra/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/arcturus/default.nix b/hosts/arcturus/default.nix index dde69a2..0f2ab89 100644 --- a/hosts/arcturus/default.nix +++ b/hosts/arcturus/default.nix @@ -13,7 +13,7 @@ }; boot = { - kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = pkgs.linuxPackages_6_12; loader = { systemd-boot.enable = true; efi.canTouchEfiVariables = true; diff --git a/hosts/lyra/default.nix b/hosts/lyra/default.nix index 28ea912..9a1f982 100644 --- a/hosts/lyra/default.nix +++ b/hosts/lyra/default.nix @@ -13,7 +13,7 @@ }; boot = { - kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = pkgs.linuxPackages_6_12; loader = { systemd-boot.enable = true; efi.canTouchEfiVariables = true; From be96d1dbf77faf310dc55a586fb7c693898df715 Mon Sep 17 00:00:00 2001 From: foxora Date: Sat, 7 Mar 2026 19:12:11 +0000 Subject: [PATCH 04/59] nvme ssd power stage bug? switched to 6.12 on nixarawrui <3 --- hosts/nixarawrui/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/hosts/nixarawrui/default.nix b/hosts/nixarawrui/default.nix index a86e456..4e9c5cd 100644 --- a/hosts/nixarawrui/default.nix +++ b/hosts/nixarawrui/default.nix @@ -23,8 +23,8 @@ # kernelPackages = upkgs.cachyosKernels.linuxPackages-cachyos-latest-lto-x86_64-v4; # TODO: idk make this a toggle or smth idfk # kernelPackages = upkgs.linuxPackages_zen; - # FIX: it said my disk was full - kernelPackages = upkgs.linuxPackages_latest; + # FIX: kernel bug + kernelPackages = upkgs.linuxPackages_6_12; kernelModules = ["v4l2loopback"]; # force kernel to use dGPU kernelParams = [ @@ -32,7 +32,10 @@ "video=PCI:0000:03:00.0:e" "initcall_blacklist=simpledrm_platform_driver_init" "fbcon=map:0" - "pci=assign-busses" + + # fixes nvme drive not waking up + # "nvme_core.default_ps_max_latency_us=0" + # "pcie_port_pm=off" ]; extraModulePackages = with kernelPackages; [v4l2loopback]; From 2a66cb0014c665905db28467c1bc8cb697434ed8 Mon Sep 17 00:00:00 2001 From: foxora Date: Sat, 7 Mar 2026 19:25:28 +0000 Subject: [PATCH 05/59] removed hyprland plugins as scrolling is now in hyprland!! :3 --- flake.lock | 31 -------------------------- flake.nix | 8 +++---- homes/modules/wm/hyprland/hyprland.nix | 20 +++++++---------- 3 files changed, 12 insertions(+), 47 deletions(-) diff --git a/flake.lock b/flake.lock index 3b5e897..0622507 100644 --- a/flake.lock +++ b/flake.lock @@ -702,36 +702,6 @@ "type": "github" } }, - "hyprland-plugins": { - "inputs": { - "hyprland": [ - "hyprland-git" - ], - "nixpkgs": [ - "hyprland-plugins", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland-plugins", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1771865848, - "narHash": "sha256-xwNa+1D8WPsDnJtUofDrtyDCZKZotbUymzV/R5s+M0I=", - "owner": "hyprwm", - "repo": "hyprland-plugins", - "rev": "b85a56b9531013c79f2f3846fd6ee2ff014b8960", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-plugins", - "type": "github" - } - }, "hyprland-protocols": { "inputs": { "nixpkgs": [ @@ -1491,7 +1461,6 @@ "home-manager": "home-manager_2", "home-manager-unstable": "home-manager-unstable", "hyprland-git": "hyprland-git", - "hyprland-plugins": "hyprland-plugins", "iamb": "iamb", "mango": "mango", "microvm": "microvm_2", diff --git a/flake.nix b/flake.nix index 757fed7..c8d8688 100644 --- a/flake.nix +++ b/flake.nix @@ -40,10 +40,10 @@ url = "github:hyprwm/Hyprland"; inputs.nixpkgs.follows = "nixpkgs-unstable"; }; - hyprland-plugins = { - url = "github:hyprwm/hyprland-plugins"; - inputs.hyprland.follows = "hyprland-git"; - }; + # hyprland-plugins = { + # url = "github:hyprwm/hyprland-plugins"; + # inputs.hyprland.follows = "hyprland-git"; + # }; mango = { url = "github:DreamMaoMao/mangowc"; diff --git a/homes/modules/wm/hyprland/hyprland.nix b/homes/modules/wm/hyprland/hyprland.nix index de7deee..5cd6dc7 100644 --- a/homes/modules/wm/hyprland/hyprland.nix +++ b/homes/modules/wm/hyprland/hyprland.nix @@ -4,10 +4,6 @@ package = null; portalPackage = null; - plugins = [ - #inputs.hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}.hyprscrolling - ]; - xwayland.enable = true; extraConfig = '' @@ -64,18 +60,18 @@ layout = "dwindle"; }; - plugin = { - # options at https://github.com/hyprwm/hyprland-plugins/tree/main/hyprscrolling - hyprscrolling = { - fullscreen_on_one_column = false; - column_width = 1.0; - }; - }; - dwindle = { preserve_split = true; }; + scrolling = { + fullscreen_on_one_column = true; + column_width = 0.9; + wrap_focus = true; + wrap_swapcol = true; + direction = "right"; + }; + decoration = { rounding = 8; From cf23725f2f60fc1ead31b75ebe52a469d3337a6c Mon Sep 17 00:00:00 2001 From: foxora Date: Sat, 7 Mar 2026 21:05:42 +0000 Subject: [PATCH 06/59] hopefully fixed nvme issue --- homes/aurora/default.nix | 3 +- homes/modules/programs/neovim/nixcats.nix | 75 +++++++++---------- .../modules/scripts/hyprland-layout-toggle.sh | 1 + hosts/nixarawrui/default.nix | 8 +- 4 files changed, 42 insertions(+), 45 deletions(-) create mode 100644 homes/modules/scripts/hyprland-layout-toggle.sh diff --git a/homes/aurora/default.nix b/homes/aurora/default.nix index 36aea1f..b99521c 100644 --- a/homes/aurora/default.nix +++ b/homes/aurora/default.nix @@ -109,7 +109,7 @@ exiftool # display and edit metadata on a variety of files halloy # irc tui app written in rust pastel # color generator / manipulator :3 i love colors!! <3 - eva # calculator repl + eva # calculator repl silicon # makes pretty images of code :3 # cli fun @@ -130,6 +130,7 @@ gleam delta # git diff viewer tlrc # tldr rust client + shellcheck # apps qutebrowser # keyboard-focused browser (chromium) diff --git a/homes/modules/programs/neovim/nixcats.nix b/homes/modules/programs/neovim/nixcats.nix index 564b652..1030cac 100644 --- a/homes/modules/programs/neovim/nixcats.nix +++ b/homes/modules/programs/neovim/nixcats.nix @@ -100,6 +100,9 @@ in { toml = { format = [taplo]; }; + bash = { + lsp = [bash-language-server]; + }; }; }; @@ -247,47 +250,37 @@ in { git = false; # not really setup yet lang = { - lua = { - lsp = true; - format = true; - }; - nix = { - lsp = true; - format = true; - docs = true; - }; - rust = { - lsp = true; - format = true; - }; - zig = { - lsp = true; - format = true; - }; - elixir = { - lsp = true; - format = true; - }; - gleam = { - lsp = true; - format = true; - }; - haskell = { - lsp = true; - format = true; - }; - java = { - lsp = true; - format = true; - }; - protobuf = { - lsp = true; - format = true; - }; - toml = { - lsp = true; - format = true; - }; + lua.lsp = true; + lua.format = true; + + nix.lsp = true; + nix.format = true; + nix.docs = true; + + rust.lsp = true; + rust.format = true; + + zig.lsp = true; + zig.format = true; + + elixir.lsp = true; + elixir.format = true; + + gleam.lsp = true; + gleam.format = true; + + haskell.lsp = true; + haskell.format = true; + + java.lsp = true; + java.format = true; + + protobuf.lsp = true; + protobuf.format = true; + + toml.format = true; + + bash.lsp = true; }; }; }; diff --git a/homes/modules/scripts/hyprland-layout-toggle.sh b/homes/modules/scripts/hyprland-layout-toggle.sh new file mode 100644 index 0000000..f1f641a --- /dev/null +++ b/homes/modules/scripts/hyprland-layout-toggle.sh @@ -0,0 +1 @@ +#!/usr/bin/env bash diff --git a/hosts/nixarawrui/default.nix b/hosts/nixarawrui/default.nix index 4e9c5cd..ee1498c 100644 --- a/hosts/nixarawrui/default.nix +++ b/hosts/nixarawrui/default.nix @@ -33,9 +33,11 @@ "initcall_blacklist=simpledrm_platform_driver_init" "fbcon=map:0" - # fixes nvme drive not waking up - # "nvme_core.default_ps_max_latency_us=0" - # "pcie_port_pm=off" + # stops kernel from setting power states on nvme drives because it keeps + # disconnecting my drive and my system locks up + "nvme_core.default_ps_max_latency_us=0" + "pcie_aspm=off" + "pcie_port_pm=off" ]; extraModulePackages = with kernelPackages; [v4l2loopback]; From 662268f3276b8824040356efd6ff8e3f4517774f Mon Sep 17 00:00:00 2001 From: foxora Date: Sat, 7 Mar 2026 21:14:19 +0000 Subject: [PATCH 07/59] moved comment lol --- hosts/nixarawrui/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/nixarawrui/default.nix b/hosts/nixarawrui/default.nix index ee1498c..3d2ccf2 100644 --- a/hosts/nixarawrui/default.nix +++ b/hosts/nixarawrui/default.nix @@ -26,8 +26,8 @@ # FIX: kernel bug kernelPackages = upkgs.linuxPackages_6_12; kernelModules = ["v4l2loopback"]; - # force kernel to use dGPU kernelParams = [ + # force kernel to use dGPU "amdgpu.primary=0000:03:00.0" "video=PCI:0000:03:00.0:e" "initcall_blacklist=simpledrm_platform_driver_init" From 669128d4b6202a4238d57d04db1d564383ebf842 Mon Sep 17 00:00:00 2001 From: foxora Date: Sat, 7 Mar 2026 22:08:14 +0000 Subject: [PATCH 08/59] Revert flake.lock to 387ccee --- flake.lock | 222 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 127 insertions(+), 95 deletions(-) diff --git a/flake.lock b/flake.lock index 0622507..72140fa 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1772292445, - "narHash": "sha256-4F1Q7U313TKUDDovCC96m/Za4wZcJ3yqtu4eSrj8lk8=", + "lastModified": 1765900596, + "narHash": "sha256-+hn8v9jkkLP9m+o0Nm5SiEq10W0iWDSotH2XfjU45fA=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "1dbbba659c1cef0b0202ce92cadfe13bae550e8f", + "rev": "d83c97f8f5c0aae553c1489c7d9eff3eadcadace", "type": "github" }, "original": { @@ -98,11 +98,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1772820255, - "narHash": "sha256-vdktxEQihZUcKiwbaYCBl8LuTrJZULpjwqtJyBzXBN8=", + "lastModified": 1772422417, + "narHash": "sha256-TyLPxtYIhHP7QNwVwrDRxaj+XKorVOyA4EKhRjpBI8U=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "aada771f510dbd9ac48614cc7b4b21a292989d3a", + "rev": "8ff8842cf58569ebe830f37350c6f1602fa35c39", "type": "github" }, "original": { @@ -114,11 +114,11 @@ "cachyos-kernel": { "flake": false, "locked": { - "lastModified": 1772644657, - "narHash": "sha256-7zQSBFv9gFeYhe65NchqLLste7mJ396jA1OnNcf+OQQ=", + "lastModified": 1772275362, + "narHash": "sha256-jIQpfzcPBXe1URbf82p/9JxJguZuZZBlMJnW1x7B5jE=", "owner": "CachyOS", "repo": "linux-cachyos", - "rev": "ff5ccc4fa26d5272d929fb9c1838593a6347ca10", + "rev": "4a363451cc86ff5304514c8bf25eac42eb46b8c8", "type": "github" }, "original": { @@ -130,11 +130,11 @@ "cachyos-kernel-patches": { "flake": false, "locked": { - "lastModified": 1772731186, - "narHash": "sha256-y70pS9Cma7+WCsni3VTacHh9g/udulmBS6zrYE2Fz64=", + "lastModified": 1772269331, + "narHash": "sha256-DucfJqDGDO7PynT3sRuBfHw5jC0K2Oy0oqpJWueh4xw=", "owner": "CachyOS", "repo": "kernel-patches", - "rev": "eac8168ee15f742547d4d20ba5c7fea283f23019", + "rev": "6e2a0214de28cf0af1b72a2076bbfc77d12d96e8", "type": "github" }, "original": { @@ -234,11 +234,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1772780947, - "narHash": "sha256-cblRAy3ctJniRFaSLpqYeHor+RJhkptPZNMUc4Sl+v4=", + "lastModified": 1772435729, + "narHash": "sha256-7Ln7IuX8nMIqfiDcX8jYkEAsf9oW8GAirvlK5SBPsds=", "owner": "nix-community", "repo": "fenix", - "rev": "26a5e59df51222c849deb63c9196ac6d7a531535", + "rev": "ec69754e35f5b0088645a69e486ac00e90217757", "type": "github" }, "original": { @@ -320,15 +320,15 @@ "flake-compat_4": { "flake": false, "locked": { - "lastModified": 1767039857, - "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", - "owner": "NixOS", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", + "owner": "edolstra", "repo": "flake-compat", - "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "edolstra", "repo": "flake-compat", "type": "github" } @@ -411,11 +411,11 @@ "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { - "lastModified": 1772408722, - "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "type": "github" }, "original": { @@ -489,11 +489,11 @@ ] }, "locked": { - "lastModified": 1772633058, - "narHash": "sha256-SO7JapRy2HPhgmqiLbfnW1kMx5rakPMKZ9z3wtRLQjI=", + "lastModified": 1772380125, + "narHash": "sha256-8C+y46xA9bxcchj9GeDPJaRUDApaA3sy2fhJr1bTbUw=", "owner": "nix-community", "repo": "home-manager", - "rev": "080657a04188aca25f8a6c70a0fb2ea7e37f1865", + "rev": "a07a44a839eb036e950bf397d9b782916f8dcab3", "type": "github" }, "original": { @@ -510,11 +510,11 @@ ] }, "locked": { - "lastModified": 1772807318, - "narHash": "sha256-Qjw6ILt8cb2HQQpCmWNLMZZ63wEo1KjTQt+1BcQBr7k=", + "lastModified": 1772380461, + "narHash": "sha256-O3ukj3Bb3V0Tiy/4LUfLlBpWypJ9P0JeUgsKl2nmZZY=", "owner": "nix-community", "repo": "home-manager", - "rev": "daa2c221320809f5514edde74d0ad0193ad54ed8", + "rev": "f140aa04d7d14f8a50ab27f3691b5766b17ae961", "type": "github" }, "original": { @@ -531,11 +531,11 @@ ] }, "locked": { - "lastModified": 1772633058, - "narHash": "sha256-SO7JapRy2HPhgmqiLbfnW1kMx5rakPMKZ9z3wtRLQjI=", + "lastModified": 1772380125, + "narHash": "sha256-8C+y46xA9bxcchj9GeDPJaRUDApaA3sy2fhJr1bTbUw=", "owner": "nix-community", "repo": "home-manager", - "rev": "080657a04188aca25f8a6c70a0fb2ea7e37f1865", + "rev": "a07a44a839eb036e950bf397d9b782916f8dcab3", "type": "github" }, "original": { @@ -611,11 +611,11 @@ ] }, "locked": { - "lastModified": 1770511807, - "narHash": "sha256-suKmSbSk34uPOJDTg/GbPrKEJutzK08vj0VoTvAFBCA=", + "lastModified": 1763733840, + "narHash": "sha256-JnET78yl5RvpGuDQy3rCycOCkiKoLr5DN1fPhRNNMco=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "7c75487edd43a71b61adb01cae8326d277aab683", + "rev": "8f1bec691b2d198c60cccabca7a94add2df4ed1a", "type": "github" }, "original": { @@ -643,16 +643,17 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1772833450, - "narHash": "sha256-XuuvhTD/72mH8MBncTeOyN0JzLCtwav7lkwBQlIofd4=", + "lastModified": 1766604420, + "narHash": "sha256-2Kqg1YNtjPGXc1DIzBeESL8hiuUNUn3c3Oimab19Zn8=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "4152ac76d0813d9d0f67d2f04653a13fa6e17433", + "rev": "25250527793eb04bb60f103abe7f06370b9f6e1c", "type": "github" }, "original": { "owner": "hyprwm", "repo": "Hyprland", + "rev": "25250527793eb04bb60f103abe7f06370b9f6e1c", "type": "github" } }, @@ -689,11 +690,11 @@ ] }, "locked": { - "lastModified": 1767023960, - "narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=", + "lastModified": 1765643131, + "narHash": "sha256-CCGohW5EBIRy4B7vTyBMqPgsNcaNenVad/wszfddET0=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660", + "rev": "e50ae912813bdfa8372d62daf454f48d6df02297", "type": "github" }, "original": { @@ -702,6 +703,36 @@ "type": "github" } }, + "hyprland-plugins": { + "inputs": { + "hyprland": [ + "hyprland-git" + ], + "nixpkgs": [ + "hyprland-plugins", + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland-plugins", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1771865848, + "narHash": "sha256-xwNa+1D8WPsDnJtUofDrtyDCZKZotbUymzV/R5s+M0I=", + "owner": "hyprwm", + "repo": "hyprland-plugins", + "rev": "b85a56b9531013c79f2f3846fd6ee2ff014b8960", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-plugins", + "type": "github" + } + }, "hyprland-protocols": { "inputs": { "nixpkgs": [ @@ -743,11 +774,11 @@ ] }, "locked": { - "lastModified": 1771866172, - "narHash": "sha256-fYFoXhQLrm1rD8vSFKQBOEX4OGCuJdLt1amKfHd5GAw=", + "lastModified": 1764612430, + "narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "0b219224910e7642eb0ed49f0db5ec3d008e3e41", + "rev": "0d00dc118981531aa731150b6ea551ef037acddd", "type": "github" }, "original": { @@ -820,11 +851,11 @@ ] }, "locked": { - "lastModified": 1771271487, - "narHash": "sha256-41gEiUS0Pyw3L/ge1l8MXn61cK14VAhgWB/JV8s/oNI=", + "lastModified": 1766160771, + "narHash": "sha256-roINUGikWRqqgKrD4iotKbGj3ZKJl3hjMz5l/SyKrHw=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "340a792e3b3d482c4ae5f66d27a9096bdee6d76d", + "rev": "5ac060bfcf2f12b3a6381156ebbc13826a05b09f", "type": "github" }, "original": { @@ -845,11 +876,11 @@ ] }, "locked": { - "lastModified": 1770501770, - "narHash": "sha256-NWRM6+YxTRv+bT9yvlhhJ2iLae1B1pNH3mAL5wi2rlQ=", + "lastModified": 1763640274, + "narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "0bd8b6cde9ec27d48aad9e5b4deefb3746909d40", + "rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671", "type": "github" }, "original": { @@ -874,11 +905,11 @@ ] }, "locked": { - "lastModified": 1771606233, - "narHash": "sha256-F3PLUqQ/TwgR70U+UeOqJnihJZ2EuunzojYC4g5xHr0=", + "lastModified": 1766253200, + "narHash": "sha256-26qPwrd3od+xoYVywSB7hC2cz9ivN46VPLlrsXyGxvE=", "owner": "hyprwm", "repo": "hyprwire", - "rev": "06c7f1f8c4194786c8400653c4efc49dc14c0f3a", + "rev": "1079777525b30a947c8d657fac158e00ae85de9d", "type": "github" }, "original": { @@ -1004,11 +1035,11 @@ "scenefx": "scenefx" }, "locked": { - "lastModified": 1772792509, - "narHash": "sha256-c2X+x/D8txqV5UaN6TYYh9PEXyMaWVZl4mAQ0Sl21f8=", + "lastModified": 1772456032, + "narHash": "sha256-QSbTGcfBlcjFYNvxhbV8DDMLP9CEfJJOEckJL34+T48=", "owner": "DreamMaoMao", "repo": "mangowc", - "rev": "9a17a0279c39b330d155d50282d1d2641d519dc3", + "rev": "46e867deb9dfd58abb22ec92b19461d3761b1f3d", "type": "github" }, "original": { @@ -1026,11 +1057,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1772742184, - "narHash": "sha256-zGnRxJQZ8wZTwvSxF4SAGoefbta15/W032tK22uIF2E=", + "lastModified": 1772338235, + "narHash": "sha256-9XcwtSIL/c+pkC3SBNuxCJuSktFOBV1TLvvkhekyB8I=", "owner": "microvm-nix", "repo": "microvm.nix", - "rev": "a257ca90febb686c75826918f9f8876d74f875eb", + "rev": "9d1ff9b53532908a5eba7707931c9093508b6b92", "type": "github" }, "original": { @@ -1047,11 +1078,11 @@ "spectrum": "spectrum_2" }, "locked": { - "lastModified": 1772742184, - "narHash": "sha256-zGnRxJQZ8wZTwvSxF4SAGoefbta15/W032tK22uIF2E=", + "lastModified": 1772338235, + "narHash": "sha256-9XcwtSIL/c+pkC3SBNuxCJuSktFOBV1TLvvkhekyB8I=", "owner": "microvm-nix", "repo": "microvm.nix", - "rev": "a257ca90febb686c75826918f9f8876d74f875eb", + "rev": "9d1ff9b53532908a5eba7707931c9093508b6b92", "type": "github" }, "original": { @@ -1238,11 +1269,11 @@ ] }, "locked": { - "lastModified": 1772813986, - "narHash": "sha256-x0fD+LL+O99p36c2UnjnHvVq4/7TvGH/8G5lTNIJBCo=", + "lastModified": 1772266502, + "narHash": "sha256-HBO3W1ooO9UwmxwwwFflnbCrAVHhaxpB8YnxFGPvOsY=", "owner": "FlameFlag", "repo": "nixcord", - "rev": "e433a2919eb9b3a8c85ab3017c08685816e63a66", + "rev": "e805e50f0cc8b9f2d950dc81cd9ee1c986899eaf", "type": "github" }, "original": { @@ -1253,11 +1284,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1772774498, - "narHash": "sha256-85HBHBEzVRQ0ZRe6u3E2snUvAyTr5mSvi5m2vl4HExo=", + "lastModified": 1772402963, + "narHash": "sha256-+MupheX+ghNTSAg1XNppNApDC+FvvgpUXyU6sJSIsJo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "943ba5b1a58e68eb9a2c284ba6e3b30ebfe45abe", + "rev": "d41521c807dccb71b1b866ac3b7df5a59e726d9d", "type": "github" }, "original": { @@ -1299,11 +1330,11 @@ }, "nixpkgs-lib_3": { "locked": { - "lastModified": 1772328832, - "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", + "lastModified": 1769909678, + "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742", + "rev": "72716169fe93074c333e8d0173151350670b824c", "type": "github" }, "original": { @@ -1314,11 +1345,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1772820052, - "narHash": "sha256-qXEI8n+4eXT+BqMzUMuKFdkltE82TjgIceiJCpdjzD4=", + "lastModified": 1772458868, + "narHash": "sha256-vnqeYbLjtEubh0vDLAxYl+STQ0XAINWdwzipH9sL7k8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d78e468770f4ab5e00c5015f4d77c1a499a76dc8", + "rev": "6896fd3d7f8a7cdd79d2a8355ce0d79db18dc875", "type": "github" }, "original": { @@ -1330,11 +1361,11 @@ }, "nixpkgs-staging": { "locked": { - "lastModified": 1772820753, - "narHash": "sha256-Sv689sGseiqNPXGSggxrESyivroe8cgY4dxqJdBLsEc=", + "lastModified": 1772453524, + "narHash": "sha256-2VR3/3A0mD42BYh6mNkxJ3W4qSy6mxa7Q84S4bR0VrA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e2239e5b2c5676b963d78dccbee06a9bbbdb05d6", + "rev": "0d1bb154f92b51fa8d6fd6323dd60e4d70eb5e57", "type": "github" }, "original": { @@ -1346,11 +1377,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1772624091, - "narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=", + "lastModified": 1772198003, + "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "80bdc1e5ce51f56b19791b52b2901187931f5353", + "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61", "type": "github" }, "original": { @@ -1378,11 +1409,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1772598333, - "narHash": "sha256-YaHht/C35INEX3DeJQNWjNaTcPjYmBwwjFJ2jdtr+5U=", + "lastModified": 1772047000, + "narHash": "sha256-7DaQVv4R97cii/Qdfy4tmDZMB2xxtyIvNGSwXBBhSmo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fabb8c9deee281e50b1065002c9828f2cf7b2239", + "rev": "1267bb4920d0fc06ea916734c11b0bf004bbe17e", "type": "github" }, "original": { @@ -1422,11 +1453,11 @@ ] }, "locked": { - "lastModified": 1772024342, - "narHash": "sha256-+eXlIc4/7dE6EcPs9a2DaSY3fTA9AE526hGqkNID3Wg=", + "lastModified": 1765911976, + "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "6e34e97ed9788b17796ee43ccdbaf871a5c2b476", + "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27", "type": "github" }, "original": { @@ -1461,6 +1492,7 @@ "home-manager": "home-manager_2", "home-manager-unstable": "home-manager-unstable", "hyprland-git": "hyprland-git", + "hyprland-plugins": "hyprland-plugins", "iamb": "iamb", "mango": "mango", "microvm": "microvm_2", @@ -1480,11 +1512,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1772701851, - "narHash": "sha256-2g4Xg+w6wx2ewn1Tv576RzDc6Uof99H8kofHWdJktEs=", + "lastModified": 1772366660, + "narHash": "sha256-UfVF6W3LKSl+KMM510AXrGOdOdkU0PTZd3xyee14iRc=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "2a8f00fb9344cc6701063192fe0aaf66ecf9d337", + "rev": "566fe415d158452c72feb026f43e8d81e249ccb0", "type": "github" }, "original": { @@ -1615,11 +1647,11 @@ ] }, "locked": { - "lastModified": 1772494187, - "narHash": "sha256-6ksgNAFXVK+Cg/6ww7bB2nJUPZlnS75UwZC7G+L03EE=", + "lastModified": 1772392844, + "narHash": "sha256-jG6LoavnG1iVPXo9EGrvZoP4cgcXnsXXSydC6wKPihY=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "915ab06b046d05613041780c575c62a32fe67cea", + "rev": "74d7bb896e98cc3e87e7d0064a968f196fccaa90", "type": "github" }, "original": { @@ -1810,11 +1842,11 @@ ] }, "locked": { - "lastModified": 1772772172, - "narHash": "sha256-OCEb6jXTvhnMTMqMLleYChekDO/zh+VtunBAS0WevPM=", + "lastModified": 1772426935, + "narHash": "sha256-fLxV/FzP06eaoMFzwrnKk9x0b+kaNNjbFfp6+rsRKGs=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "5f8f34c0dd56808ecbfa35697353c455e4a416b3", + "rev": "6caef0bf5e38a793fd269333f000b7299b160900", "type": "github" }, "original": { From 9de130a5c046d1ef5b2604786b1aaf37421528fc Mon Sep 17 00:00:00 2001 From: foxora Date: Wed, 11 Mar 2026 13:58:40 +0000 Subject: [PATCH 09/59] updated flake.lock --- flake.lock | 238 +++++++++++++++-------------------- homes/aurora/default.nix | 2 - hosts/nixarawrui/default.nix | 4 +- 3 files changed, 104 insertions(+), 140 deletions(-) diff --git a/flake.lock b/flake.lock index 72140fa..a930bc1 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1765900596, - "narHash": "sha256-+hn8v9jkkLP9m+o0Nm5SiEq10W0iWDSotH2XfjU45fA=", + "lastModified": 1772292445, + "narHash": "sha256-4F1Q7U313TKUDDovCC96m/Za4wZcJ3yqtu4eSrj8lk8=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "d83c97f8f5c0aae553c1489c7d9eff3eadcadace", + "rev": "1dbbba659c1cef0b0202ce92cadfe13bae550e8f", "type": "github" }, "original": { @@ -98,11 +98,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1772422417, - "narHash": "sha256-TyLPxtYIhHP7QNwVwrDRxaj+XKorVOyA4EKhRjpBI8U=", + "lastModified": 1773166308, + "narHash": "sha256-fkJEQ1rbt/lqsA0+D3+LWtCok9Ofsz8dKDCnbt1MvOs=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "8ff8842cf58569ebe830f37350c6f1602fa35c39", + "rev": "2396c36f247f4c1e08f3ffd953b7b958d044e224", "type": "github" }, "original": { @@ -114,11 +114,11 @@ "cachyos-kernel": { "flake": false, "locked": { - "lastModified": 1772275362, - "narHash": "sha256-jIQpfzcPBXe1URbf82p/9JxJguZuZZBlMJnW1x7B5jE=", + "lastModified": 1773036026, + "narHash": "sha256-hRDSqn5jL0cq4aYTcAS61Jsw2DEqxHkAb01Cyu7jIDc=", "owner": "CachyOS", "repo": "linux-cachyos", - "rev": "4a363451cc86ff5304514c8bf25eac42eb46b8c8", + "rev": "dd72b90988e22422548f65e1ec8e2b52c8c7e35f", "type": "github" }, "original": { @@ -130,11 +130,11 @@ "cachyos-kernel-patches": { "flake": false, "locked": { - "lastModified": 1772269331, - "narHash": "sha256-DucfJqDGDO7PynT3sRuBfHw5jC0K2Oy0oqpJWueh4xw=", + "lastModified": 1773035489, + "narHash": "sha256-qsniqHnVIZdhGO6tYyugtWpOtdYofnUcpJAj6YAAvM4=", "owner": "CachyOS", "repo": "kernel-patches", - "rev": "6e2a0214de28cf0af1b72a2076bbfc77d12d96e8", + "rev": "d60f37176775b87d3300b333b39ae974adbda381", "type": "github" }, "original": { @@ -234,11 +234,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1772435729, - "narHash": "sha256-7Ln7IuX8nMIqfiDcX8jYkEAsf9oW8GAirvlK5SBPsds=", + "lastModified": 1773213034, + "narHash": "sha256-XX02kIGvcsVZKiRwr3COkBIZ5s+TP9gfRkW2Oad6hqE=", "owner": "nix-community", "repo": "fenix", - "rev": "ec69754e35f5b0088645a69e486ac00e90217757", + "rev": "42f953f569ac5761b197ca51c25cf1f9ceb78448", "type": "github" }, "original": { @@ -320,15 +320,15 @@ "flake-compat_4": { "flake": false, "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", - "owner": "edolstra", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "NixOS", "repo": "flake-compat", "type": "github" } @@ -411,11 +411,11 @@ "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { - "lastModified": 1769996383, - "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", + "lastModified": 1772408722, + "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", + "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", "type": "github" }, "original": { @@ -489,11 +489,11 @@ ] }, "locked": { - "lastModified": 1772380125, - "narHash": "sha256-8C+y46xA9bxcchj9GeDPJaRUDApaA3sy2fhJr1bTbUw=", + "lastModified": 1772985280, + "narHash": "sha256-FdrNykOoY9VStevU4zjSUdvsL9SzJTcXt4omdEDZDLk=", "owner": "nix-community", "repo": "home-manager", - "rev": "a07a44a839eb036e950bf397d9b782916f8dcab3", + "rev": "8f736f007139d7f70752657dff6a401a585d6cbc", "type": "github" }, "original": { @@ -510,11 +510,11 @@ ] }, "locked": { - "lastModified": 1772380461, - "narHash": "sha256-O3ukj3Bb3V0Tiy/4LUfLlBpWypJ9P0JeUgsKl2nmZZY=", + "lastModified": 1773179137, + "narHash": "sha256-EdW2bwzlfme0vbMOcStnNmKlOAA05Bp6su2O8VLGT0k=", "owner": "nix-community", "repo": "home-manager", - "rev": "f140aa04d7d14f8a50ab27f3691b5766b17ae961", + "rev": "3f98e2bbc661ec0aaf558d8a283d6955f05f1d09", "type": "github" }, "original": { @@ -531,11 +531,11 @@ ] }, "locked": { - "lastModified": 1772380125, - "narHash": "sha256-8C+y46xA9bxcchj9GeDPJaRUDApaA3sy2fhJr1bTbUw=", + "lastModified": 1772985280, + "narHash": "sha256-FdrNykOoY9VStevU4zjSUdvsL9SzJTcXt4omdEDZDLk=", "owner": "nix-community", "repo": "home-manager", - "rev": "a07a44a839eb036e950bf397d9b782916f8dcab3", + "rev": "8f736f007139d7f70752657dff6a401a585d6cbc", "type": "github" }, "original": { @@ -611,11 +611,11 @@ ] }, "locked": { - "lastModified": 1763733840, - "narHash": "sha256-JnET78yl5RvpGuDQy3rCycOCkiKoLr5DN1fPhRNNMco=", + "lastModified": 1770511807, + "narHash": "sha256-suKmSbSk34uPOJDTg/GbPrKEJutzK08vj0VoTvAFBCA=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "8f1bec691b2d198c60cccabca7a94add2df4ed1a", + "rev": "7c75487edd43a71b61adb01cae8326d277aab683", "type": "github" }, "original": { @@ -643,17 +643,16 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1766604420, - "narHash": "sha256-2Kqg1YNtjPGXc1DIzBeESL8hiuUNUn3c3Oimab19Zn8=", + "lastModified": 1773171407, + "narHash": "sha256-mtSDWOrekyWpJnuPu4uFxqOfSvsow74mmCm3PffqRTE=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "25250527793eb04bb60f103abe7f06370b9f6e1c", + "rev": "0e083e886f02034c56b851649a6c27f55fe85e32", "type": "github" }, "original": { "owner": "hyprwm", "repo": "Hyprland", - "rev": "25250527793eb04bb60f103abe7f06370b9f6e1c", "type": "github" } }, @@ -690,11 +689,11 @@ ] }, "locked": { - "lastModified": 1765643131, - "narHash": "sha256-CCGohW5EBIRy4B7vTyBMqPgsNcaNenVad/wszfddET0=", + "lastModified": 1767023960, + "narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "e50ae912813bdfa8372d62daf454f48d6df02297", + "rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660", "type": "github" }, "original": { @@ -703,36 +702,6 @@ "type": "github" } }, - "hyprland-plugins": { - "inputs": { - "hyprland": [ - "hyprland-git" - ], - "nixpkgs": [ - "hyprland-plugins", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland-plugins", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1771865848, - "narHash": "sha256-xwNa+1D8WPsDnJtUofDrtyDCZKZotbUymzV/R5s+M0I=", - "owner": "hyprwm", - "repo": "hyprland-plugins", - "rev": "b85a56b9531013c79f2f3846fd6ee2ff014b8960", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-plugins", - "type": "github" - } - }, "hyprland-protocols": { "inputs": { "nixpkgs": [ @@ -774,11 +743,11 @@ ] }, "locked": { - "lastModified": 1764612430, - "narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=", + "lastModified": 1771866172, + "narHash": "sha256-fYFoXhQLrm1rD8vSFKQBOEX4OGCuJdLt1amKfHd5GAw=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "0d00dc118981531aa731150b6ea551ef037acddd", + "rev": "0b219224910e7642eb0ed49f0db5ec3d008e3e41", "type": "github" }, "original": { @@ -851,11 +820,11 @@ ] }, "locked": { - "lastModified": 1766160771, - "narHash": "sha256-roINUGikWRqqgKrD4iotKbGj3ZKJl3hjMz5l/SyKrHw=", + "lastModified": 1771271487, + "narHash": "sha256-41gEiUS0Pyw3L/ge1l8MXn61cK14VAhgWB/JV8s/oNI=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "5ac060bfcf2f12b3a6381156ebbc13826a05b09f", + "rev": "340a792e3b3d482c4ae5f66d27a9096bdee6d76d", "type": "github" }, "original": { @@ -876,11 +845,11 @@ ] }, "locked": { - "lastModified": 1763640274, - "narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=", + "lastModified": 1770501770, + "narHash": "sha256-NWRM6+YxTRv+bT9yvlhhJ2iLae1B1pNH3mAL5wi2rlQ=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671", + "rev": "0bd8b6cde9ec27d48aad9e5b4deefb3746909d40", "type": "github" }, "original": { @@ -905,11 +874,11 @@ ] }, "locked": { - "lastModified": 1766253200, - "narHash": "sha256-26qPwrd3od+xoYVywSB7hC2cz9ivN46VPLlrsXyGxvE=", + "lastModified": 1771606233, + "narHash": "sha256-F3PLUqQ/TwgR70U+UeOqJnihJZ2EuunzojYC4g5xHr0=", "owner": "hyprwm", "repo": "hyprwire", - "rev": "1079777525b30a947c8d657fac158e00ae85de9d", + "rev": "06c7f1f8c4194786c8400653c4efc49dc14c0f3a", "type": "github" }, "original": { @@ -1035,11 +1004,11 @@ "scenefx": "scenefx" }, "locked": { - "lastModified": 1772456032, - "narHash": "sha256-QSbTGcfBlcjFYNvxhbV8DDMLP9CEfJJOEckJL34+T48=", + "lastModified": 1773112723, + "narHash": "sha256-MXCXjnGPE+wagrHR8cxGTDhJO4xYp+aBQPApV3JG9XY=", "owner": "DreamMaoMao", "repo": "mangowc", - "rev": "46e867deb9dfd58abb22ec92b19461d3761b1f3d", + "rev": "1fc89d01eb5aa0f3784fb4006bf9af47826444d2", "type": "github" }, "original": { @@ -1057,11 +1026,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1772338235, - "narHash": "sha256-9XcwtSIL/c+pkC3SBNuxCJuSktFOBV1TLvvkhekyB8I=", + "lastModified": 1773018425, + "narHash": "sha256-fpgZBmZpKoEXEowBK/6m8g9FcOLWQ4UxhXHqCw2CpSM=", "owner": "microvm-nix", "repo": "microvm.nix", - "rev": "9d1ff9b53532908a5eba7707931c9093508b6b92", + "rev": "25ebda3c558e923720c965832dc9a04f559a055c", "type": "github" }, "original": { @@ -1078,11 +1047,11 @@ "spectrum": "spectrum_2" }, "locked": { - "lastModified": 1772338235, - "narHash": "sha256-9XcwtSIL/c+pkC3SBNuxCJuSktFOBV1TLvvkhekyB8I=", + "lastModified": 1773018425, + "narHash": "sha256-fpgZBmZpKoEXEowBK/6m8g9FcOLWQ4UxhXHqCw2CpSM=", "owner": "microvm-nix", "repo": "microvm.nix", - "rev": "9d1ff9b53532908a5eba7707931c9093508b6b92", + "rev": "25ebda3c558e923720c965832dc9a04f559a055c", "type": "github" }, "original": { @@ -1269,11 +1238,11 @@ ] }, "locked": { - "lastModified": 1772266502, - "narHash": "sha256-HBO3W1ooO9UwmxwwwFflnbCrAVHhaxpB8YnxFGPvOsY=", + "lastModified": 1773217223, + "narHash": "sha256-nuJm0CAgTFHQr900Euks0iTjcI5zagGfJTzeCEk3W8g=", "owner": "FlameFlag", "repo": "nixcord", - "rev": "e805e50f0cc8b9f2d950dc81cd9ee1c986899eaf", + "rev": "41d6b20512a433203018777b630853c96b0294f8", "type": "github" }, "original": { @@ -1284,11 +1253,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1772402963, - "narHash": "sha256-+MupheX+ghNTSAg1XNppNApDC+FvvgpUXyU6sJSIsJo=", + "lastModified": 1773148319, + "narHash": "sha256-Yr9ej3uSDycQZHWB5HslVgryLkdSBN2fODAqURv/1wQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d41521c807dccb71b1b866ac3b7df5a59e726d9d", + "rev": "8da79c289ee165139257335eab0733d98c4ad458", "type": "github" }, "original": { @@ -1330,11 +1299,11 @@ }, "nixpkgs-lib_3": { "locked": { - "lastModified": 1769909678, - "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=", + "lastModified": 1772328832, + "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "72716169fe93074c333e8d0173151350670b824c", + "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742", "type": "github" }, "original": { @@ -1345,11 +1314,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1772458868, - "narHash": "sha256-vnqeYbLjtEubh0vDLAxYl+STQ0XAINWdwzipH9sL7k8=", + "lastModified": 1773235564, + "narHash": "sha256-ThPD82jzDYAo5wJ/eR6Nlc40vX0hsIswnessyj4rX2k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6896fd3d7f8a7cdd79d2a8355ce0d79db18dc875", + "rev": "f6b3c6a254a012c45a3d7dbf327e223737278b89", "type": "github" }, "original": { @@ -1361,11 +1330,11 @@ }, "nixpkgs-staging": { "locked": { - "lastModified": 1772453524, - "narHash": "sha256-2VR3/3A0mD42BYh6mNkxJ3W4qSy6mxa7Q84S4bR0VrA=", + "lastModified": 1773231167, + "narHash": "sha256-TNbxZRJ8cq6ElBfgwEChMNWG/8jx3+W4d1l1BqKwmxY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0d1bb154f92b51fa8d6fd6323dd60e4d70eb5e57", + "rev": "cddc12f674927875907317b9e22833a4e9261707", "type": "github" }, "original": { @@ -1377,11 +1346,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1772198003, - "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=", + "lastModified": 1772963539, + "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61", + "rev": "9dcb002ca1690658be4a04645215baea8b95f31d", "type": "github" }, "original": { @@ -1409,11 +1378,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1772047000, - "narHash": "sha256-7DaQVv4R97cii/Qdfy4tmDZMB2xxtyIvNGSwXBBhSmo=", + "lastModified": 1773068389, + "narHash": "sha256-vMrm7Pk2hjBRPnCSjhq1pH0bg350Z+pXhqZ9ICiqqCs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1267bb4920d0fc06ea916734c11b0bf004bbe17e", + "rev": "44bae273f9f82d480273bab26f5c50de3724f52f", "type": "github" }, "original": { @@ -1453,11 +1422,11 @@ ] }, "locked": { - "lastModified": 1765911976, - "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=", + "lastModified": 1772024342, + "narHash": "sha256-+eXlIc4/7dE6EcPs9a2DaSY3fTA9AE526hGqkNID3Wg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27", + "rev": "6e34e97ed9788b17796ee43ccdbaf871a5c2b476", "type": "github" }, "original": { @@ -1492,7 +1461,6 @@ "home-manager": "home-manager_2", "home-manager-unstable": "home-manager-unstable", "hyprland-git": "hyprland-git", - "hyprland-plugins": "hyprland-plugins", "iamb": "iamb", "mango": "mango", "microvm": "microvm_2", @@ -1512,11 +1480,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1772366660, - "narHash": "sha256-UfVF6W3LKSl+KMM510AXrGOdOdkU0PTZd3xyee14iRc=", + "lastModified": 1773182115, + "narHash": "sha256-m3tXlrz8qG9IXPvhImtLyKUbsSXx46HFbzNFNlbwPno=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "566fe415d158452c72feb026f43e8d81e249ccb0", + "rev": "e0269ce3f2ff14bdf220e7bdf12e80f4431897a1", "type": "github" }, "original": { @@ -1608,11 +1576,11 @@ "spectrum": { "flake": false, "locked": { - "lastModified": 1759482047, - "narHash": "sha256-H1wiXRQHxxPyMMlP39ce3ROKCwI5/tUn36P8x6dFiiQ=", + "lastModified": 1772189877, + "narHash": "sha256-i1p90Rgssb//aNiTDFq46ZG/fk3LmyRLChtp/9lddyA=", "ref": "refs/heads/main", - "rev": "c5d5786d3dc938af0b279c542d1e43bce381b4b9", - "revCount": 996, + "rev": "fe39e122d898f66e89ffa17d4f4209989ccb5358", + "revCount": 1255, "type": "git", "url": "https://spectrum-os.org/git/spectrum" }, @@ -1624,11 +1592,11 @@ "spectrum_2": { "flake": false, "locked": { - "lastModified": 1759482047, - "narHash": "sha256-H1wiXRQHxxPyMMlP39ce3ROKCwI5/tUn36P8x6dFiiQ=", + "lastModified": 1772189877, + "narHash": "sha256-i1p90Rgssb//aNiTDFq46ZG/fk3LmyRLChtp/9lddyA=", "ref": "refs/heads/main", - "rev": "c5d5786d3dc938af0b279c542d1e43bce381b4b9", - "revCount": 996, + "rev": "fe39e122d898f66e89ffa17d4f4209989ccb5358", + "revCount": 1255, "type": "git", "url": "https://spectrum-os.org/git/spectrum" }, @@ -1647,11 +1615,11 @@ ] }, "locked": { - "lastModified": 1772392844, - "narHash": "sha256-jG6LoavnG1iVPXo9EGrvZoP4cgcXnsXXSydC6wKPihY=", + "lastModified": 1773161309, + "narHash": "sha256-k2Un0blYBeoN8mB5HO4rqCKISb427IWy0fzCdCUIcio=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "74d7bb896e98cc3e87e7d0064a968f196fccaa90", + "rev": "61df7293cf732c7b66cce7f8b46f7017e721a6cd", "type": "github" }, "original": { @@ -1842,11 +1810,11 @@ ] }, "locked": { - "lastModified": 1772426935, - "narHash": "sha256-fLxV/FzP06eaoMFzwrnKk9x0b+kaNNjbFfp6+rsRKGs=", + "lastModified": 1773225617, + "narHash": "sha256-IT0n3jJgf4M7U0EuZJ2XJwXBmSJVVK3auqWDGeHGMzY=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "6caef0bf5e38a793fd269333f000b7299b160900", + "rev": "413a22ab7acf848ed4e20c3f47ea96ccd4788518", "type": "github" }, "original": { diff --git a/homes/aurora/default.nix b/homes/aurora/default.nix index b99521c..c17f1a7 100644 --- a/homes/aurora/default.nix +++ b/homes/aurora/default.nix @@ -86,7 +86,6 @@ # fonts nerd-fonts.departure-mono # pretty pixel art font i love!! x3 nerd-fonts.jetbrains-mono - noto-fonts # cli / tui tools and commands! eza # replaces: ls (rust) @@ -319,7 +318,6 @@ zen-browser = { enable = true; package = inputs.zen.packages.${system}.twilight; - suppressXdgMigrationWarning = true; }; mpv = { diff --git a/hosts/nixarawrui/default.nix b/hosts/nixarawrui/default.nix index 3d2ccf2..c8dc086 100644 --- a/hosts/nixarawrui/default.nix +++ b/hosts/nixarawrui/default.nix @@ -22,9 +22,7 @@ # kernelPackages = upkgs.cachyosKernels.linuxPackages-cachyos-latest-lto-x86_64-v4; # TODO: idk make this a toggle or smth idfk - # kernelPackages = upkgs.linuxPackages_zen; - # FIX: kernel bug - kernelPackages = upkgs.linuxPackages_6_12; + kernelPackages = upkgs.linuxPackages_zen; kernelModules = ["v4l2loopback"]; kernelParams = [ # force kernel to use dGPU From b7d04fb7cca031ee031250e44bc62fcfe57eba04 Mon Sep 17 00:00:00 2001 From: foxora Date: Wed, 11 Mar 2026 15:24:01 +0000 Subject: [PATCH 10/59] enabled hw cursors in hyprland again <3 --- homes/modules/wm/hyprland/hyprland.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homes/modules/wm/hyprland/hyprland.nix b/homes/modules/wm/hyprland/hyprland.nix index 5cd6dc7..6cf6034 100644 --- a/homes/modules/wm/hyprland/hyprland.nix +++ b/homes/modules/wm/hyprland/hyprland.nix @@ -107,7 +107,7 @@ force_no_accel = false; # not recommended to turn on }; - cursor.no_hardware_cursors = true; + # cursor.no_hardware_cursors = true; misc = { enable_anr_dialog = false; From 83bee06352ba1a0d2f7cb0cdb9e6463fb87a0eee Mon Sep 17 00:00:00 2001 From: foxora Date: Fri, 13 Mar 2026 08:31:19 +0000 Subject: [PATCH 11/59] added wormhole-rs --- homes/aurora/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/homes/aurora/default.nix b/homes/aurora/default.nix index c17f1a7..7cfee3f 100644 --- a/homes/aurora/default.nix +++ b/homes/aurora/default.nix @@ -110,6 +110,7 @@ pastel # color generator / manipulator :3 i love colors!! <3 eva # calculator repl silicon # makes pretty images of code :3 + wormhole-rs # send people stuff!! :3 # cli fun pokeget-rs # prints a random pokemon to the terminal :3 From 3ebf01c47e2d5f534da22fa0637ce254edf77ffa Mon Sep 17 00:00:00 2001 From: foxora Date: Fri, 13 Mar 2026 18:22:44 +0000 Subject: [PATCH 12/59] made smol changes :3 --- groups/all/default.nix | 2 +- homes/modules/shell/zsh.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/groups/all/default.nix b/groups/all/default.nix index 3f035f8..dda6503 100644 --- a/groups/all/default.nix +++ b/groups/all/default.nix @@ -1,6 +1,6 @@ {...}: { nix.settings = { - experimental-features = ["nix-command" "flakes"]; + experimental-features = ["nix-command" "flakes" "pipe-operators"]; download-buffer-size = 524288000; }; } diff --git a/homes/modules/shell/zsh.nix b/homes/modules/shell/zsh.nix index db2c986..a4758ec 100644 --- a/homes/modules/shell/zsh.nix +++ b/homes/modules/shell/zsh.nix @@ -56,7 +56,7 @@ # open nix develop with preferred shell # description: nd = nix develop - nd = "nix develop -c $SHELL"; + nd = "./flake.sh -c $SHELL || nix develop -c $SHELL"; # description: cdns = change directory [to] nix settings cdns = "cd ~/.nix"; From 9c22f23bc001b6d00ca11d3b315ab28a239f62e0 Mon Sep 17 00:00:00 2001 From: foxora Date: Fri, 13 Mar 2026 23:19:37 +0000 Subject: [PATCH 13/59] realised that rustfmt nightly is in nixpkgs already lol :3 --- flake.nix | 5 ----- homes/modules/programs/neovim/nixcats.nix | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index c8d8688..3de00a2 100644 --- a/flake.nix +++ b/flake.nix @@ -85,11 +85,6 @@ }; }; - fenix = { - url = "github:nix-community/fenix"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; - }; - # temp theme until i bother creating my own Date: Sat, 14 Mar 2026 08:23:23 +0000 Subject: [PATCH 14/59] forgot to push flake.lock when removing fenix :3 --- flake.lock | 43 ++----------------------------------------- 1 file changed, 2 insertions(+), 41 deletions(-) diff --git a/flake.lock b/flake.lock index a930bc1..521a902 100644 --- a/flake.lock +++ b/flake.lock @@ -227,33 +227,12 @@ } }, "fenix": { - "inputs": { - "nixpkgs": [ - "nixpkgs-unstable" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1773213034, - "narHash": "sha256-XX02kIGvcsVZKiRwr3COkBIZ5s+TP9gfRkW2Oad6hqE=", - "owner": "nix-community", - "repo": "fenix", - "rev": "42f953f569ac5761b197ca51c25cf1f9ceb78448", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, - "fenix_2": { "inputs": { "nixpkgs": [ "iamb", "nixpkgs" ], - "rust-analyzer-src": "rust-analyzer-src_2" + "rust-analyzer-src": "rust-analyzer-src" }, "locked": { "lastModified": 1760510549, @@ -890,7 +869,7 @@ "iamb": { "inputs": { "crane": "crane", - "fenix": "fenix_2", + "fenix": "fenix", "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs-unstable" @@ -1457,7 +1436,6 @@ "awww": "awww", "cachyos": "cachyos", "cerulean": "cerulean", - "fenix": "fenix", "home-manager": "home-manager_2", "home-manager-unstable": "home-manager-unstable", "hyprland-git": "hyprland-git", @@ -1478,23 +1456,6 @@ } }, "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1773182115, - "narHash": "sha256-m3tXlrz8qG9IXPvhImtLyKUbsSXx46HFbzNFNlbwPno=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "e0269ce3f2ff14bdf220e7bdf12e80f4431897a1", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, - "rust-analyzer-src_2": { "flake": false, "locked": { "lastModified": 1760457219, From c2a581e1be92ecf4291cf7450d55ab22f5c5706a Mon Sep 17 00:00:00 2001 From: foxora Date: Sat, 14 Mar 2026 22:09:13 +0000 Subject: [PATCH 15/59] neovim: added gitsigns, moved color stuff into colors.lua, modified telescope and fyler --- homes/modules/programs/neovim/init.lua | 72 +----- homes/modules/programs/neovim/lua/colors.lua | 220 ++++++++++++++++++ .../programs/neovim/lua/lsp/capabilities.lua | 2 +- .../programs/neovim/lua/plugins/fyler.lua | 4 +- .../programs/neovim/lua/plugins/git.lua | 45 +++- .../programs/neovim/lua/plugins/telescope.lua | 15 ++ homes/modules/programs/neovim/nixcats.nix | 18 +- .../wallust/templates/neovim-template | 2 +- 8 files changed, 296 insertions(+), 82 deletions(-) create mode 100644 homes/modules/programs/neovim/lua/colors.lua diff --git a/homes/modules/programs/neovim/init.lua b/homes/modules/programs/neovim/init.lua index 98013ef..139ac3e 100644 --- a/homes/modules/programs/neovim/init.lua +++ b/homes/modules/programs/neovim/init.lua @@ -7,6 +7,7 @@ vim.opt.colorcolumn = "80" require("plugins") require("lsp") +require("colors") vim.keymap.set("n", "", function() vim.cmd("wincmd h") @@ -20,74 +21,3 @@ end) vim.keymap.set("n", "", function() vim.cmd("wincmd l") end) - -local uv = vim.loop -local colorscheme_filepath = "/home/aurora/.cache/nvim/neovim-colors" -local colors = {} - --- function to load colors -local function load_colors() - local new_colors = {} - for line in io.lines(colorscheme_filepath) do - table.insert(new_colors, line) - end - - -- ensure the table has enough entries to avoid indexing issues - if #new_colors >= 18 then - colors = new_colors - require("base16-colorscheme").setup({ - base00 = colors[17], - base01 = colors[1], - base02 = colors[3], - base03 = colors[3], - base04 = colors[5], - base05 = colors[8], - base06 = colors[5], - base07 = colors[8], - base08 = colors[18], - base09 = colors[4], - base0A = colors[11], - base0B = colors[5], - base0C = colors[6], - base0D = colors[7], - base0E = colors[6], - base0F = colors[16], - }) - - -- set colors for blink.cmp's completion menu - vim.api.nvim_set_hl(0, "BlinkCmpMenu", { bg = colors[17] }) - vim.api.nvim_set_hl(0, "BlinkCmpMenuBorder", { bg = colors[17], fg = colors[13] }) - vim.api.nvim_set_hl(0, "BlinkCmpMenuSelection", { bg = colors[15], fg = colors[17] }) - vim.api.nvim_set_hl(0, "BlinkCmpScrollBarThumb", { bg = colors[18] }) - vim.api.nvim_set_hl(0, "BlinkCmpKind", { bg = colors[17], fg = colors[14] }) - vim.api.nvim_set_hl(0, "BlinkCmpLabel", { bg = colors[17], fg = colors[18] }) - vim.api.nvim_set_hl(0, "BlinkCmpLabelMatch", { bg = colors[17], fg = colors[18] }) - vim.api.nvim_set_hl(0, "BlinkCmpLabelDetail", { bg = colors[17], fg = colors[18] }) - vim.api.nvim_set_hl(0, "BlinkCmpLabelDescription", { bg = colors[17], fg = colors[18] }) - else - print("Error: Not enough colors in file") - end -end - --- initial load -load_colors() - --- vim.defer_fn(load_colors, 1) - --- set up a file watcher -local function watch_colorscheme() - local handle - handle = uv.new_fs_event() - if handle then - uv.fs_event_start(handle, colorscheme_filepath, {}, function(err, _, _) - if err then - print("Error watching colorscheme file:", err) - return - end - -- debounce by adding a slight delay before reloading - vim.defer_fn(load_colors, 100) - end) - end -end - -watch_colorscheme() diff --git a/homes/modules/programs/neovim/lua/colors.lua b/homes/modules/programs/neovim/lua/colors.lua new file mode 100644 index 0000000..c60c55e --- /dev/null +++ b/homes/modules/programs/neovim/lua/colors.lua @@ -0,0 +1,220 @@ +local colorscheme_filepath = "/home/aurora/.cache/nvim/neovim-colors" +local colors = {} + +local function hex_to_int(hex) + hex = hex:gsub("#", "") + return tonumber(hex:sub(1, 2), 16) * 0x10000 + tonumber(hex:sub(3, 4), 16) * 0x100 + tonumber(hex:sub(5, 6), 16) +end + +-- TODO: change to use lab color space +local function blend_colors(c1, c2, t) + local r1 = math.floor(c1 / 0x10000) + local g1 = math.floor((c1 % 0x10000) / 0x100) + local b1 = c1 % 0x100 + + local r2 = math.floor(c2 / 0x10000) + local g2 = math.floor((c2 % 0x10000) / 0x100) + local b2 = c2 % 0x100 + + return math.floor(r1 + (r2 - r1) * t) * 0x10000 + + math.floor(g1 + (g2 - g1) * t) * 0x100 + + math.floor(b1 + (b2 - b1) * t) +end + +-- function to load colors +local function load_colors() + local new_colors = {} + for line in io.lines(colorscheme_filepath) do + table.insert(new_colors, line) + end + + -- ensure the table has enough entries to avoid indexing issues + if #new_colors == 18 then + colors = new_colors + require("base16-colorscheme").setup({ + base00 = colors[18], + base01 = colors[1], + base02 = colors[3], + base03 = colors[3], + base04 = colors[5], + base05 = colors[8], + base06 = colors[5], + base07 = colors[8], + base08 = colors[17], + base09 = colors[4], + base0A = colors[11], + base0B = colors[5], + base0C = colors[6], + base0D = colors[7], + base0E = colors[6], + base0F = colors[16], + }) + + -- colors ------------------------------------------------------------------ + + local color_00 = colors[1] + local color_01 = colors[2] + local color_02 = colors[3] + local color_03 = colors[4] + local color_04 = colors[5] + local color_05 = colors[6] + local color_06 = colors[7] + local color_07 = colors[8] + + local color_08 = colors[9] + local color_09 = colors[10] + local color_10 = colors[11] + local color_11 = colors[12] + local color_12 = colors[13] + local color_13 = colors[14] + local color_14 = colors[15] + local color_15 = colors[16] + + local fg = colors[17] + local bg = colors[18] + + local bg_90 = blend_colors(hex_to_int("#000000"), hex_to_int(bg), 0.90) + + -- blink.cmp --------------------------------------------------------------- + + vim.api.nvim_set_hl(0, "BlinkCmpMenu", { bg = bg }) + vim.api.nvim_set_hl(0, "BlinkCmpMenuBorder", { fg = color_12, bg = bg }) + vim.api.nvim_set_hl(0, "BlinkCmpMenuSelection", { fg = bg, bg = color_14 }) + vim.api.nvim_set_hl(0, "BlinkCmpScrollBarThumb", { bg = fg }) + vim.api.nvim_set_hl(0, "BlinkCmpKind", { fg = fg, bg = bg }) + vim.api.nvim_set_hl(0, "BlinkCmpLabel", { fg = fg, bg = bg }) + vim.api.nvim_set_hl(0, "BlinkCmpLabelMatch", { fg = fg, bg = bg }) + vim.api.nvim_set_hl(0, "BlinkCmpLabelDetail", { fg = fg, bg = bg }) + vim.api.nvim_set_hl(0, "BlinkCmpLabelDescription", { fg = fg, bg = bg }) + + -- telescope :3 ------------------------------------------------------------ + + vim.api.nvim_set_hl(0, "TelescopeNormal", { bg = bg_90 }) + vim.api.nvim_set_hl(0, "TelescopePromptNormal", { bg = bg_90 }) + vim.api.nvim_set_hl(0, "TelescopeResultsNormal", { bg = bg_90 }) + vim.api.nvim_set_hl(0, "TelescopePreviewNormal", { bg = bg_90 }) + + vim.api.nvim_set_hl(0, "TelescopeBorder", { fg = color_15, bg = bg_90 }) + vim.api.nvim_set_hl(0, "TelescopePromptBorder", { fg = color_14, bg = bg_90 }) + vim.api.nvim_set_hl(0, "TelescopeResultsBorder", { fg = color_13, bg = bg_90 }) + vim.api.nvim_set_hl(0, "TelescopePreviewBorder", { fg = color_12, bg = bg_90 }) + + vim.api.nvim_set_hl(0, "TelescopePromptTitle", { fg = color_15, bg = bg_90 }) + vim.api.nvim_set_hl(0, "TelescopeResultsTitle", { fg = color_15, bg = bg_90 }) + vim.api.nvim_set_hl(0, "TelescopePreviewTitle", { fg = color_15, bg = bg_90 }) + + vim.api.nvim_set_hl(0, "TelescopePromptPrefix", { fg = color_14, bg = bg_90 }) + vim.api.nvim_set_hl(0, "TelescopePromptCounter", { fg = color_13, bg = bg_90 }) + + -- gitsigns.nvim ----------------------------------------------------------- + + vim.api.nvim_set_hl(0, "GitSignsAdd", { fg = color_13 }) + vim.api.nvim_set_hl(0, "GitSignsChange", { fg = color_11 }) + vim.api.nvim_set_hl(0, "GitSignsDelete", { fg = color_09 }) + + local blame_palette = { + color_13, + color_11, + color_09, + color_06, + color_05, + color_04, + color_03, + color_12, + } + + local blame_group = vim.api.nvim_create_augroup("GitSignsBlameColors", { clear = true }) + + local function get_heatmap_palette() + local c1 = hex_to_int(color_13) -- old + local c2 = hex_to_int(color_14) -- recent + + local palette = {} + for i = 0, 7 do + palette[i] = blend_colors(c1, c2, i / 7) + end + + return palette + end + + local heatmap_palette = get_heatmap_palette() + + local function set_blame_colors() + local highlights = vim.api.nvim_exec2("highlight", { output = true }).output + + local i = 1 + for hl_name in highlights:gmatch("(GitSignsBlameColor%.[%x]+)") do + local color = blame_palette[(i - 1) % #blame_palette + 1] + vim.api.nvim_set_hl(0, hl_name, { fg = color }) + i = i + 1 + end + + i = 1 + for hl_name in highlights:gmatch("(GitSignsColorTemp%.fg%.[%d]+)") do + local color = heatmap_palette[(i - 1) % #heatmap_palette + 1] + vim.api.nvim_set_hl(0, hl_name, { fg = color }) + i = i + 1 + end + end + + set_blame_colors() + + vim.api.nvim_create_autocmd("FileType", { + group = blame_group, + pattern = "gitsigns-blame", + callback = function() + set_blame_colors() + end, + }) + + -- fyler.nvim -------------------------------------------------------------- + + vim.api.nvim_set_hl(0, "FylerBlue", { fg = color_06 }) + vim.api.nvim_set_hl(0, "FylerGreen", { fg = color_02 }) + vim.api.nvim_set_hl(0, "FylerGrey", { fg = color_08 }) + vim.api.nvim_set_hl(0, "FylerRed", { fg = color_01 }) + vim.api.nvim_set_hl(0, "FylerYellow", { fg = color_03 }) + + vim.api.nvim_set_hl(0, "FylerFSDirectoryIcon", { fg = color_06 }) + vim.api.nvim_set_hl(0, "FylerFSDirectoryName", { fg = fg }) + vim.api.nvim_set_hl(0, "FylerFSFile", { fg = color_15 }) + vim.api.nvim_set_hl(0, "FylerFSLink", { fg = color_08 }) + + vim.api.nvim_set_hl(0, "FylerGitAdded", { fg = color_04 }) + vim.api.nvim_set_hl(0, "FylerGitConflict", { fg = color_03 }) + vim.api.nvim_set_hl(0, "FylerGitDeleted", { fg = color_03 }) + vim.api.nvim_set_hl(0, "FylerGitIgnored", { fg = color_08 }) + vim.api.nvim_set_hl(0, "FylerGitModified", { fg = color_05 }) + vim.api.nvim_set_hl(0, "FylerGitRenamed", { fg = color_05 }) + vim.api.nvim_set_hl(0, "FylerGitStaged", { fg = color_04 }) + vim.api.nvim_set_hl(0, "FylerGitUnstaged", { fg = color_05 }) + vim.api.nvim_set_hl(0, "FylerGitUntracked", { fg = color_06 }) + + vim.api.nvim_set_hl(0, "FylerWinPick", { fg = color_15, bg = fg }) + else + print("Error: Not enough colors in file") + end +end + +-- initial load +load_colors() + +-- vim.defer_fn(load_colors, 1) + +-- set up a file watcher +local function watch_colorscheme() + local handle + handle = vim.loop.new_fs_event() + if handle then + vim.loop.fs_event_start(handle, colorscheme_filepath, {}, function(err, _, _) + if err then + print("Error watching colorscheme file:", err) + return + end + -- debounce by adding a slight delay before reloading + vim.defer_fn(load_colors, 100) + end) + end +end + +watch_colorscheme() diff --git a/homes/modules/programs/neovim/lua/lsp/capabilities.lua b/homes/modules/programs/neovim/lua/lsp/capabilities.lua index 7e9957b..8f70f9f 100644 --- a/homes/modules/programs/neovim/lua/lsp/capabilities.lua +++ b/homes/modules/programs/neovim/lua/lsp/capabilities.lua @@ -38,7 +38,7 @@ function M.on_attach(_, bufnr) end -- TODO: someone who knows the builtin versions of these to do instead help me out please. nmap("D", vim.lsp.buf.type_definition, "Type [D]efinition") - nmap("e", vim.diagnostic.open_float, "Show [E]rror") + nmap("E", vim.diagnostic.open_float, "Show [E]rror") -- See `:help K` for why this keymap nmap("K", vim.lsp.buf.hover, "Hover Documentation") diff --git a/homes/modules/programs/neovim/lua/plugins/fyler.lua b/homes/modules/programs/neovim/lua/plugins/fyler.lua index 2737b78..023f7f3 100644 --- a/homes/modules/programs/neovim/lua/plugins/fyler.lua +++ b/homes/modules/programs/neovim/lua/plugins/fyler.lua @@ -4,12 +4,12 @@ return { cmd = { "Fyler" }, keys = { { - "tf", + "e", function() return require("fyler").toggle({ kind = "split_right" }) end, mode = { "n" }, - desc = "Open [F]yler", + desc = "Open File [E]xplorer (Fyler)", }, }, load = function(name) diff --git a/homes/modules/programs/neovim/lua/plugins/git.lua b/homes/modules/programs/neovim/lua/plugins/git.lua index c2250cc..c6deed8 100644 --- a/homes/modules/programs/neovim/lua/plugins/git.lua +++ b/homes/modules/programs/neovim/lua/plugins/git.lua @@ -1,12 +1,12 @@ return { { "vim-fugitive", - enabled = nixCats("git") or false, + enabled = nixCats("git.merge") or false, cmd = { "Git", "Gvdiffsplit" }, }, { "resolve-nvim", - enabled = nixCats("git") or false, + enabled = nixCats("git.merge") or false, event = { "BufReadPre", "BufNewFile" }, after = function(plugin) require("resolve").setup({ @@ -21,4 +21,45 @@ return { }) end, }, + { + "gitsigns.nvim", + enabled = nixCats("git.gitsigns") or false, + after = function(plugin) + require("gitsigns").setup({ + signs = { + add = { text = "┃" }, + change = { text = "┇" }, + delete = { text = "_" }, + topdelete = { text = "‾" }, + changedelete = { text = "~" }, + untracked = { text = "╎" }, + }, + signs_staged = { + add = { text = "┃" }, + change = { text = "┇" }, + delete = { text = "_" }, + topdelete = { text = "‾" }, + changedelete = { text = "~" }, + untracked = { text = "╎" }, + }, + on_attach = function(bufnr) + local gitsigns = require("gitsigns") + + -- toggle git blame + vim.keymap.set("n", "gb", function() + local wins = vim.api.nvim_list_wins() + for _, win in ipairs(wins) do + local buf = vim.api.nvim_win_get_buf(win) + local ft = vim.api.nvim_get_option_value("filetype", { buf = buf }) + if ft == "gitsigns-blame" then + vim.api.nvim_win_close(win, true) + return + end + end + vim.cmd("Gitsigns blame") + end) + end, + }) + end, + }, } diff --git a/homes/modules/programs/neovim/lua/plugins/telescope.lua b/homes/modules/programs/neovim/lua/plugins/telescope.lua index a61f19c..31a32cf 100644 --- a/homes/modules/programs/neovim/lua/plugins/telescope.lua +++ b/homes/modules/programs/neovim/lua/plugins/telescope.lua @@ -51,6 +51,14 @@ return { mode = { "n" }, desc = "[T]elescope search [B]uffers", }, + { + "th", + function() + return require("telescope.builtin").highlights() + end, + mode = { "n" }, + desc = "[T]elescope [H]ighlights", + }, }, load = function(name) vim.cmd.packadd(name) @@ -62,6 +70,13 @@ return { telescope.setup({ defaults = { + border = true, + borderchars = { "─", "│", "─", "│", "╭", "╮", "╯", "╰" }, + -- borderchars = { + -- prompt = { "─", " ", " ", " ", "─", "─", " ", " " }, + -- results = { " " }, + -- preview = { "─", "│", "─", "│", "╭", "╮", "╯", "╰" }, + -- }, mappings = { i = { [""] = actions.move_selection_previous, -- move to prev result diff --git a/homes/modules/programs/neovim/nixcats.nix b/homes/modules/programs/neovim/nixcats.nix index a996716..a43ef0e 100644 --- a/homes/modules/programs/neovim/nixcats.nix +++ b/homes/modules/programs/neovim/nixcats.nix @@ -162,10 +162,15 @@ in { comment = [ comment-nvim ]; - git = [ - resolve-nvim - vim-fugitive - ]; + git = { + merge = [ + resolve-nvim + vim-fugitive + ]; + gitsigns = [ + gitsigns-nvim + ]; + }; lang = { java = [ nvim-jdtls @@ -247,7 +252,10 @@ in { format = true; comment = true; - git = false; # not really setup yet + git = { + merge = false; # not really setup yet.. Date: Sat, 14 Mar 2026 22:18:57 +0000 Subject: [PATCH 16/59] changed how my nd alias works --- homes/modules/shell/zsh.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homes/modules/shell/zsh.nix b/homes/modules/shell/zsh.nix index a4758ec..add5626 100644 --- a/homes/modules/shell/zsh.nix +++ b/homes/modules/shell/zsh.nix @@ -56,7 +56,7 @@ # open nix develop with preferred shell # description: nd = nix develop - nd = "./flake.sh -c $SHELL || nix develop -c $SHELL"; + nd = "{ [[ -f ./flake.sh ]] && ./flake.sh -c $SHELL; } || nix develop -c $SHELL"; # description: cdns = change directory [to] nix settings cdns = "cd ~/.nix"; From dce5deac43dd2f1f8fa16285ff714f246d60629f Mon Sep 17 00:00:00 2001 From: foxora Date: Sat, 14 Mar 2026 23:57:49 +0000 Subject: [PATCH 17/59] added absolute line number for current line :3 --- homes/modules/programs/neovim/init.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/homes/modules/programs/neovim/init.lua b/homes/modules/programs/neovim/init.lua index 139ac3e..dfd7b01 100644 --- a/homes/modules/programs/neovim/init.lua +++ b/homes/modules/programs/neovim/init.lua @@ -2,6 +2,7 @@ vim.g.mapleader = " " vim.opt.termguicolors = true -- use terminal colors vim.opt.relativenumber = true +vim.opt.number = true vim.opt.wrap = false vim.opt.colorcolumn = "80" From 4b7a87f3020c5e1584074788d3b61a690a01ff6f Mon Sep 17 00:00:00 2001 From: foxora Date: Sun, 15 Mar 2026 02:09:48 +0000 Subject: [PATCH 18/59] updated nd alias, i love butterfly <3 --- homes/modules/shell/zsh.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homes/modules/shell/zsh.nix b/homes/modules/shell/zsh.nix index add5626..ab20164 100644 --- a/homes/modules/shell/zsh.nix +++ b/homes/modules/shell/zsh.nix @@ -56,7 +56,7 @@ # open nix develop with preferred shell # description: nd = nix develop - nd = "{ [[ -f ./flake.sh ]] && ./flake.sh -c $SHELL; } || nix develop -c $SHELL"; + nd = "[[ -f ./flake.sh ]] && ./flake.sh -c $SHELL || nix develop -c $SHELL"; # description: cdns = change directory [to] nix settings cdns = "cd ~/.nix"; From 65995c2245c9f2e2465bafc6be5127bc7e89750a Mon Sep 17 00:00:00 2001 From: foxora Date: Sun, 15 Mar 2026 19:29:57 +0000 Subject: [PATCH 19/59] added gitsigns keybinds --- .../programs/neovim/lua/plugins/git.lua | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/homes/modules/programs/neovim/lua/plugins/git.lua b/homes/modules/programs/neovim/lua/plugins/git.lua index c6deed8..5ce4395 100644 --- a/homes/modules/programs/neovim/lua/plugins/git.lua +++ b/homes/modules/programs/neovim/lua/plugins/git.lua @@ -58,6 +58,32 @@ return { end vim.cmd("Gitsigns blame") end) + + vim.keymap.set("n", "bl", gitsigns.toggle_current_line_blame) + + vim.keymap.set("n", "]c", function() + if vim.wo.diff then + vim.cmd.normal({ "]c", bang = true }) + else + gitsigns.nav_hunk("next") + end + end) + + vim.keymap.set("n", "[c", function() + if vim.wo.diff then + vim.cmd.normal({ "[c", bang = true }) + else + gitsigns.nav_hunk("prev") + end + end) + + vim.keymap.set("n", "hs", gitsigns.stage_hunk) + vim.keymap.set("n", "hu", gitsigns.undo_stage_hunk) + + vim.keymap.set("n", "hS", gitsigns.stage_buffer) + vim.keymap.set("n", "hU", gitsigns.reset_buffer_index) + + vim.keymap.set("n", "hi", gitsigns.toggle_current_line_blame) end, }) end, From 98a52ebe7400d046488c9e65a0ca80015a12fbef Mon Sep 17 00:00:00 2001 From: foxora Date: Sun, 15 Mar 2026 19:33:43 +0000 Subject: [PATCH 20/59] changed telescope colors and am trying out zf instead of fzf --- homes/modules/programs/neovim/lua/colors.lua | 6 ++--- .../programs/neovim/lua/plugins/telescope.lua | 23 +++++++++++++------ homes/modules/programs/neovim/nixcats.nix | 23 ++++++++++++++----- 3 files changed, 36 insertions(+), 16 deletions(-) diff --git a/homes/modules/programs/neovim/lua/colors.lua b/homes/modules/programs/neovim/lua/colors.lua index c60c55e..b9f663f 100644 --- a/homes/modules/programs/neovim/lua/colors.lua +++ b/homes/modules/programs/neovim/lua/colors.lua @@ -95,9 +95,9 @@ local function load_colors() vim.api.nvim_set_hl(0, "TelescopePreviewNormal", { bg = bg_90 }) vim.api.nvim_set_hl(0, "TelescopeBorder", { fg = color_15, bg = bg_90 }) - vim.api.nvim_set_hl(0, "TelescopePromptBorder", { fg = color_14, bg = bg_90 }) - vim.api.nvim_set_hl(0, "TelescopeResultsBorder", { fg = color_13, bg = bg_90 }) - vim.api.nvim_set_hl(0, "TelescopePreviewBorder", { fg = color_12, bg = bg_90 }) + vim.api.nvim_set_hl(0, "TelescopePromptBorder", { fg = color_15, bg = bg_90 }) + vim.api.nvim_set_hl(0, "TelescopeResultsBorder", { fg = color_15, bg = bg_90 }) + vim.api.nvim_set_hl(0, "TelescopePreviewBorder", { fg = color_15, bg = bg_90 }) vim.api.nvim_set_hl(0, "TelescopePromptTitle", { fg = color_15, bg = bg_90 }) vim.api.nvim_set_hl(0, "TelescopeResultsTitle", { fg = color_15, bg = bg_90 }) diff --git a/homes/modules/programs/neovim/lua/plugins/telescope.lua b/homes/modules/programs/neovim/lua/plugins/telescope.lua index 31a32cf..9feae5b 100644 --- a/homes/modules/programs/neovim/lua/plugins/telescope.lua +++ b/homes/modules/programs/neovim/lua/plugins/telescope.lua @@ -1,6 +1,7 @@ return { { "telescope.nvim", + enabled = nixCats("telescope.enable") or false, cmd = { "Telescope" }, keys = { { @@ -62,7 +63,14 @@ return { }, load = function(name) vim.cmd.packadd(name) - vim.cmd.packadd("telescope-fzf-native.nvim") + + if nixCats("telescope.fzf") then + vim.cmd.packadd("telescope-fzf-native.nvim") + end + + if nixCats("telescope.zf") then + vim.cmd.packadd("telescope-zf-native.nvim") + end end, after = function(plugin) local telescope = require("telescope") @@ -72,11 +80,6 @@ return { defaults = { border = true, borderchars = { "─", "│", "─", "│", "╭", "╮", "╯", "╰" }, - -- borderchars = { - -- prompt = { "─", " ", " ", " ", "─", "─", " ", " " }, - -- results = { " " }, - -- preview = { "─", "│", "─", "│", "╭", "╮", "╯", "╰" }, - -- }, mappings = { i = { [""] = actions.move_selection_previous, -- move to prev result @@ -87,7 +90,13 @@ return { }, }) - pcall(telescope.load_extension, "fzf") + if nixCats("telescope.fzf") then + telescope.load_extension("fzf") + end + + if nixCats("telescope.zf") then + telescope.load_extension("zf-native") + end end, }, } diff --git a/homes/modules/programs/neovim/nixcats.nix b/homes/modules/programs/neovim/nixcats.nix index a43ef0e..b2e74c3 100644 --- a/homes/modules/programs/neovim/nixcats.nix +++ b/homes/modules/programs/neovim/nixcats.nix @@ -130,11 +130,14 @@ in { undotree mini-hipatterns ]; - telescope = [ - telescope-nvim - telescope-fzf-native-nvim - telescope-ui-select-nvim - ]; + telescope = { + enable = [ + telescope-nvim + telescope-ui-select-nvim + ]; + fzf = [telescope-fzf-native-nvim]; + zf = [telescope-zf-native-nvim]; + }; fyler = [ fyler-nvim ]; @@ -242,7 +245,15 @@ in { ui = true; qol = true; - telescope = true; + + telescope = { + enable = true; + + # only enable one at a time + fzf = false; + zf = true; + }; + fyler = true; lsp = true; From 63e987277e823a50bf96665b8d3207c4808651d6 Mon Sep 17 00:00:00 2001 From: foxora Date: Sun, 15 Mar 2026 22:02:43 +0000 Subject: [PATCH 21/59] can now preview hunks inline!!! :3 --- homes/modules/programs/neovim/lua/plugins/git.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/homes/modules/programs/neovim/lua/plugins/git.lua b/homes/modules/programs/neovim/lua/plugins/git.lua index 5ce4395..46ee0e2 100644 --- a/homes/modules/programs/neovim/lua/plugins/git.lua +++ b/homes/modules/programs/neovim/lua/plugins/git.lua @@ -84,6 +84,8 @@ return { vim.keymap.set("n", "hU", gitsigns.reset_buffer_index) vim.keymap.set("n", "hi", gitsigns.toggle_current_line_blame) + + vim.keymap.set("n", "hp", gitsigns.preview_hunk_inline) end, }) end, From b1cfda31f1b3a50d68d03681c853d4e4a7ba0279 Mon Sep 17 00:00:00 2001 From: foxora Date: Mon, 16 Mar 2026 02:55:03 +0000 Subject: [PATCH 22/59] changed neovim keybinds :3 --- homes/modules/programs/neovim/init.lua | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/homes/modules/programs/neovim/init.lua b/homes/modules/programs/neovim/init.lua index dfd7b01..0cddc5e 100644 --- a/homes/modules/programs/neovim/init.lua +++ b/homes/modules/programs/neovim/init.lua @@ -10,6 +10,7 @@ require("plugins") require("lsp") require("colors") +-- move windows :3 vim.keymap.set("n", "", function() vim.cmd("wincmd h") end) @@ -22,3 +23,11 @@ end) vim.keymap.set("n", "", function() vim.cmd("wincmd l") end) + +-- splits <3 (i love splits sm) +vim.keymap.set("n", "s", function() + vim.cmd("split") +end) +vim.keymap.set("n", "v", function() + vim.cmd("vsplit") +end) From 5e882e99149bc661d23657c71f9e133fd7a64945 Mon Sep 17 00:00:00 2001 From: foxora Date: Mon, 16 Mar 2026 02:56:08 +0000 Subject: [PATCH 23/59] updated flake.lock + some stuff changed in nixcord --- flake.lock | 195 ++++++++++++++++------------- homes/modules/programs/nixcord.nix | 3 +- 2 files changed, 107 insertions(+), 91 deletions(-) diff --git a/flake.lock b/flake.lock index 521a902..55369ce 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1772292445, - "narHash": "sha256-4F1Q7U313TKUDDovCC96m/Za4wZcJ3yqtu4eSrj8lk8=", + "lastModified": 1773436376, + "narHash": "sha256-OUPRrprbgN27BXHuWkMAPSCfLLQ/uwpWghEfKYN2iAg=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "1dbbba659c1cef0b0202ce92cadfe13bae550e8f", + "rev": "43f10d24391692bba3d762931ee35e7f17f8e8b8", "type": "github" }, "original": { @@ -98,11 +98,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1773166308, - "narHash": "sha256-fkJEQ1rbt/lqsA0+D3+LWtCok9Ofsz8dKDCnbt1MvOs=", + "lastModified": 1773610965, + "narHash": "sha256-0VcA3dwW6tJuikDj3bqx3luqrxxsPhMcCXswmgWxkVE=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "2396c36f247f4c1e08f3ffd953b7b958d044e224", + "rev": "0ffc149abac0215fc0d41ddb8df8b87887c2fcc8", "type": "github" }, "original": { @@ -114,11 +114,11 @@ "cachyos-kernel": { "flake": false, "locked": { - "lastModified": 1773036026, - "narHash": "sha256-hRDSqn5jL0cq4aYTcAS61Jsw2DEqxHkAb01Cyu7jIDc=", + "lastModified": 1773425695, + "narHash": "sha256-O5Fr6f+iS+IVKdB59yqkCaWfkr1SSHD5BLDDlZO7RwU=", "owner": "CachyOS", "repo": "linux-cachyos", - "rev": "dd72b90988e22422548f65e1ec8e2b52c8c7e35f", + "rev": "3b9ae1ae5d4ee95e1509d350b65c0777dde97628", "type": "github" }, "original": { @@ -130,11 +130,11 @@ "cachyos-kernel-patches": { "flake": false, "locked": { - "lastModified": 1773035489, - "narHash": "sha256-qsniqHnVIZdhGO6tYyugtWpOtdYofnUcpJAj6YAAvM4=", + "lastModified": 1773430072, + "narHash": "sha256-0X47YCF1CUnLiQ1M6Lh4hc3ax9aV5DX/wCmMfuMyM1o=", "owner": "CachyOS", "repo": "kernel-patches", - "rev": "d60f37176775b87d3300b333b39ae974adbda381", + "rev": "ac70453c25200f0a30ad38b3caa63020869f0f8a", "type": "github" }, "original": { @@ -468,11 +468,11 @@ ] }, "locked": { - "lastModified": 1772985280, - "narHash": "sha256-FdrNykOoY9VStevU4zjSUdvsL9SzJTcXt4omdEDZDLk=", + "lastModified": 1773607598, + "narHash": "sha256-nPV/IE0NwQjYcXkEGOmCIEsX9i8HFMeq2RupYzfVdiI=", "owner": "nix-community", "repo": "home-manager", - "rev": "8f736f007139d7f70752657dff6a401a585d6cbc", + "rev": "1f8f9e001235652cf54f9c1f7983f9c0e920944a", "type": "github" }, "original": { @@ -489,11 +489,11 @@ ] }, "locked": { - "lastModified": 1773179137, - "narHash": "sha256-EdW2bwzlfme0vbMOcStnNmKlOAA05Bp6su2O8VLGT0k=", + "lastModified": 1773608492, + "narHash": "sha256-QZteyExJYSQzgxqdsesDPbQgjctGG7iKV/6ooyQPITk=", "owner": "nix-community", "repo": "home-manager", - "rev": "3f98e2bbc661ec0aaf558d8a283d6955f05f1d09", + "rev": "9a40ec3b78fc688d0908485887d355caa5666d18", "type": "github" }, "original": { @@ -510,11 +510,11 @@ ] }, "locked": { - "lastModified": 1772985280, - "narHash": "sha256-FdrNykOoY9VStevU4zjSUdvsL9SzJTcXt4omdEDZDLk=", + "lastModified": 1773607598, + "narHash": "sha256-nPV/IE0NwQjYcXkEGOmCIEsX9i8HFMeq2RupYzfVdiI=", "owner": "nix-community", "repo": "home-manager", - "rev": "8f736f007139d7f70752657dff6a401a585d6cbc", + "rev": "1f8f9e001235652cf54f9c1f7983f9c0e920944a", "type": "github" }, "original": { @@ -532,11 +532,11 @@ ] }, "locked": { - "lastModified": 1772330611, - "narHash": "sha256-UZjPc/d5XRxvjDbk4veAO4XFdvx6BUum2l40V688Xq8=", + "lastModified": 1773422513, + "narHash": "sha256-MPjR48roW7CUMU6lu0+qQGqj92Kuh3paIulMWFZy+NQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "58fd7ff0eec2cda43e705c4c0585729ec471d400", + "rev": "ef12a9a2b0f77c8fa3dda1e7e494fca668909056", "type": "github" }, "original": { @@ -561,11 +561,11 @@ ] }, "locked": { - "lastModified": 1753964049, - "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=", + "lastModified": 1772461003, + "narHash": "sha256-pVICsV7FtcEeVwg5y/LFh3XFUkVJninm/P1j/JHzEbM=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5", + "rev": "b62396457b9cfe2ebf24fe05404b09d2a40f8ed7", "type": "github" }, "original": { @@ -590,11 +590,11 @@ ] }, "locked": { - "lastModified": 1770511807, - "narHash": "sha256-suKmSbSk34uPOJDTg/GbPrKEJutzK08vj0VoTvAFBCA=", + "lastModified": 1772461523, + "narHash": "sha256-mI6A51do+hEUzeJKk9YSWfVHdI/SEEIBi2tp5Whq5mI=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "7c75487edd43a71b61adb01cae8326d277aab683", + "rev": "7d63c04b4a2dd5e59ef943b4b143f46e713df804", "type": "github" }, "original": { @@ -622,11 +622,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1773171407, - "narHash": "sha256-mtSDWOrekyWpJnuPu4uFxqOfSvsow74mmCm3PffqRTE=", + "lastModified": 1773615208, + "narHash": "sha256-a8So/3JL/1P+QZjqp1tBW7tkXyBX+WkbRyBNkds59aY=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "0e083e886f02034c56b851649a6c27f55fe85e32", + "rev": "30c498acf4173930dfd8afd6279ebceacb1941e9", "type": "github" }, "original": { @@ -668,11 +668,11 @@ ] }, "locked": { - "lastModified": 1767023960, - "narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=", + "lastModified": 1772467975, + "narHash": "sha256-kipyuDBxrZq+beYpZqWzGvFWm4QbayW9agAvi94vDXY=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660", + "rev": "5e1c6b9025aaf4d578f3eff7c0eb1f0c197a9507", "type": "github" }, "original": { @@ -693,11 +693,11 @@ ] }, "locked": { - "lastModified": 1765214753, - "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=", + "lastModified": 1772460177, + "narHash": "sha256-/6G/MsPvtn7bc4Y32pserBT/Z4SUUdBd4XYJpOEKVR4=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab", + "rev": "1cb6db5fd6bb8aee419f4457402fa18293ace917", "type": "github" }, "original": { @@ -722,11 +722,11 @@ ] }, "locked": { - "lastModified": 1771866172, - "narHash": "sha256-fYFoXhQLrm1rD8vSFKQBOEX4OGCuJdLt1amKfHd5GAw=", + "lastModified": 1772459629, + "narHash": "sha256-/iwvNUYShmmnwmz/czEUh6+0eF5vCMv0xtDW0STPIuM=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "0b219224910e7642eb0ed49f0db5ec3d008e3e41", + "rev": "7615ee388de18239a4ab1400946f3d0e498a8186", "type": "github" }, "original": { @@ -774,11 +774,11 @@ ] }, "locked": { - "lastModified": 1764592794, - "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=", + "lastModified": 1772462885, + "narHash": "sha256-5pHXrQK9zasMnIo6yME6EOXmWGFMSnCITcfKshhKJ9I=", "owner": "hyprwm", "repo": "hyprtoolkit", - "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e", + "rev": "9af245a69fa6b286b88ddfc340afd288e00a6998", "type": "github" }, "original": { @@ -799,11 +799,11 @@ ] }, "locked": { - "lastModified": 1771271487, - "narHash": "sha256-41gEiUS0Pyw3L/ge1l8MXn61cK14VAhgWB/JV8s/oNI=", + "lastModified": 1773436263, + "narHash": "sha256-n+2xFJngUkBqUJD5FsbVnYEHBTyDFSqtBIwQIGPXWWo=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "340a792e3b3d482c4ae5f66d27a9096bdee6d76d", + "rev": "5e228db6821380a5875d5643176c5c46a47b8134", "type": "github" }, "original": { @@ -824,11 +824,11 @@ ] }, "locked": { - "lastModified": 1770501770, - "narHash": "sha256-NWRM6+YxTRv+bT9yvlhhJ2iLae1B1pNH3mAL5wi2rlQ=", + "lastModified": 1772459835, + "narHash": "sha256-978jRz/y/9TKmZb/qD4lEYHCQGHpEXGqy+8X2lFZsak=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "0bd8b6cde9ec27d48aad9e5b4deefb3746909d40", + "rev": "0a692d4a645165eebd65f109146b8861e3a925e7", "type": "github" }, "original": { @@ -853,11 +853,11 @@ ] }, "locked": { - "lastModified": 1771606233, - "narHash": "sha256-F3PLUqQ/TwgR70U+UeOqJnihJZ2EuunzojYC4g5xHr0=", + "lastModified": 1773074819, + "narHash": "sha256-qRqYnXiKoJLRTcfaRukn7EifmST2IVBUMZOeZMAc5UA=", "owner": "hyprwm", "repo": "hyprwire", - "rev": "06c7f1f8c4194786c8400653c4efc49dc14c0f3a", + "rev": "f68afd0e73687598cc2774804fedad76693046f0", "type": "github" }, "original": { @@ -983,11 +983,11 @@ "scenefx": "scenefx" }, "locked": { - "lastModified": 1773112723, - "narHash": "sha256-MXCXjnGPE+wagrHR8cxGTDhJO4xYp+aBQPApV3JG9XY=", + "lastModified": 1773588376, + "narHash": "sha256-4HKHaRQnSxxYoR/m1xpwsfnd2lQL9LefcvTFrmcHD2g=", "owner": "DreamMaoMao", "repo": "mangowc", - "rev": "1fc89d01eb5aa0f3784fb4006bf9af47826444d2", + "rev": "0d8aedf691bb740290ad5c447d157a8d26a35ffe", "type": "github" }, "original": { @@ -1214,14 +1214,15 @@ "flake-parts": "flake-parts_4", "nixpkgs": [ "nixpkgs" - ] + ], + "nixpkgs-nixcord": "nixpkgs-nixcord" }, "locked": { - "lastModified": 1773217223, - "narHash": "sha256-nuJm0CAgTFHQr900Euks0iTjcI5zagGfJTzeCEk3W8g=", + "lastModified": 1773597570, + "narHash": "sha256-A6KsirR9kxR1wVFTr8aagk5vUT3rvKTf79Qht6YkxUA=", "owner": "FlameFlag", "repo": "nixcord", - "rev": "41d6b20512a433203018777b630853c96b0294f8", + "rev": "1cc0ddb766e459b7187e6aeb8b2e046d37361dc4", "type": "github" }, "original": { @@ -1232,11 +1233,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1773148319, - "narHash": "sha256-Yr9ej3uSDycQZHWB5HslVgryLkdSBN2fODAqURv/1wQ=", + "lastModified": 1773563071, + "narHash": "sha256-p4f6smYpck1hw6gYsT2omq01gnlZ1E7HTpssDQ0fP+g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8da79c289ee165139257335eab0733d98c4ad458", + "rev": "1c6f50e5b62030a50799682b6babc9dcc5a271ae", "type": "github" }, "original": { @@ -1293,11 +1294,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1773235564, - "narHash": "sha256-ThPD82jzDYAo5wJ/eR6Nlc40vX0hsIswnessyj4rX2k=", + "lastModified": 1773620976, + "narHash": "sha256-kgxB+kzrbxYf/CaWA5tvn7mnhzEt78aWfVakZw/TRbs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f6b3c6a254a012c45a3d7dbf327e223737278b89", + "rev": "7ee76979bc1b2169d7e632572c2c31c9ee01f728", "type": "github" }, "original": { @@ -1307,13 +1308,29 @@ "type": "github" } }, - "nixpkgs-staging": { + "nixpkgs-nixcord": { "locked": { - "lastModified": 1773231167, - "narHash": "sha256-TNbxZRJ8cq6ElBfgwEChMNWG/8jx3+W4d1l1BqKwmxY=", + "lastModified": 1773222311, + "narHash": "sha256-BHoB/XpbqoZkVYZCfXJXfkR+GXFqwb/4zbWnOr2cRcU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cddc12f674927875907317b9e22833a4e9261707", + "rev": "0590cd39f728e129122770c029970378a79d076a", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-staging": { + "locked": { + "lastModified": 1773620792, + "narHash": "sha256-5WSJs2YpBJpA9VG1PwFL5vpHw4ySOz2u02S4hAQKkuU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "525870a58b715d25c23fb00c7be737324d8161c3", "type": "github" }, "original": { @@ -1325,11 +1342,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1772963539, - "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=", + "lastModified": 1773389992, + "narHash": "sha256-wvfdLLWJ2I9oEpDd9PfMA8osfIZicoQ5MT1jIwNs9Tk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9dcb002ca1690658be4a04645215baea8b95f31d", + "rev": "c06b4ae3d6599a672a6210b7021d699c351eebda", "type": "github" }, "original": { @@ -1357,11 +1374,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1773068389, - "narHash": "sha256-vMrm7Pk2hjBRPnCSjhq1pH0bg350Z+pXhqZ9ICiqqCs=", + "lastModified": 1773524153, + "narHash": "sha256-Jms57zzlFf64ayKzzBWSE2SGvJmK+NGt8Gli71d9kmY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "44bae273f9f82d480273bab26f5c50de3724f52f", + "rev": "e9f278faa1d0c2fc835bd331d4666b59b505a410", "type": "github" }, "original": { @@ -1401,11 +1418,11 @@ ] }, "locked": { - "lastModified": 1772024342, - "narHash": "sha256-+eXlIc4/7dE6EcPs9a2DaSY3fTA9AE526hGqkNID3Wg=", + "lastModified": 1772893680, + "narHash": "sha256-JDqZMgxUTCq85ObSaFw0HhE+lvdOre1lx9iI6vYyOEs=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "6e34e97ed9788b17796ee43ccdbaf871a5c2b476", + "rev": "8baab586afc9c9b57645a734c820e4ac0a604af9", "type": "github" }, "original": { @@ -1576,11 +1593,11 @@ ] }, "locked": { - "lastModified": 1773161309, - "narHash": "sha256-k2Un0blYBeoN8mB5HO4rqCKISb427IWy0fzCdCUIcio=", + "lastModified": 1773619901, + "narHash": "sha256-Br8CQy4ht+a2OxyzaRwuP5+oIFfoRvCxYgsmdrgid40=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "61df7293cf732c7b66cce7f8b46f7017e721a6cd", + "rev": "6f06ff05cd536b790b7662550a10b61a1ac4619e", "type": "github" }, "original": { @@ -1750,11 +1767,11 @@ ] }, "locked": { - "lastModified": 1761431178, - "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=", + "lastModified": 1772669058, + "narHash": "sha256-XhnY0aRuDo5LT8pmJVPofPOgO2hAR7T+XRoaQxtNPzQ=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9", + "rev": "906d0ac159803a7df2dc1f948df9327670380f69", "type": "github" }, "original": { @@ -1771,11 +1788,11 @@ ] }, "locked": { - "lastModified": 1773225617, - "narHash": "sha256-IT0n3jJgf4M7U0EuZJ2XJwXBmSJVVK3auqWDGeHGMzY=", + "lastModified": 1773588616, + "narHash": "sha256-Ukh79t1IMpP4FRsJDZ/3Y72VpW+QwNe/QRB5pTsH20Q=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "413a22ab7acf848ed4e20c3f47ea96ccd4788518", + "rev": "b34b64ee5a85ab61394c491ac3dad335d3cbfbb8", "type": "github" }, "original": { diff --git a/homes/modules/programs/nixcord.nix b/homes/modules/programs/nixcord.nix index bdeb978..a369a68 100644 --- a/homes/modules/programs/nixcord.nix +++ b/homes/modules/programs/nixcord.nix @@ -75,7 +75,6 @@ forwardAnywhere.enable = true; spotifyCrack.enable = true; spotifyShareCommands.enable = true; - spotifyControls.enable = true; fullUserInChatbox.enable = true; gifPaste.enable = true; ignoreActivities = { @@ -140,7 +139,7 @@ whoReacted.enable = true; whosWatching.enable = true; quickReply.enable = true; - questCompleter.enable = true; + # questCompleter.enable = true; # does not seem to exist anymore? shikiCodeblocks = { enable = true; useDevIcon = "COLOR"; From afb9d2fd9b80823906d8d68be939fbbaf3006abe Mon Sep 17 00:00:00 2001 From: foxora Date: Mon, 16 Mar 2026 03:18:58 +0000 Subject: [PATCH 24/59] i dont need the paramters for delta, it automatically gets it from its config --- homes/aurora/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homes/aurora/default.nix b/homes/aurora/default.nix index 7cfee3f..ea1ffbf 100644 --- a/homes/aurora/default.nix +++ b/homes/aurora/default.nix @@ -290,7 +290,7 @@ git.pagers = [ { colorArg = "always"; - pager = "delta --dark --pager=never --line-numbers --side-by-side"; + pager = "delta --dark --pager=never"; } ]; }; From f6e3fa6a8634402978eeec160de516ebc39d718b Mon Sep 17 00:00:00 2001 From: foxora Date: Mon, 16 Mar 2026 07:16:40 +0000 Subject: [PATCH 25/59] removed quickshare --- homes/aurora/default.nix | 1 - hosts/nixarawrui/default.nix | 2 -- 2 files changed, 3 deletions(-) diff --git a/homes/aurora/default.nix b/homes/aurora/default.nix index ea1ffbf..ff1e4ff 100644 --- a/homes/aurora/default.nix +++ b/homes/aurora/default.nix @@ -174,7 +174,6 @@ # gui settings apps nwg-look # gtk 2 / 3 settings thing idc i hate gtk pavucontrol # i wanna get rid of this but its audio control thing - rquickshare # android quick share (this is pretty cool!!) # wayland desktop tools / de / wm stuff / gui stuffs cliphist diff --git a/hosts/nixarawrui/default.nix b/hosts/nixarawrui/default.nix index c8dc086..88664b7 100644 --- a/hosts/nixarawrui/default.nix +++ b/hosts/nixarawrui/default.nix @@ -63,13 +63,11 @@ allowedTCPPorts = [ 21110 # slimevr - 44949 # rquickshare ]; allowedUDPPorts = [ 6969 # slimevr 8266 # slimevr 35903 # slimevr - 44949 # rquickshare ]; }; From 5c93afcb2b4ff8224403b1ad6f2fae2fb384019b Mon Sep 17 00:00:00 2001 From: foxora Date: Mon, 16 Mar 2026 08:43:25 +0000 Subject: [PATCH 26/59] added sql formatter --- homes/modules/programs/neovim/lua/plugins/format.lua | 1 + homes/modules/programs/neovim/nixcats.nix | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/homes/modules/programs/neovim/lua/plugins/format.lua b/homes/modules/programs/neovim/lua/plugins/format.lua index c3f85e2..800fde7 100644 --- a/homes/modules/programs/neovim/lua/plugins/format.lua +++ b/homes/modules/programs/neovim/lua/plugins/format.lua @@ -62,6 +62,7 @@ return { haskell = nixCats("lang.haskell.format") and { "ormolu" } or nil, proto = nixCats("lang.protobuf.format") and { "buf" } or nil, toml = nixCats("lang.toml.format") and { "taplo" } or nil, + sql = nixCats("lang.sql.format") and { "sqlfluff" } or nil, }, format_on_save = { timeout_ms = 500, diff --git a/homes/modules/programs/neovim/nixcats.nix b/homes/modules/programs/neovim/nixcats.nix index b2e74c3..8394405 100644 --- a/homes/modules/programs/neovim/nixcats.nix +++ b/homes/modules/programs/neovim/nixcats.nix @@ -103,6 +103,9 @@ in { bash = { lsp = [bash-language-server]; }; + sql = { + format = [sqlfluff]; + }; }; }; @@ -300,6 +303,8 @@ in { toml.format = true; bash.lsp = true; + + sql.format = true; }; }; }; From 8bef5b623328405bb038a2e076a3105a7c750960 Mon Sep 17 00:00:00 2001 From: _cry64 Date: Tue, 17 Mar 2026 20:59:21 +1000 Subject: [PATCH 27/59] upgrade to cerulean/v0.2.6-alpha --- flake.lock | 64 ++++++++++++++++++++---------------------------------- flake.nix | 7 ++++-- 2 files changed, 28 insertions(+), 43 deletions(-) diff --git a/flake.lock b/flake.lock index 4f1e1c5..5360f45 100644 --- a/flake.lock +++ b/flake.lock @@ -157,15 +157,16 @@ ] }, "locked": { - "lastModified": 1772852754, - "narHash": "sha256-rYmaW2+zmFXM7Mp+B/fsBkzbAoeApj04F1fSmiS3mXU=", + "lastModified": 1773744164, + "narHash": "sha256-dGupwWUL9YPvC0/m4maCRD9psomWhFr/JAsGnC9toQM=", "owner": "cry128", "repo": "cerulean", - "rev": "ef5bc338566670380ceec75eb692697c9e81fb7e", + "rev": "e7fdbf416ccb3e7e6bf30042e4aacd065983ddad", "type": "github" }, "original": { "owner": "cry128", + "ref": "v0.2.6-alpha", "repo": "cerulean", "type": "github" } @@ -212,11 +213,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1766051518, - "narHash": "sha256-znKOwPXQnt3o7lDb3hdf19oDo0BLP4MfBOYiWkEHoik=", + "lastModified": 1770019181, + "narHash": "sha256-hwsYgDnby50JNVpTRYlF3UR/Rrpt01OrxVuryF40CFY=", "owner": "serokell", "repo": "deploy-rs", - "rev": "d5eff7f948535b9c723d60cd8239f8f11ddc90fa", + "rev": "77c906c0ba56aabdbc72041bf9111b565cdd6171", "type": "github" }, "original": { @@ -522,27 +523,6 @@ "type": "github" } }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "zen", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1772330611, - "narHash": "sha256-UZjPc/d5XRxvjDbk4veAO4XFdvx6BUum2l40V688Xq8=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "58fd7ff0eec2cda43e705c4c0585729ec471d400", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "hyprcursor": { "inputs": { "hyprlang": [ @@ -1033,11 +1013,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1771365290, - "narHash": "sha256-1XJOslVyF7yzf6yd/yl1VjGLywsbtwmQh3X1LuJcLI4=", + "lastModified": 1773018425, + "narHash": "sha256-fpgZBmZpKoEXEowBK/6m8g9FcOLWQ4UxhXHqCw2CpSM=", "owner": "microvm-nix", "repo": "microvm.nix", - "rev": "789c90b164b55b4379e7a94af8b9c01489024c18", + "rev": "25ebda3c558e923720c965832dc9a04f559a055c", "type": "github" }, "original": { @@ -1406,11 +1386,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1770975056, - "narHash": "sha256-ZXTz/P3zUbbM6lNXzt91u8EwfNqhXpYMu8+wvFZqQHE=", + "lastModified": 1773738366, + "narHash": "sha256-oH22HyNHEdCoCQo734sQCHUr6C0jmGQJMZ13dsgEHkk=", "owner": "cry128", "repo": "nt", - "rev": "f42dcdd49a7921a7f433512e83d5f93696632412", + "rev": "f32c3a726a3d608d30aaaa1df2301c1eaf5ef8f4", "type": "github" }, "original": { @@ -1589,11 +1569,11 @@ ] }, "locked": { - "lastModified": 1772495394, - "narHash": "sha256-hmIvE/slLKEFKNEJz27IZ8BKlAaZDcjIHmkZ7GCEjfw=", + "lastModified": 1773096132, + "narHash": "sha256-M3zEnq9OElB7zqc+mjgPlByPm1O5t2fbUrH3t/Hm5Ag=", "owner": "Mic92", "repo": "sops-nix", - "rev": "1d9b98a29a45abe9c4d3174bd36de9f28755e3ff", + "rev": "d1ff3b1034d5bab5d7d8086a7803c5a5968cd784", "type": "github" }, "original": { @@ -1605,11 +1585,11 @@ "spectrum": { "flake": false, "locked": { - "lastModified": 1759482047, - "narHash": "sha256-H1wiXRQHxxPyMMlP39ce3ROKCwI5/tUn36P8x6dFiiQ=", + "lastModified": 1772189877, + "narHash": "sha256-i1p90Rgssb//aNiTDFq46ZG/fk3LmyRLChtp/9lddyA=", "ref": "refs/heads/main", - "rev": "c5d5786d3dc938af0b279c542d1e43bce381b4b9", - "revCount": 996, + "rev": "fe39e122d898f66e89ffa17d4f4209989ccb5358", + "revCount": 1255, "type": "git", "url": "https://spectrum-os.org/git/spectrum" }, @@ -1833,7 +1813,9 @@ }, "zen": { "inputs": { - "home-manager": "home-manager_2", + "home-manager": [ + "home-manager" + ], "nixpkgs": [ "nixpkgs-unstable" ] diff --git a/flake.nix b/flake.nix index 4f838b5..d50ddc3 100644 --- a/flake.nix +++ b/flake.nix @@ -19,7 +19,7 @@ }; cerulean = { - url = "github:cry128/cerulean"; + url = "github:cry128/cerulean/v0.2.6-alpha"; inputs = { systems.follows = "systems"; nixpkgs.follows = "nixpkgs"; @@ -59,7 +59,10 @@ zen = { url = "github:0xc000022070/zen-browser-flake"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; + inputs = { + nixpkgs.follows = "nixpkgs-unstable"; + home-manager.follows = "home-manager"; + }; }; iamb = { From b2f0a2f199c1786271ce536e896660ecccb589f9 Mon Sep 17 00:00:00 2001 From: _cry64 Date: Tue, 17 Mar 2026 20:59:33 +1000 Subject: [PATCH 28/59] rename nixpkgs.channels.default -> nixpkgs.channels.base --- nixpkgs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixpkgs.nix b/nixpkgs.nix index 1470160..5bedfeb 100644 --- a/nixpkgs.nix +++ b/nixpkgs.nix @@ -1,6 +1,6 @@ {inputs, ...} @ args: { nixpkgs.channels = { - default = { + base = { overlays = [(import ./overlays.nix args)]; config.allowUnfree = true; }; From f17fb26069ed971f5e532cabe1701d95b019bb3d Mon Sep 17 00:00:00 2001 From: foxora Date: Thu, 19 Mar 2026 09:40:13 +0000 Subject: [PATCH 29/59] mangowc -> mangowm --- flake.lock | 20 ++++++++++---------- flake.nix | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index 55369ce..3e9a921 100644 --- a/flake.lock +++ b/flake.lock @@ -468,11 +468,11 @@ ] }, "locked": { - "lastModified": 1773607598, - "narHash": "sha256-nPV/IE0NwQjYcXkEGOmCIEsX9i8HFMeq2RupYzfVdiI=", + "lastModified": 1773681845, + "narHash": "sha256-o8hrZrigP0JYcwnglCp8Zi8jQafWsxbDtRRPzuVwFxY=", "owner": "nix-community", "repo": "home-manager", - "rev": "1f8f9e001235652cf54f9c1f7983f9c0e920944a", + "rev": "0759e0e137305bc9d0c52c204c6d8dffe6f601a6", "type": "github" }, "original": { @@ -983,16 +983,16 @@ "scenefx": "scenefx" }, "locked": { - "lastModified": 1773588376, - "narHash": "sha256-4HKHaRQnSxxYoR/m1xpwsfnd2lQL9LefcvTFrmcHD2g=", - "owner": "DreamMaoMao", - "repo": "mangowc", - "rev": "0d8aedf691bb740290ad5c447d157a8d26a35ffe", + "lastModified": 1773887083, + "narHash": "sha256-Uqo0rulfjQmUmlRJTWfu5anjdsvY2xDZtvKtmEMECts=", + "owner": "mangowm", + "repo": "mango", + "rev": "c776356efe165dca09742f78f2a018e065b825be", "type": "github" }, "original": { - "owner": "DreamMaoMao", - "repo": "mangowc", + "owner": "mangowm", + "repo": "mango", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 3de00a2..b5ffaf7 100644 --- a/flake.nix +++ b/flake.nix @@ -46,7 +46,7 @@ # }; mango = { - url = "github:DreamMaoMao/mangowc"; + url = "github:mangowm/mango"; inputs.nixpkgs.follows = "nixpkgs-unstable"; }; From 55099cdad2734b2ac733b90bbd6a969c764eb2fa Mon Sep 17 00:00:00 2001 From: foxora Date: Thu, 19 Mar 2026 09:43:51 +0000 Subject: [PATCH 30/59] idk i made a lot of changes --- homes/aurora/default.nix | 1 + homes/modules/programs/neovim/init.lua | 61 +++++++++++++++++++ homes/modules/programs/neovim/lua/colors.lua | 25 ++++++++ .../programs/neovim/lua/plugins/dressing.lua | 1 + .../neovim/lua/plugins/indent-blankline.lua | 30 +++++++++ .../programs/neovim/lua/plugins/init.lua | 2 + .../programs/neovim/lua/plugins/lualine.lua | 22 +++++++ .../programs/neovim/lua/plugins/telescope.lua | 8 +++ homes/modules/programs/neovim/nixcats.nix | 39 ++++++------ homes/modules/shell/zsh.nix | 3 + 10 files changed, 171 insertions(+), 21 deletions(-) create mode 100644 homes/modules/programs/neovim/lua/plugins/indent-blankline.lua create mode 100644 homes/modules/programs/neovim/lua/plugins/lualine.lua diff --git a/homes/aurora/default.nix b/homes/aurora/default.nix index ff1e4ff..c7ec891 100644 --- a/homes/aurora/default.nix +++ b/homes/aurora/default.nix @@ -154,6 +154,7 @@ element-desktop # 'official' gui matrix client blender # AMAZING 3D MODELLING PROGRAMMM <3 session-desktop # idk silly chat app + localsend # share files locally :3 # media playerctl # mpris cli interface for media apps :3 diff --git a/homes/modules/programs/neovim/init.lua b/homes/modules/programs/neovim/init.lua index 0cddc5e..1430497 100644 --- a/homes/modules/programs/neovim/init.lua +++ b/homes/modules/programs/neovim/init.lua @@ -31,3 +31,64 @@ end) vim.keymap.set("n", "v", function() vim.cmd("vsplit") end) + +-- u can put delta inside of neovim omg they are spoiling me <3 +local git_diff_win = nil + +vim.api.nvim_create_autocmd("VimResized", { + callback = function() + if git_diff_win and vim.api.nvim_win_is_valid(git_diff_win) then + local width = math.floor(vim.o.columns * 0.9) + local height = math.floor((vim.o.lines - 2) * 0.9) + + vim.api.nvim_win_set_config(git_diff_win, { + relative = "editor", + width = width, + height = height, + col = math.floor((vim.o.columns - width) / 2), + row = math.floor((vim.o.lines - height) / 2) - 2, + }) + end + end, +}) + +vim.keymap.set("n", "gd", function() + if git_diff_win and vim.api.nvim_win_is_valid(git_diff_win) then + vim.api.nvim_win_close(git_diff_win, true) + git_diff_win = nil + return + end + + local buf = vim.api.nvim_create_buf(false, true) + + vim.bo[buf].filetype = "terminal" + + -- deletes the last two lines of the buffer when the process exits :3 + vim.api.nvim_create_autocmd("TermClose", { + buffer = buf, + callback = function() + vim.defer_fn(function() + vim.bo[buf].modifiable = true + vim.api.nvim_buf_set_lines(buf, -3, -1, false, {}) + vim.bo[buf].modifiable = false + end, 10) + end, + }) + + local width = math.floor(vim.o.columns * 0.9) + local height = math.floor((vim.o.lines - 2) * 0.9) + + git_diff_win = vim.api.nvim_open_win(buf, true, { + relative = "editor", + width = width, + height = height, + col = math.floor((vim.o.columns - width) / 2), + row = math.floor((vim.o.lines - height) / 2) - 2, + style = "minimal", + border = "rounded", + }) + + vim.fn.jobstart("git diff | delta --pager=never", { term = true }) + + vim.keymap.set("n", "q", "close", { buffer = buf }) +end) diff --git a/homes/modules/programs/neovim/lua/colors.lua b/homes/modules/programs/neovim/lua/colors.lua index b9f663f..077dfaa 100644 --- a/homes/modules/programs/neovim/lua/colors.lua +++ b/homes/modules/programs/neovim/lua/colors.lua @@ -75,6 +75,16 @@ local function load_colors() local bg_90 = blend_colors(hex_to_int("#000000"), hex_to_int(bg), 0.90) + local fg_10 = blend_colors(hex_to_int(bg), hex_to_int(fg), 0.10) + local fg_30 = blend_colors(hex_to_int(bg), hex_to_int(fg), 0.30) + + local secondary_10 = blend_colors(hex_to_int(bg), hex_to_int(color_13), 0.10) + local secondary_30 = blend_colors(hex_to_int(bg), hex_to_int(color_13), 0.30) + + -- editor colors :3 -------------------------------------------------------- + + vim.api.nvim_set_hl(0, "Visual", { bg = secondary_10 }) + -- blink.cmp --------------------------------------------------------------- vim.api.nvim_set_hl(0, "BlinkCmpMenu", { bg = bg }) @@ -191,6 +201,15 @@ local function load_colors() vim.api.nvim_set_hl(0, "FylerGitUntracked", { fg = color_06 }) vim.api.nvim_set_hl(0, "FylerWinPick", { fg = color_15, bg = fg }) + + -- lualine.nvim + vim.api.nvim_exec_autocmds("User", { pattern = "RefreshLualine" }) + + -- indent-blankline.nvim + vim.api.nvim_set_hl(0, "IblIndent", { fg = secondary_30 }) + vim.api.nvim_set_hl(0, "IblScope", { fg = color_11 }) + vim.api.nvim_exec_autocmds("User", { pattern = "RefreshIndentBlankline" }) + vim.api.nvim_set_hl(0, "@ibl.scope.underline.1", { underline = false }) else print("Error: Not enough colors in file") end @@ -218,3 +237,9 @@ local function watch_colorscheme() end watch_colorscheme() + +vim.api.nvim_create_autocmd("VimLeave", { + callback = function() + io.write("\027]112\007") + end, +}) diff --git a/homes/modules/programs/neovim/lua/plugins/dressing.lua b/homes/modules/programs/neovim/lua/plugins/dressing.lua index 42e7280..9c4decd 100644 --- a/homes/modules/programs/neovim/lua/plugins/dressing.lua +++ b/homes/modules/programs/neovim/lua/plugins/dressing.lua @@ -1,5 +1,6 @@ return { { "dressing.nvim", + enabled = nixCats("ui.dressing") or false, }, } diff --git a/homes/modules/programs/neovim/lua/plugins/indent-blankline.lua b/homes/modules/programs/neovim/lua/plugins/indent-blankline.lua new file mode 100644 index 0000000..013fa29 --- /dev/null +++ b/homes/modules/programs/neovim/lua/plugins/indent-blankline.lua @@ -0,0 +1,30 @@ +local config = { + debounce = 25, + indent = { + char = "│", + smart_indent_cap = true, + }, + scope = { + show_start = true, + show_end = true, + show_exact_scope = false, + injected_languages = true, + }, +} + +return { + { + "indent-blankline.nvim", + enabled = nixCats("ui.indent-blankline") or false, + after = function(plugin) + require("ibl").setup(config) + + vim.api.nvim_create_autocmd("User", { + pattern = "RefreshIndentBlankline", + callback = function() + require("ibl").setup(config) + end, + }) + end, + }, +} diff --git a/homes/modules/programs/neovim/lua/plugins/init.lua b/homes/modules/programs/neovim/lua/plugins/init.lua index cceea69..9bf0602 100644 --- a/homes/modules/programs/neovim/lua/plugins/init.lua +++ b/homes/modules/programs/neovim/lua/plugins/init.lua @@ -7,4 +7,6 @@ require("lze").load({ { import = "plugins.format" }, { import = "plugins.comment" }, { import = "plugins.git" }, + { import = "plugins.lualine" }, + { import = "plugins.indent-blankline" }, }) diff --git a/homes/modules/programs/neovim/lua/plugins/lualine.lua b/homes/modules/programs/neovim/lua/plugins/lualine.lua new file mode 100644 index 0000000..a0303d5 --- /dev/null +++ b/homes/modules/programs/neovim/lua/plugins/lualine.lua @@ -0,0 +1,22 @@ +local config = { + options = { + theme = "auto", + }, +} + +return { + { + "lualine.nvim", + enabled = nixCats("ui.lualine") or false, + after = function(plugin) + require("lualine").setup(config) + + vim.api.nvim_create_autocmd("User", { + pattern = "RefreshLualine", + callback = function() + require("lualine").setup(config) + end, + }) + end, + }, +} diff --git a/homes/modules/programs/neovim/lua/plugins/telescope.lua b/homes/modules/programs/neovim/lua/plugins/telescope.lua index 9feae5b..c500eed 100644 --- a/homes/modules/programs/neovim/lua/plugins/telescope.lua +++ b/homes/modules/programs/neovim/lua/plugins/telescope.lua @@ -60,6 +60,14 @@ return { mode = { "n" }, desc = "[T]elescope [H]ighlights", }, + { + "gs", + function() + return require("telescope.builtin").git_status() + end, + mode = { "n" }, + desc = "[G]it [S]tatus", + }, }, load = function(name) vim.cmd.packadd(name) diff --git a/homes/modules/programs/neovim/nixcats.nix b/homes/modules/programs/neovim/nixcats.nix index 8394405..cb9c8c7 100644 --- a/homes/modules/programs/neovim/nixcats.nix +++ b/homes/modules/programs/neovim/nixcats.nix @@ -15,11 +15,10 @@ in { ]; config = { - # this value, nixCats is the defaultPackageName you pass to mkNixosModules - # it will be the namespace for your options. nixCats = { enable = true; nixpkgs_version = inputs.nixpkgs-unstable; + # TODO: ask butterfly about this, am confused :3 # this will add the overlays from ./overlays and also, # add any plugins in inputs named "plugins-pluginName" to pkgs.neovimPlugins # It will not apply to overall system, just nixCats. @@ -28,15 +27,13 @@ in { [ (utils.standardPluginOverlay inputs) ]; - # see the packageDefinitions below. + # This says which of those to install. packageNames = ["auroranvim"]; luaPath = "${./.}"; - # the .replace vs .merge options are for modules based on existing configurations, - # they refer to how multiple categoryDefinitions get merged together by the module. - # for useage of this section, refer to :h nixCats.flake.outputs.categories + # for usage of this section, refer to :h nixCats.flake.outputs.categories categoryDefinitions.replace = { pkgs, settings, @@ -126,9 +123,11 @@ in { optionalPlugins = with pkgs.vimPlugins; { general = []; - ui = [ - dressing-nvim - ]; + ui = { + dressing = [dressing-nvim]; + lualine = [lualine-nvim]; + indent-blankline = [indent-blankline-nvim]; + }; qol = [ undotree mini-hipatterns @@ -187,9 +186,7 @@ in { # shared libraries to be added to LD_LIBRARY_PATH # variable available to nvim runtime sharedLibraries = { - general = with pkgs; [ - # libgit2 - ]; + general = with pkgs; []; }; environmentVariables = { @@ -225,15 +222,11 @@ in { # see :help nixCats.flake.outputs.packageDefinitions packageDefinitions.replace = { - # these are the names of your packages - # you can include as many as you wish. auroranvim = {pkgs, ...}: { # they contain a settings set defined above # see :help nixCats.flake.outputs.settings settings = { wrapRc = true; - # IMPORTANT: - # your alias may not conflict with your other packages. aliases = [ "auravim" "foxyvim" @@ -241,20 +234,24 @@ in { "fvix" ]; }; - # and a set of categories that you want - # (and other information to pass to lua) + categories = { general = true; - ui = true; + ui = { + dressing = true; + lualine = true; + indent-blankline = true; + }; + qol = true; telescope = { enable = true; # only enable one at a time - fzf = false; - zf = true; + fzf = true; + zf = false; }; fyler = true; diff --git a/homes/modules/shell/zsh.nix b/homes/modules/shell/zsh.nix index ab20164..1cb9e27 100644 --- a/homes/modules/shell/zsh.nix +++ b/homes/modules/shell/zsh.nix @@ -51,6 +51,9 @@ cb-fox = "ssh-add ~/.ssh/codeberg_foxxyora"; tf-fox = "ssh-add ~/.ssh/tearforge_foxora"; + tx = "wormhole-rs tx"; + rx = "wormhole-rs rx"; + # -------------------- # shorthand nix command aliases From 7310cda1013139c43c6f305b1b76f100cc695a59 Mon Sep 17 00:00:00 2001 From: foxora Date: Thu, 19 Mar 2026 10:46:11 +0000 Subject: [PATCH 31/59] changed telescope to respect .gitignore, show hidden files, but always ignore .git/ --- .../programs/neovim/lua/plugins/telescope.lua | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/homes/modules/programs/neovim/lua/plugins/telescope.lua b/homes/modules/programs/neovim/lua/plugins/telescope.lua index c500eed..7a2a2b6 100644 --- a/homes/modules/programs/neovim/lua/plugins/telescope.lua +++ b/homes/modules/programs/neovim/lua/plugins/telescope.lua @@ -7,7 +7,10 @@ return { { "f", function() - return require("telescope.builtin").find_files() + return require("telescope.builtin").find_files({ + hidden = true, + file_ignore_patterns = { "^.git/" }, + }) end, mode = { "n" }, desc = "Telescope search [F]iles", @@ -23,7 +26,10 @@ return { { "ts", function() - return require("telescope.builtin").live_grep() + return require("telescope.builtin").live_grep({ + additional_args = { "--hidden" }, + glob_pattern = { "!.git/" }, + }) end, mode = { "n" }, desc = "[T]elescope [S]earch cwd with grep", @@ -31,7 +37,10 @@ return { { "tw", function() - return require("telescope.builtin").grep_string() + return require("telescope.builtin").grep_string({ + additional_args = { "--hidden" }, + glob_pattern = { "!.git/" }, + }) end, mode = { "n" }, desc = "[T]elescope search current [W]ord", From e861f21ef2954ba61f9e2d50a57b0f4c0a1bc8d4 Mon Sep 17 00:00:00 2001 From: foxora Date: Thu, 19 Mar 2026 12:24:19 +0000 Subject: [PATCH 32/59] scrolloff yay :3 --- homes/modules/programs/neovim/init.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/homes/modules/programs/neovim/init.lua b/homes/modules/programs/neovim/init.lua index 1430497..4034fc2 100644 --- a/homes/modules/programs/neovim/init.lua +++ b/homes/modules/programs/neovim/init.lua @@ -5,6 +5,7 @@ vim.opt.relativenumber = true vim.opt.number = true vim.opt.wrap = false vim.opt.colorcolumn = "80" +vim.opt.scrolloff = 4 require("plugins") require("lsp") From 86d0fda70eea7a369b1b0ea90818d8dff160fc92 Mon Sep 17 00:00:00 2001 From: foxora Date: Thu, 19 Mar 2026 16:07:54 +0000 Subject: [PATCH 33/59] changed ColorColumn highlight in neovim :3 --- homes/modules/programs/neovim/lua/colors.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/homes/modules/programs/neovim/lua/colors.lua b/homes/modules/programs/neovim/lua/colors.lua index 077dfaa..47d6580 100644 --- a/homes/modules/programs/neovim/lua/colors.lua +++ b/homes/modules/programs/neovim/lua/colors.lua @@ -84,6 +84,7 @@ local function load_colors() -- editor colors :3 -------------------------------------------------------- vim.api.nvim_set_hl(0, "Visual", { bg = secondary_10 }) + vim.api.nvim_set_hl(0, "ColorColumn", { bg = secondary_30 }) -- blink.cmp --------------------------------------------------------------- From b0b5565f76eeaa0904450578df679669357fb1bb Mon Sep 17 00:00:00 2001 From: foxora Date: Fri, 20 Mar 2026 12:18:32 +0000 Subject: [PATCH 34/59] made completion engine changes :3 --- homes/modules/programs/neovim/lua/lsp/completion.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/homes/modules/programs/neovim/lua/lsp/completion.lua b/homes/modules/programs/neovim/lua/lsp/completion.lua index b408f23..6d80a6d 100644 --- a/homes/modules/programs/neovim/lua/lsp/completion.lua +++ b/homes/modules/programs/neovim/lua/lsp/completion.lua @@ -17,7 +17,7 @@ return { keymap = { [""] = { "show", "show_documentation", "hide_documentation" }, [""] = { "hide", "fallback" }, - [""] = { "select_and_accept", "fallback" }, + [""] = { "select_and_accept", "fallback" }, [""] = { "select_prev", "fallback_to_mappings" }, [""] = { "select_next", "fallback_to_mappings" }, @@ -30,7 +30,7 @@ return { [""] = { "snippet_forward", "fallback" }, [""] = { "snippet_backward", "fallback" }, - [""] = { "show_signature", "hide_signature", "fallback" }, + [""] = { "show_signature", "hide_signature", "fallback" }, }, appearance = { @@ -84,7 +84,7 @@ return { }, documentation = { - auto_show = false, + auto_show = true, window = { border = "rounded", }, From 592e6f021da1478be93adf204ef4bcb5dc381737 Mon Sep 17 00:00:00 2001 From: foxora Date: Fri, 20 Mar 2026 18:14:27 +0000 Subject: [PATCH 35/59] changed neovim keybinds --- homes/modules/programs/neovim/lua/lsp/capabilities.lua | 2 +- homes/modules/programs/neovim/lua/plugins/fyler.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/homes/modules/programs/neovim/lua/lsp/capabilities.lua b/homes/modules/programs/neovim/lua/lsp/capabilities.lua index 8f70f9f..7e9957b 100644 --- a/homes/modules/programs/neovim/lua/lsp/capabilities.lua +++ b/homes/modules/programs/neovim/lua/lsp/capabilities.lua @@ -38,7 +38,7 @@ function M.on_attach(_, bufnr) end -- TODO: someone who knows the builtin versions of these to do instead help me out please. nmap("D", vim.lsp.buf.type_definition, "Type [D]efinition") - nmap("E", vim.diagnostic.open_float, "Show [E]rror") + nmap("e", vim.diagnostic.open_float, "Show [E]rror") -- See `:help K` for why this keymap nmap("K", vim.lsp.buf.hover, "Hover Documentation") diff --git a/homes/modules/programs/neovim/lua/plugins/fyler.lua b/homes/modules/programs/neovim/lua/plugins/fyler.lua index 023f7f3..282e257 100644 --- a/homes/modules/programs/neovim/lua/plugins/fyler.lua +++ b/homes/modules/programs/neovim/lua/plugins/fyler.lua @@ -4,7 +4,7 @@ return { cmd = { "Fyler" }, keys = { { - "e", + "F", function() return require("fyler").toggle({ kind = "split_right" }) end, From ab94f4829421b7ad0a7090563255f14ec05437ec Mon Sep 17 00:00:00 2001 From: foxora Date: Sat, 21 Mar 2026 12:51:34 +0000 Subject: [PATCH 36/59] hlchunk has better perf :3 --- homes/modules/programs/neovim/lua/colors.lua | 14 ++------ .../programs/neovim/lua/plugins/hlchunk.lua | 36 +++++++++++++++++++ .../neovim/lua/plugins/indent-blankline.lua | 30 ---------------- .../programs/neovim/lua/plugins/init.lua | 2 +- homes/modules/programs/neovim/nixcats.nix | 4 +-- 5 files changed, 42 insertions(+), 44 deletions(-) create mode 100644 homes/modules/programs/neovim/lua/plugins/hlchunk.lua delete mode 100644 homes/modules/programs/neovim/lua/plugins/indent-blankline.lua diff --git a/homes/modules/programs/neovim/lua/colors.lua b/homes/modules/programs/neovim/lua/colors.lua index 47d6580..3a5bbc6 100644 --- a/homes/modules/programs/neovim/lua/colors.lua +++ b/homes/modules/programs/neovim/lua/colors.lua @@ -206,11 +206,9 @@ local function load_colors() -- lualine.nvim vim.api.nvim_exec_autocmds("User", { pattern = "RefreshLualine" }) - -- indent-blankline.nvim - vim.api.nvim_set_hl(0, "IblIndent", { fg = secondary_30 }) - vim.api.nvim_set_hl(0, "IblScope", { fg = color_11 }) - vim.api.nvim_exec_autocmds("User", { pattern = "RefreshIndentBlankline" }) - vim.api.nvim_set_hl(0, "@ibl.scope.underline.1", { underline = false }) + -- hlchunk.nvim + vim.api.nvim_set_hl(0, "HLIndent1", { fg = secondary_30 }) + vim.api.nvim_set_hl(0, "HLChunk1", { fg = color_11 }) else print("Error: Not enough colors in file") end @@ -238,9 +236,3 @@ local function watch_colorscheme() end watch_colorscheme() - -vim.api.nvim_create_autocmd("VimLeave", { - callback = function() - io.write("\027]112\007") - end, -}) diff --git a/homes/modules/programs/neovim/lua/plugins/hlchunk.lua b/homes/modules/programs/neovim/lua/plugins/hlchunk.lua new file mode 100644 index 0000000..d4c920d --- /dev/null +++ b/homes/modules/programs/neovim/lua/plugins/hlchunk.lua @@ -0,0 +1,36 @@ +return { + { + "hlchunk.nvim", + enabled = nixCats("ui.hlchunk") or false, + after = function(plugin) + require("hlchunk").setup({ + chunk = { + enable = true, + use_treesitter = true, + chars = { + horizontal_line = "─", + vertical_line = "│", + left_top = "╭", + left_bottom = "╰", + right_arrow = "─", + }, + style = { + "#B0F0FA", + }, + }, + indent = { + enable = true, + use_treesitter = false, + ahead_lines = 10, + delay = 25, + chars = { + "│", + }, + style = { + "#9080FA", + }, + }, + }) + end, + }, +} diff --git a/homes/modules/programs/neovim/lua/plugins/indent-blankline.lua b/homes/modules/programs/neovim/lua/plugins/indent-blankline.lua deleted file mode 100644 index 013fa29..0000000 --- a/homes/modules/programs/neovim/lua/plugins/indent-blankline.lua +++ /dev/null @@ -1,30 +0,0 @@ -local config = { - debounce = 25, - indent = { - char = "│", - smart_indent_cap = true, - }, - scope = { - show_start = true, - show_end = true, - show_exact_scope = false, - injected_languages = true, - }, -} - -return { - { - "indent-blankline.nvim", - enabled = nixCats("ui.indent-blankline") or false, - after = function(plugin) - require("ibl").setup(config) - - vim.api.nvim_create_autocmd("User", { - pattern = "RefreshIndentBlankline", - callback = function() - require("ibl").setup(config) - end, - }) - end, - }, -} diff --git a/homes/modules/programs/neovim/lua/plugins/init.lua b/homes/modules/programs/neovim/lua/plugins/init.lua index 9bf0602..d23ef30 100644 --- a/homes/modules/programs/neovim/lua/plugins/init.lua +++ b/homes/modules/programs/neovim/lua/plugins/init.lua @@ -8,5 +8,5 @@ require("lze").load({ { import = "plugins.comment" }, { import = "plugins.git" }, { import = "plugins.lualine" }, - { import = "plugins.indent-blankline" }, + { import = "plugins.hlchunk" }, }) diff --git a/homes/modules/programs/neovim/nixcats.nix b/homes/modules/programs/neovim/nixcats.nix index cb9c8c7..c763b68 100644 --- a/homes/modules/programs/neovim/nixcats.nix +++ b/homes/modules/programs/neovim/nixcats.nix @@ -126,7 +126,7 @@ in { ui = { dressing = [dressing-nvim]; lualine = [lualine-nvim]; - indent-blankline = [indent-blankline-nvim]; + hlchunk = [hlchunk-nvim]; }; qol = [ undotree @@ -241,7 +241,7 @@ in { ui = { dressing = true; lualine = true; - indent-blankline = true; + hlchunk = true; }; qol = true; From ae6f3d7438aef3c414ff3acce4538c3857adfe3d Mon Sep 17 00:00:00 2001 From: foxora Date: Sun, 22 Mar 2026 13:15:50 +0000 Subject: [PATCH 37/59] added audio source controls :3 --- homes/modules/de/waybar/style.css | 10 ++++++ homes/modules/de/waybar/waybar.nix | 47 +++++++++++++++++++++++--- homes/modules/wm/hyprland/hyprland.nix | 3 ++ 3 files changed, 55 insertions(+), 5 deletions(-) diff --git a/homes/modules/de/waybar/style.css b/homes/modules/de/waybar/style.css index 54ae077..b5be4e9 100644 --- a/homes/modules/de/waybar/style.css +++ b/homes/modules/de/waybar/style.css @@ -102,6 +102,16 @@ right-side modules color: @colorfg; } +#pulseaudio.sink { + margin: 4px 0 4px 4px; + border-radius: 32px 0px 0px 32px; +} +#pulseaudio.source { + margin: 4px 0 4px 0; + border-radius: 0px 32px 32px 0px; + border-width: 1px 1px 1px 0px; +} + /* connects the workspace and taskbar together :3 */ diff --git a/homes/modules/de/waybar/waybar.nix b/homes/modules/de/waybar/waybar.nix index d1da186..b91076d 100644 --- a/homes/modules/de/waybar/waybar.nix +++ b/homes/modules/de/waybar/waybar.nix @@ -6,24 +6,45 @@ layer = "top"; position = "top"; height = 20; - modules-left = ["hyprland/workspaces" "wlr/taskbar" "custom/media"]; - modules-center = ["clock"]; - modules-right = ["hyprland/submap" "cpu" "memory" "network" "pulseaudio" "privacy" "tray"]; + + modules-left = [ + "hyprland/workspaces" + "wlr/taskbar" + "custom/media" + ]; + + modules-center = [ + "clock" + ]; + + modules-right = [ + "hyprland/submap" + "cpu" + "memory" + "network" + "pulseaudio#sink" + "pulseaudio#source" + "privacy" + "tray" + ]; # left "hyprland/workspaces" = { format = "{id}"; }; + + # not enabled yet, hyprland and mango need two different configs ;-; "ext/workspaces" = { - # not enabled yet, hyprland and mango need two different configs ;-; format = "{id}"; ignore-hidden = true; on-click = "activate"; }; + "wlr/taskbar" = { format = "{icon}"; icon-size = 12; }; + "custom/media" = { exec = "auroramedia"; return-type = "json"; @@ -46,14 +67,17 @@ max-length = 12; tooltip = false; }; + "cpu" = { format = " {usage}%"; interval = 1; }; + "memory" = { format = " {used:0.1f} / {total:0.1f} GiB"; interval = 1; }; + "network" = { format = "{bandwidthUpBytes}  {bandwidthDownBytes}  {ifname}"; format-wifi = " {bandwidthUpBytes}  {bandwidthDownBytes} "; @@ -62,7 +86,8 @@ interval = 1; max-length = 32; }; - "pulseaudio" = { + + "pulseaudio#sink" = { format = "{icon} {volume}%"; format-muted = " {volume}%"; format-icons = { @@ -73,7 +98,18 @@ ]; }; "scroll-step" = 5; + tooltip = true; }; + + "pulseaudio#source" = { + format = "{format_source}"; + format-source = " {volume}%"; + format-source-muted = " {volume}%"; + on-scroll-up = "wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SOURCE@ 5%+"; + on-scroll-down = "wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SOURCE@ 5%-"; + tooltip = true; + }; + "privacy" = { icon-size = 12; icon-spacing = 5; @@ -91,6 +127,7 @@ } ]; }; + "tray" = { icon-size = 12; spacing = 10; diff --git a/homes/modules/wm/hyprland/hyprland.nix b/homes/modules/wm/hyprland/hyprland.nix index 6cf6034..bac2621 100644 --- a/homes/modules/wm/hyprland/hyprland.nix +++ b/homes/modules/wm/hyprland/hyprland.nix @@ -148,6 +148,7 @@ # media binds (more in binde below) ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle" + "Ctrl_R, XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle" ", XF86AudioPlay, exec, playerctl play-pause" ", XF86AudioNext, exec, playerctl next" ", XF86AudioPrev, exec, playerctl previous" @@ -258,6 +259,8 @@ binde = [ ", XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 5%+" ", XF86AudioLowerVolume, exec, wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 5%-" + "Ctrl_R, XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SOURCE@ 5%+" + "Ctrl_R, XF86AudioLowerVolume, exec, wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SOURCE@ 5%-" "Shift_R, XF86AudioRaiseVolume, exec, playerctl volume 0.05+" "Shift_R, XF86AudioLowerVolume, exec, playerctl volume 0.05-" From 9d481bcdcff792f6516b1f118091f69fe8627ca4 Mon Sep 17 00:00:00 2001 From: foxora Date: Wed, 25 Mar 2026 16:55:21 +0000 Subject: [PATCH 38/59] changed pinned dms --- homes/modules/programs/nixcord.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/homes/modules/programs/nixcord.nix b/homes/modules/programs/nixcord.nix index a369a68..b1e65b2 100644 --- a/homes/modules/programs/nixcord.nix +++ b/homes/modules/programs/nixcord.nix @@ -163,9 +163,9 @@ "1436964273162289185" "1436988320474206311" "1449837047383855119" - "1436968495190642722" "1465424321919975454" "1468324280445046824" + "1461929299727749145" ]; } { @@ -174,6 +174,7 @@ color = 10223511; collapsed = false; channels = [ + "1436968495190642722" "1436985374286155799" "1436965657076826222" "1429921297160212681" @@ -190,7 +191,6 @@ "1461885176534794427" "1462155159470866443" "1468735915076878407" - "1461929299727749145" "1470963392121536657" ]; } From 4b8552fdb1c2b2610918f73bed0aa469f8e91518 Mon Sep 17 00:00:00 2001 From: foxora Date: Sun, 29 Mar 2026 22:29:47 +0100 Subject: [PATCH 39/59] vr works again!!! --- hosts/nixarawrui/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/hosts/nixarawrui/default.nix b/hosts/nixarawrui/default.nix index 88664b7..0f7d2b1 100644 --- a/hosts/nixarawrui/default.nix +++ b/hosts/nixarawrui/default.nix @@ -308,7 +308,18 @@ alvr = { enable = true; - package = upkgs.alvr; + + package = (upkgs.alvr.override {ffmpeg = upkgs.ffmpeg_7;}).overrideAttrs (old: rec { + postPatch = + (old.postPatch or "") + + '' + substituteInPlace alvr/server_openvr/src/lib.rs \ + --replace-fail \ + "let early_hmd_initialization = !dashboard_process_paths.is_empty();" \ + "let early_hmd_initialization = true;" + ''; + }); + openFirewall = true; }; From 0794ed7edd0c23842a845c935c7ba615058aaa1e Mon Sep 17 00:00:00 2001 From: foxora Date: Tue, 31 Mar 2026 04:15:07 +0100 Subject: [PATCH 40/59] made changes :3 --- homes/aurora/default.nix | 1 + homes/modules/programs/neovim/nixcats.nix | 2 +- homes/modules/shell/zsh.nix | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/homes/aurora/default.nix b/homes/aurora/default.nix index c7ec891..404c797 100644 --- a/homes/aurora/default.nix +++ b/homes/aurora/default.nix @@ -115,6 +115,7 @@ # cli fun pokeget-rs # prints a random pokemon to the terminal :3 pipes # pipes program <3 + cmatrix # the matrix :3 # dev gnumake diff --git a/homes/modules/programs/neovim/nixcats.nix b/homes/modules/programs/neovim/nixcats.nix index c763b68..9ea2a99 100644 --- a/homes/modules/programs/neovim/nixcats.nix +++ b/homes/modules/programs/neovim/nixcats.nix @@ -241,7 +241,7 @@ in { ui = { dressing = true; lualine = true; - hlchunk = true; + hlchunk = false; # seems really laggy }; qol = true; diff --git a/homes/modules/shell/zsh.nix b/homes/modules/shell/zsh.nix index 1cb9e27..654ba9a 100644 --- a/homes/modules/shell/zsh.nix +++ b/homes/modules/shell/zsh.nix @@ -34,7 +34,7 @@ shellAliases = { # files and nav stuff - ls = "eza"; + ls = "eza --icons=auto"; ll = "ls -la"; lt = "ls --tree"; llt = "ll --tree"; From 11b2fa00d244e8f6f750e44fe24705d6b5f0e94a Mon Sep 17 00:00:00 2001 From: foxora Date: Tue, 31 Mar 2026 18:05:37 +0100 Subject: [PATCH 41/59] made sure sql has the right indentation --- .../modules/programs/neovim/lua/lsp/indentation.lua | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/homes/modules/programs/neovim/lua/lsp/indentation.lua b/homes/modules/programs/neovim/lua/lsp/indentation.lua index 5deae31..1fbe119 100644 --- a/homes/modules/programs/neovim/lua/lsp/indentation.lua +++ b/homes/modules/programs/neovim/lua/lsp/indentation.lua @@ -7,6 +7,15 @@ vim.api.nvim_create_autocmd("FileType", { end, }) +vim.api.nvim_create_autocmd("FileType", { + pattern = { "sql" }, + callback = function() + vim.opt_local.shiftwidth = 4 + vim.opt_local.tabstop = 4 + vim.opt_local.expandtab = true + end, +}) + vim.api.nvim_create_autocmd("User", { pattern = "TelescopePreviewerLoaded", callback = function(args) @@ -15,6 +24,10 @@ vim.api.nvim_create_autocmd("User", { vim.bo.shiftwidth = 2 vim.bo.tabstop = 2 vim.bo.expandtab = true + elseif vim.tbl_contains({ "sql" }, ft) then + vim.bo.shiftwidth = 4 + vim.bo.tabstop = 4 + vim.bo.expandtab = true end end, }) From a1b8beb8b36c19b7b5eb9aa63780c96326ddfbd5 Mon Sep 17 00:00:00 2001 From: foxora Date: Wed, 1 Apr 2026 20:34:19 +0100 Subject: [PATCH 42/59] made vesktop declarative --- flake.lock | 152 ++++++++++++++--------------- homes/aurora/default.nix | 1 - homes/modules/programs/nixcord.nix | 3 + 3 files changed, 79 insertions(+), 77 deletions(-) diff --git a/flake.lock b/flake.lock index 3e9a921..8ee7214 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1773436376, - "narHash": "sha256-OUPRrprbgN27BXHuWkMAPSCfLLQ/uwpWghEfKYN2iAg=", + "lastModified": 1774211390, + "narHash": "sha256-sTtAgCCaX8VNNZlQFACd3i1IQ+DB0Wf3COgiFS152ds=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "43f10d24391692bba3d762931ee35e7f17f8e8b8", + "rev": "f62a4dbfa4e5584f14ad4c62afedf6e4b433cf70", "type": "github" }, "original": { @@ -76,11 +76,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1770895252, - "narHash": "sha256-TUGZVDcC5xsrWVnpBNosAG1cTy+aWchCWXPyeLZdnGM=", + "lastModified": 1774191766, + "narHash": "sha256-bvO+gfuUOVUiBEwAJ5A2RjpysPzCfyXD+DM8piOa1+4=", "ref": "refs/heads/main", - "rev": "2c86d41d07471f518e24f5cd1f586e4d2a32d12c", - "revCount": 1331, + "rev": "7a8fc2e646b97e5ae508a44d3449e3b41345d456", + "revCount": 1336, "type": "git", "url": "https://codeberg.org/LGFae/awww" }, @@ -98,11 +98,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1773610965, - "narHash": "sha256-0VcA3dwW6tJuikDj3bqx3luqrxxsPhMcCXswmgWxkVE=", + "lastModified": 1775068343, + "narHash": "sha256-w/i/5Gf9Wm8rA6PAriiUzlyx0c5WIXLjSQZYCdoKgQ4=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "0ffc149abac0215fc0d41ddb8df8b87887c2fcc8", + "rev": "9b4cf01c0e0581c6b1bb8163942a833a75793bad", "type": "github" }, "original": { @@ -114,11 +114,11 @@ "cachyos-kernel": { "flake": false, "locked": { - "lastModified": 1773425695, - "narHash": "sha256-O5Fr6f+iS+IVKdB59yqkCaWfkr1SSHD5BLDDlZO7RwU=", + "lastModified": 1774985922, + "narHash": "sha256-1qGc17yGMknQSwoXHMewNOuJNiuTBjS2Av1DP3+N01o=", "owner": "CachyOS", "repo": "linux-cachyos", - "rev": "3b9ae1ae5d4ee95e1509d350b65c0777dde97628", + "rev": "3bf1ef40e58891e0111cb4f33ee8a857bf012e2b", "type": "github" }, "original": { @@ -130,11 +130,11 @@ "cachyos-kernel-patches": { "flake": false, "locked": { - "lastModified": 1773430072, - "narHash": "sha256-0X47YCF1CUnLiQ1M6Lh4hc3ax9aV5DX/wCmMfuMyM1o=", + "lastModified": 1774500343, + "narHash": "sha256-8sCdFTHJF0ZES8/Qa6DVbMAzZ1PLGYcZcQJBokoa7Bg=", "owner": "CachyOS", "repo": "kernel-patches", - "rev": "ac70453c25200f0a30ad38b3caa63020869f0f8a", + "rev": "948e9c61779b0fafdf0c3b1ee6281502ff178fcc", "type": "github" }, "original": { @@ -468,11 +468,11 @@ ] }, "locked": { - "lastModified": 1773681845, - "narHash": "sha256-o8hrZrigP0JYcwnglCp8Zi8jQafWsxbDtRRPzuVwFxY=", + "lastModified": 1774875830, + "narHash": "sha256-WPYlTmZvVa9dWlAziFkVjBdv1Z6giNIq40O1DxsBmiI=", "owner": "nix-community", "repo": "home-manager", - "rev": "0759e0e137305bc9d0c52c204c6d8dffe6f601a6", + "rev": "7afd8cebb99e25a64a745765920e663478eb8830", "type": "github" }, "original": { @@ -489,11 +489,11 @@ ] }, "locked": { - "lastModified": 1773608492, - "narHash": "sha256-QZteyExJYSQzgxqdsesDPbQgjctGG7iKV/6ooyQPITk=", + "lastModified": 1775047159, + "narHash": "sha256-UWM4VZvfKaPwA9FMu7iZha5YAE8vsEtUazk+rFxmbTY=", "owner": "nix-community", "repo": "home-manager", - "rev": "9a40ec3b78fc688d0908485887d355caa5666d18", + "rev": "1ce9e62690dfdd7e76bd266ccb9a887778410eb2", "type": "github" }, "original": { @@ -510,11 +510,11 @@ ] }, "locked": { - "lastModified": 1773607598, - "narHash": "sha256-nPV/IE0NwQjYcXkEGOmCIEsX9i8HFMeq2RupYzfVdiI=", + "lastModified": 1774875830, + "narHash": "sha256-WPYlTmZvVa9dWlAziFkVjBdv1Z6giNIq40O1DxsBmiI=", "owner": "nix-community", "repo": "home-manager", - "rev": "1f8f9e001235652cf54f9c1f7983f9c0e920944a", + "rev": "7afd8cebb99e25a64a745765920e663478eb8830", "type": "github" }, "original": { @@ -532,11 +532,11 @@ ] }, "locked": { - "lastModified": 1773422513, - "narHash": "sha256-MPjR48roW7CUMU6lu0+qQGqj92Kuh3paIulMWFZy+NQ=", + "lastModified": 1774991950, + "narHash": "sha256-kScKj3qJDIWuN9/6PMmgy5esrTUkYinrO5VvILik/zw=", "owner": "nix-community", "repo": "home-manager", - "rev": "ef12a9a2b0f77c8fa3dda1e7e494fca668909056", + "rev": "f2d3e04e278422c7379e067e323734f3e8c585a7", "type": "github" }, "original": { @@ -622,11 +622,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1773615208, - "narHash": "sha256-a8So/3JL/1P+QZjqp1tBW7tkXyBX+WkbRyBNkds59aY=", + "lastModified": 1775050177, + "narHash": "sha256-HEDofQ+Zs4toY6yqvScK4nXWewrdhAqM9mGOibsMzZo=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "30c498acf4173930dfd8afd6279ebceacb1941e9", + "rev": "7fbf8f98477dfbb2e6b193ef85e0c2d119d3fe80", "type": "github" }, "original": { @@ -799,11 +799,11 @@ ] }, "locked": { - "lastModified": 1773436263, - "narHash": "sha256-n+2xFJngUkBqUJD5FsbVnYEHBTyDFSqtBIwQIGPXWWo=", + "lastModified": 1774211405, + "narHash": "sha256-6KNwP4ojUzv3YBlZU5BqCpTrWHcix1Jo01BISsTT0xk=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "5e228db6821380a5875d5643176c5c46a47b8134", + "rev": "cb4e152dc72095a2af422956c6b689590572231a", "type": "github" }, "original": { @@ -983,11 +983,11 @@ "scenefx": "scenefx" }, "locked": { - "lastModified": 1773887083, - "narHash": "sha256-Uqo0rulfjQmUmlRJTWfu5anjdsvY2xDZtvKtmEMECts=", + "lastModified": 1774866937, + "narHash": "sha256-y0gRNhn61f52Kq7cFXEDhRn5A66e4qlqlaeLTYaw9Ac=", "owner": "mangowm", "repo": "mango", - "rev": "c776356efe165dca09742f78f2a018e065b825be", + "rev": "52676492fe22356b45f9cbda9d24d887f4039f02", "type": "github" }, "original": { @@ -1005,11 +1005,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1773018425, - "narHash": "sha256-fpgZBmZpKoEXEowBK/6m8g9FcOLWQ4UxhXHqCw2CpSM=", + "lastModified": 1775055092, + "narHash": "sha256-N9EjeJD5qnszo08XSXeCvUylU1tJDJ1LxRb4Zb/YcKU=", "owner": "microvm-nix", "repo": "microvm.nix", - "rev": "25ebda3c558e923720c965832dc9a04f559a055c", + "rev": "0f112113172c9fabeb27a94f39397d11df49e671", "type": "github" }, "original": { @@ -1026,11 +1026,11 @@ "spectrum": "spectrum_2" }, "locked": { - "lastModified": 1773018425, - "narHash": "sha256-fpgZBmZpKoEXEowBK/6m8g9FcOLWQ4UxhXHqCw2CpSM=", + "lastModified": 1775055092, + "narHash": "sha256-N9EjeJD5qnszo08XSXeCvUylU1tJDJ1LxRb4Zb/YcKU=", "owner": "microvm-nix", "repo": "microvm.nix", - "rev": "25ebda3c558e923720c965832dc9a04f559a055c", + "rev": "0f112113172c9fabeb27a94f39397d11df49e671", "type": "github" }, "original": { @@ -1195,11 +1195,11 @@ }, "nixcats": { "locked": { - "lastModified": 1770584904, - "narHash": "sha256-9Zaz8lbKF2W9pwXZEnbiGsicHdBoU+dHt3Wv3mCJoZ8=", + "lastModified": 1774835836, + "narHash": "sha256-6ok7iv/9R82vl6MYe3Lwyyb6S5bmW2PxEZtmjzlqyPs=", "owner": "BirdeeHub", "repo": "nixCats-nvim", - "rev": "538fdde784d2909700d97a8ef307783b33a86fb1", + "rev": "ebb9f279a55ca60ff4e37e4accf6518dc627aa8d", "type": "github" }, "original": { @@ -1218,11 +1218,11 @@ "nixpkgs-nixcord": "nixpkgs-nixcord" }, "locked": { - "lastModified": 1773597570, - "narHash": "sha256-A6KsirR9kxR1wVFTr8aagk5vUT3rvKTf79Qht6YkxUA=", + "lastModified": 1775060652, + "narHash": "sha256-/H9vs3NFCB4HGRfpvRXLDVl8k/up7qfIs/4d0tSXkdY=", "owner": "FlameFlag", "repo": "nixcord", - "rev": "1cc0ddb766e459b7187e6aeb8b2e046d37361dc4", + "rev": "29cc1ce1d53b4e4b8c6249f843cae2604b305c1b", "type": "github" }, "original": { @@ -1233,11 +1233,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1773563071, - "narHash": "sha256-p4f6smYpck1hw6gYsT2omq01gnlZ1E7HTpssDQ0fP+g=", + "lastModified": 1775020384, + "narHash": "sha256-3XiHDhiNxb2vWI0en8ug7WBMEPj9mcaWcMhaFFfhfJY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1c6f50e5b62030a50799682b6babc9dcc5a271ae", + "rev": "c9971bfbabf2fa3f3b7e6e4cbeaa2abd6295b478", "type": "github" }, "original": { @@ -1294,11 +1294,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1773620976, - "narHash": "sha256-kgxB+kzrbxYf/CaWA5tvn7mnhzEt78aWfVakZw/TRbs=", + "lastModified": 1775069986, + "narHash": "sha256-Jii9g6dOxfsDxHLvgpFNkicDC35cZBpquNt6NUwcnfQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7ee76979bc1b2169d7e632572c2c31c9ee01f728", + "rev": "5435d3d36f34d37f0b662c5734a3e986bcc31540", "type": "github" }, "original": { @@ -1326,11 +1326,11 @@ }, "nixpkgs-staging": { "locked": { - "lastModified": 1773620792, - "narHash": "sha256-5WSJs2YpBJpA9VG1PwFL5vpHw4ySOz2u02S4hAQKkuU=", + "lastModified": 1775067557, + "narHash": "sha256-inNo+JkHYo5I6LUnPvfjArgTmJCeu6WMqnBGv7Lcjd0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "525870a58b715d25c23fb00c7be737324d8161c3", + "rev": "9c05562244d213d7ebc235a84c4bb6f6d86410ea", "type": "github" }, "original": { @@ -1342,11 +1342,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1773389992, - "narHash": "sha256-wvfdLLWJ2I9oEpDd9PfMA8osfIZicoQ5MT1jIwNs9Tk=", + "lastModified": 1774709303, + "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c06b4ae3d6599a672a6210b7021d699c351eebda", + "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685", "type": "github" }, "original": { @@ -1374,11 +1374,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1773524153, - "narHash": "sha256-Jms57zzlFf64ayKzzBWSE2SGvJmK+NGt8Gli71d9kmY=", + "lastModified": 1775002709, + "narHash": "sha256-d3Yx83vSrN+2z/loBh4mJpyRqr9aAJqlke4TkpFmRJA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e9f278faa1d0c2fc835bd331d4666b59b505a410", + "rev": "bcd464ccd2a1a7cd09aa2f8d4ffba83b761b1d0e", "type": "github" }, "original": { @@ -1418,11 +1418,11 @@ ] }, "locked": { - "lastModified": 1772893680, - "narHash": "sha256-JDqZMgxUTCq85ObSaFw0HhE+lvdOre1lx9iI6vYyOEs=", + "lastModified": 1774104215, + "narHash": "sha256-EAtviqz0sEAxdHS4crqu7JGR5oI3BwaqG0mw7CmXkO8=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "8baab586afc9c9b57645a734c820e4ac0a604af9", + "rev": "f799ae951fde0627157f40aec28dec27b22076d0", "type": "github" }, "original": { @@ -1593,11 +1593,11 @@ ] }, "locked": { - "lastModified": 1773619901, - "narHash": "sha256-Br8CQy4ht+a2OxyzaRwuP5+oIFfoRvCxYgsmdrgid40=", + "lastModified": 1774790928, + "narHash": "sha256-/JO77td8AOH45kg9IJl2DXDwbhn+cyQxYbCMu4Ae1CA=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "6f06ff05cd536b790b7662550a10b61a1ac4619e", + "rev": "2bfdf55faf76fed12950b17d4af501e5a463607f", "type": "github" }, "original": { @@ -1767,11 +1767,11 @@ ] }, "locked": { - "lastModified": 1772669058, - "narHash": "sha256-XhnY0aRuDo5LT8pmJVPofPOgO2hAR7T+XRoaQxtNPzQ=", + "lastModified": 1773601989, + "narHash": "sha256-2tJf/CQoHApoIudxHeJye+0Ii7scR0Yyi7pNiWk0Hn8=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "906d0ac159803a7df2dc1f948df9327670380f69", + "rev": "a9b862d1aa000a676d310cc62d249f7ad726233d", "type": "github" }, "original": { @@ -1788,11 +1788,11 @@ ] }, "locked": { - "lastModified": 1773588616, - "narHash": "sha256-Ukh79t1IMpP4FRsJDZ/3Y72VpW+QwNe/QRB5pTsH20Q=", + "lastModified": 1775021133, + "narHash": "sha256-JB0u0evfSlmNg9HdGDxtXjaCcdKUpFPdSAMGxvJo5Pw=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "b34b64ee5a85ab61394c491ac3dad335d3cbfbb8", + "rev": "4bf1a6837064486c4f573a9d500c4cf3c1c075c0", "type": "github" }, "original": { diff --git a/homes/aurora/default.nix b/homes/aurora/default.nix index 404c797..766fd81 100644 --- a/homes/aurora/default.nix +++ b/homes/aurora/default.nix @@ -141,7 +141,6 @@ obsidian # literally best notes app (i use vim mode) qimgv # image viewer! feh # other image viewer! (im indecisive) - vesktop # modded discord client! gimp # open source image manipulation program krita # open source painting application! imhex # hex editor diff --git a/homes/modules/programs/nixcord.nix b/homes/modules/programs/nixcord.nix index b1e65b2..12e0d31 100644 --- a/homes/modules/programs/nixcord.nix +++ b/homes/modules/programs/nixcord.nix @@ -10,9 +10,12 @@ programs.nixcord = { enable = true; + equibop.enable = true; equibop.package = upkgs.equibop; + vesktop.enable = true; + discord = { vencord.enable = false; equicord.enable = true; From 4321b6f6c312fe1cd50d060bfc1a23f334ed09ef Mon Sep 17 00:00:00 2001 From: foxora Date: Sun, 5 Apr 2026 02:01:34 +0100 Subject: [PATCH 43/59] css indentation :3 --- homes/modules/programs/neovim/lua/lsp/indentation.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/homes/modules/programs/neovim/lua/lsp/indentation.lua b/homes/modules/programs/neovim/lua/lsp/indentation.lua index 1fbe119..63cf7d7 100644 --- a/homes/modules/programs/neovim/lua/lsp/indentation.lua +++ b/homes/modules/programs/neovim/lua/lsp/indentation.lua @@ -1,5 +1,5 @@ vim.api.nvim_create_autocmd("FileType", { - pattern = { "lua", "nix", "gleam" }, + pattern = { "lua", "nix", "gleam", "css" }, callback = function() vim.opt_local.shiftwidth = 2 vim.opt_local.tabstop = 2 @@ -20,7 +20,7 @@ vim.api.nvim_create_autocmd("User", { pattern = "TelescopePreviewerLoaded", callback = function(args) local ft = args.data.filetype - if vim.tbl_contains({ "lua", "nix", "gleam", "rust" }, ft) then + if vim.tbl_contains({ "lua", "nix", "gleam", "css" }, ft) then vim.bo.shiftwidth = 2 vim.bo.tabstop = 2 vim.bo.expandtab = true From c5416f0b925d337db4acc6d1870d43a9b5b01a2e Mon Sep 17 00:00:00 2001 From: foxora Date: Sun, 5 Apr 2026 18:13:35 +0100 Subject: [PATCH 44/59] added leptosfmt --- .../modules/programs/neovim/lua/plugins/format.lua | 13 ++++++++++++- homes/modules/programs/neovim/nixcats.nix | 6 ++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/homes/modules/programs/neovim/lua/plugins/format.lua b/homes/modules/programs/neovim/lua/plugins/format.lua index 800fde7..636008b 100644 --- a/homes/modules/programs/neovim/lua/plugins/format.lua +++ b/homes/modules/programs/neovim/lua/plugins/format.lua @@ -58,7 +58,18 @@ return { formatters_by_ft = { lua = nixCats("lang.lua.format") and { "stylua" } or nil, nix = nixCats("lang.nix.format") and { "alejandra" } or nil, - rust = nixCats("lang.rust.format") and { "rustfmt", lsp_format = "fallback" } or nil, + rust = (function() + if not nixCats("lang.rust.format") then + return nil + end + local formatters = {} + if nixCats("lang.rust.formatters.leptos") then + table.insert(formatters, "leptosfmt") + end + table.insert(formatters, "rustfmt") + formatters.lsp_format = "fallback" + return formatters + end)(), haskell = nixCats("lang.haskell.format") and { "ormolu" } or nil, proto = nixCats("lang.protobuf.format") and { "buf" } or nil, toml = nixCats("lang.toml.format") and { "taplo" } or nil, diff --git a/homes/modules/programs/neovim/nixcats.nix b/homes/modules/programs/neovim/nixcats.nix index 9ea2a99..e848ce9 100644 --- a/homes/modules/programs/neovim/nixcats.nix +++ b/homes/modules/programs/neovim/nixcats.nix @@ -65,6 +65,9 @@ in { lsp = [cargo mpkgs.rust-analyzer]; # nightly rustfmt has nicer features :3 format = [(rustfmt.override {asNightly = true;})]; + formatters = { + leptos = [leptosfmt]; + }; }; zig = { lsp = [zls]; @@ -278,6 +281,9 @@ in { rust.lsp = true; rust.format = true; + rust.formatters = { + leptos = true; + }; zig.lsp = true; zig.format = true; From b1a03c6a9764d93bb514ec3fa64877605c0908b9 Mon Sep 17 00:00:00 2001 From: foxora Date: Tue, 7 Apr 2026 17:55:49 +0100 Subject: [PATCH 45/59] updated flake --- flake.lock | 108 +++++++++++++++++------------------ hosts/nixarawrui/default.nix | 2 +- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/flake.lock b/flake.lock index 8ee7214..45e01a7 100644 --- a/flake.lock +++ b/flake.lock @@ -98,11 +98,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1775068343, - "narHash": "sha256-w/i/5Gf9Wm8rA6PAriiUzlyx0c5WIXLjSQZYCdoKgQ4=", + "lastModified": 1775412159, + "narHash": "sha256-217zU2fKzIgcn9qht9MvvHDOgywnAZ0vFsYFg+c80oE=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "9b4cf01c0e0581c6b1bb8163942a833a75793bad", + "rev": "98d1a70e3c0c14d23bc6ef395110664e1221daf4", "type": "github" }, "original": { @@ -114,11 +114,11 @@ "cachyos-kernel": { "flake": false, "locked": { - "lastModified": 1774985922, - "narHash": "sha256-1qGc17yGMknQSwoXHMewNOuJNiuTBjS2Av1DP3+N01o=", + "lastModified": 1775145950, + "narHash": "sha256-AfVja9nvYHm0BHbuTvn+K8rKfLmPl5QjoiNecp9HOJU=", "owner": "CachyOS", "repo": "linux-cachyos", - "rev": "3bf1ef40e58891e0111cb4f33ee8a857bf012e2b", + "rev": "b91624f68ceaf5394ef1571f60290dca6ba22b45", "type": "github" }, "original": { @@ -130,11 +130,11 @@ "cachyos-kernel-patches": { "flake": false, "locked": { - "lastModified": 1774500343, - "narHash": "sha256-8sCdFTHJF0ZES8/Qa6DVbMAzZ1PLGYcZcQJBokoa7Bg=", + "lastModified": 1775157685, + "narHash": "sha256-g8HgH7gADoEnrBN30BK3pz7+M2pT/p3xtfRFEuEov5w=", "owner": "CachyOS", "repo": "kernel-patches", - "rev": "948e9c61779b0fafdf0c3b1ee6281502ff178fcc", + "rev": "c1ba300617a12d257b5721572b9bbe28efae182f", "type": "github" }, "original": { @@ -331,11 +331,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1772408722, - "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", + "lastModified": 1775087534, + "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", + "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", "type": "github" }, "original": { @@ -468,11 +468,11 @@ ] }, "locked": { - "lastModified": 1774875830, - "narHash": "sha256-WPYlTmZvVa9dWlAziFkVjBdv1Z6giNIq40O1DxsBmiI=", + "lastModified": 1775077333, + "narHash": "sha256-OXcxobt7lBkh1B8AjwreU+24myhtKpqeLfAeIyNLFY8=", "owner": "nix-community", "repo": "home-manager", - "rev": "7afd8cebb99e25a64a745765920e663478eb8830", + "rev": "49ca96b2714c5931e17401eff87f3edd42d2b0f2", "type": "github" }, "original": { @@ -489,11 +489,11 @@ ] }, "locked": { - "lastModified": 1775047159, - "narHash": "sha256-UWM4VZvfKaPwA9FMu7iZha5YAE8vsEtUazk+rFxmbTY=", + "lastModified": 1775360939, + "narHash": "sha256-XUBlSgUFdvTh6+K5LcI5mJu5F5L8scmJDMRiZM484TM=", "owner": "nix-community", "repo": "home-manager", - "rev": "1ce9e62690dfdd7e76bd266ccb9a887778410eb2", + "rev": "2097a5c82bdc099c6135eae4b111b78124604554", "type": "github" }, "original": { @@ -510,11 +510,11 @@ ] }, "locked": { - "lastModified": 1774875830, - "narHash": "sha256-WPYlTmZvVa9dWlAziFkVjBdv1Z6giNIq40O1DxsBmiI=", + "lastModified": 1775077333, + "narHash": "sha256-OXcxobt7lBkh1B8AjwreU+24myhtKpqeLfAeIyNLFY8=", "owner": "nix-community", "repo": "home-manager", - "rev": "7afd8cebb99e25a64a745765920e663478eb8830", + "rev": "49ca96b2714c5931e17401eff87f3edd42d2b0f2", "type": "github" }, "original": { @@ -622,11 +622,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1775050177, - "narHash": "sha256-HEDofQ+Zs4toY6yqvScK4nXWewrdhAqM9mGOibsMzZo=", + "lastModified": 1775414227, + "narHash": "sha256-Kg4EZA9ZG/YnJoDmr1AfPkTVCW+0LZEt8KHwnOHXf0A=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "7fbf8f98477dfbb2e6b193ef85e0c2d119d3fe80", + "rev": "809b9b9e78c69c53b62dfc7d5de5c20ff8fe0626", "type": "github" }, "original": { @@ -983,11 +983,11 @@ "scenefx": "scenefx" }, "locked": { - "lastModified": 1774866937, - "narHash": "sha256-y0gRNhn61f52Kq7cFXEDhRn5A66e4qlqlaeLTYaw9Ac=", + "lastModified": 1775385829, + "narHash": "sha256-1lrZM6TwIVoiU2/cO6+OMuA6Fh9h5bUE1ZKo43X9vg0=", "owner": "mangowm", "repo": "mango", - "rev": "52676492fe22356b45f9cbda9d24d887f4039f02", + "rev": "e3a0d54b9a0167a83f724d710f87f8bca6ecabae", "type": "github" }, "original": { @@ -1005,11 +1005,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1775055092, - "narHash": "sha256-N9EjeJD5qnszo08XSXeCvUylU1tJDJ1LxRb4Zb/YcKU=", + "lastModified": 1775329298, + "narHash": "sha256-xmntQolopr1WwBO5rAC+SKyON+ritVQLUHZdvpjUM90=", "owner": "microvm-nix", "repo": "microvm.nix", - "rev": "0f112113172c9fabeb27a94f39397d11df49e671", + "rev": "4a9ff5adcefd23e68de76f33ebc7b3909e06c09b", "type": "github" }, "original": { @@ -1026,11 +1026,11 @@ "spectrum": "spectrum_2" }, "locked": { - "lastModified": 1775055092, - "narHash": "sha256-N9EjeJD5qnszo08XSXeCvUylU1tJDJ1LxRb4Zb/YcKU=", + "lastModified": 1775329298, + "narHash": "sha256-xmntQolopr1WwBO5rAC+SKyON+ritVQLUHZdvpjUM90=", "owner": "microvm-nix", "repo": "microvm.nix", - "rev": "0f112113172c9fabeb27a94f39397d11df49e671", + "rev": "4a9ff5adcefd23e68de76f33ebc7b3909e06c09b", "type": "github" }, "original": { @@ -1218,11 +1218,11 @@ "nixpkgs-nixcord": "nixpkgs-nixcord" }, "locked": { - "lastModified": 1775060652, - "narHash": "sha256-/H9vs3NFCB4HGRfpvRXLDVl8k/up7qfIs/4d0tSXkdY=", + "lastModified": 1775403802, + "narHash": "sha256-L7iWk7TwbLboSdCH1an3mTqdCjq5c75ijC7IFGSEpso=", "owner": "FlameFlag", "repo": "nixcord", - "rev": "29cc1ce1d53b4e4b8c6249f843cae2604b305c1b", + "rev": "43d45d61b7a94ee59868da04e411f9d198177577", "type": "github" }, "original": { @@ -1233,11 +1233,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1775020384, - "narHash": "sha256-3XiHDhiNxb2vWI0en8ug7WBMEPj9mcaWcMhaFFfhfJY=", + "lastModified": 1775371993, + "narHash": "sha256-shlcgEOzW6rl7zmZeYBMP9EpF3O/cTL7/HpWlyqearw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c9971bfbabf2fa3f3b7e6e4cbeaa2abd6295b478", + "rev": "ff2af6f7ebc6c123603d5689aeea6461290f46b5", "type": "github" }, "original": { @@ -1249,11 +1249,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1772328832, - "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", + "lastModified": 1774748309, + "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742", + "rev": "333c4e0545a6da976206c74db8773a1645b5870a", "type": "github" }, "original": { @@ -1294,11 +1294,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1775069986, - "narHash": "sha256-Jii9g6dOxfsDxHLvgpFNkicDC35cZBpquNt6NUwcnfQ=", + "lastModified": 1775414637, + "narHash": "sha256-jf5ZzXIjxjRBLM0qJozClea3lAMVdLMGR/9Ev4KyFf4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5435d3d36f34d37f0b662c5734a3e986bcc31540", + "rev": "2d14c6cdfe59bbef458fcd2a4bc5d9bccdce8340", "type": "github" }, "original": { @@ -1326,11 +1326,11 @@ }, "nixpkgs-staging": { "locked": { - "lastModified": 1775067557, - "narHash": "sha256-inNo+JkHYo5I6LUnPvfjArgTmJCeu6WMqnBGv7Lcjd0=", + "lastModified": 1775412642, + "narHash": "sha256-kjpGgxvWKpPHwwXZPeuchtQH9sQeATeyqkR1ig9ClMk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9c05562244d213d7ebc235a84c4bb6f6d86410ea", + "rev": "acacbdb7cb117f6d81412ba98ef999595eaa9072", "type": "github" }, "original": { @@ -1342,11 +1342,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1774709303, - "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", + "lastModified": 1775036866, + "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685", + "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", "type": "github" }, "original": { @@ -1788,11 +1788,11 @@ ] }, "locked": { - "lastModified": 1775021133, - "narHash": "sha256-JB0u0evfSlmNg9HdGDxtXjaCcdKUpFPdSAMGxvJo5Pw=", + "lastModified": 1775367672, + "narHash": "sha256-nGC6qrRsWysfR7/8wsSooq0X71rfJjhq1b+dFI6oQtY=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "4bf1a6837064486c4f573a9d500c4cf3c1c075c0", + "rev": "33cd729244914f1e121477c5de148639c5e73c4a", "type": "github" }, "original": { diff --git a/hosts/nixarawrui/default.nix b/hosts/nixarawrui/default.nix index 0f7d2b1..db633e6 100644 --- a/hosts/nixarawrui/default.nix +++ b/hosts/nixarawrui/default.nix @@ -309,7 +309,7 @@ alvr = { enable = true; - package = (upkgs.alvr.override {ffmpeg = upkgs.ffmpeg_7;}).overrideAttrs (old: rec { + package = upkgs.alvr.overrideAttrs (old: rec { postPatch = (old.postPatch or "") + '' From 24c23362fd7db887347ba45edc078919dd84a08d Mon Sep 17 00:00:00 2001 From: foxora Date: Tue, 7 Apr 2026 17:56:54 +0100 Subject: [PATCH 46/59] made sure rust-analyzer expanded proc macros --- homes/modules/programs/neovim/lua/lsp/lsp.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/homes/modules/programs/neovim/lua/lsp/lsp.lua b/homes/modules/programs/neovim/lua/lsp/lsp.lua index 230033a..0be588b 100644 --- a/homes/modules/programs/neovim/lua/lsp/lsp.lua +++ b/homes/modules/programs/neovim/lua/lsp/lsp.lua @@ -47,6 +47,11 @@ if nixCats("lang.rust.lsp") then diagnostics = { enable = true, }, + ["rust-analyzer"] = { + procMacro = { + enable = true, + }, + }, }, } end From 909300bc263023f29fc5538aeb8381b7fa56d4fc Mon Sep 17 00:00:00 2001 From: foxora Date: Tue, 7 Apr 2026 17:57:55 +0100 Subject: [PATCH 47/59] added color indication for mute states --- homes/modules/de/waybar/style.css | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/homes/modules/de/waybar/style.css b/homes/modules/de/waybar/style.css index b5be4e9..4ce38ba 100644 --- a/homes/modules/de/waybar/style.css +++ b/homes/modules/de/waybar/style.css @@ -105,11 +105,25 @@ right-side modules #pulseaudio.sink { margin: 4px 0 4px 4px; border-radius: 32px 0px 0px 32px; + color: @colorbg; + border-color: @color12; + background-color: @color12; +} +#pulseaudio.sink.muted { + color: @color12; + background-color: @colorbg; } #pulseaudio.source { margin: 4px 0 4px 0; border-radius: 0px 32px 32px 0px; border-width: 1px 1px 1px 0px; + color: @colorbg; + border-color: @color14; + background-color: @color14; +} +#pulseaudio.source.source-muted { + color: @color14; + background-color: @colorbg; } /* From d322ac8b741c3ed7d01b598169bc8ab1314ff57c Mon Sep 17 00:00:00 2001 From: foxora Date: Tue, 7 Apr 2026 17:58:55 +0100 Subject: [PATCH 48/59] added fren :3 --- homes/modules/programs/nixcord.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/homes/modules/programs/nixcord.nix b/homes/modules/programs/nixcord.nix index 12e0d31..55d3cce 100644 --- a/homes/modules/programs/nixcord.nix +++ b/homes/modules/programs/nixcord.nix @@ -240,6 +240,7 @@ "1437283420312047659" "1437089201651847315" "1467307140443148288" + "1473192300363649024" ]; } { From df0dddd22776515ca9614285254111c85b65a857 Mon Sep 17 00:00:00 2001 From: foxora Date: Thu, 9 Apr 2026 05:49:50 +0100 Subject: [PATCH 49/59] changed stuff idek anymore --- flake.lock | 138 +++++++++++++-------------- homes/modules/programs/yazi/yazi.nix | 1 + 2 files changed, 70 insertions(+), 69 deletions(-) diff --git a/flake.lock b/flake.lock index 45e01a7..1dbad20 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1774211390, - "narHash": "sha256-sTtAgCCaX8VNNZlQFACd3i1IQ+DB0Wf3COgiFS152ds=", + "lastModified": 1775558810, + "narHash": "sha256-fy95EdPnqQlpbP8+rk0yWKclWShCUS5VKs6P7/1MF2c=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "f62a4dbfa4e5584f14ad4c62afedf6e4b433cf70", + "rev": "7371b669b22aa2af980f913fc312a786d2f1abb2", "type": "github" }, "original": { @@ -98,11 +98,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1775412159, - "narHash": "sha256-217zU2fKzIgcn9qht9MvvHDOgywnAZ0vFsYFg+c80oE=", + "lastModified": 1775586808, + "narHash": "sha256-4Sk8qj8kFO3dhrxX5WVOGSISyILJTCmjR5eeGuX1lY4=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "98d1a70e3c0c14d23bc6ef395110664e1221daf4", + "rev": "97ca4cf337f839170998814f0f347857596a1794", "type": "github" }, "original": { @@ -114,11 +114,11 @@ "cachyos-kernel": { "flake": false, "locked": { - "lastModified": 1775145950, - "narHash": "sha256-AfVja9nvYHm0BHbuTvn+K8rKfLmPl5QjoiNecp9HOJU=", + "lastModified": 1775535525, + "narHash": "sha256-Q1HqL7lxx3sIYaAb+e4pl9L4Le3a3bEm/2IY9kSzARU=", "owner": "CachyOS", "repo": "linux-cachyos", - "rev": "b91624f68ceaf5394ef1571f60290dca6ba22b45", + "rev": "708043b2186d50d4e6ec1a1377b1452de08c3b91", "type": "github" }, "original": { @@ -130,11 +130,11 @@ "cachyos-kernel-patches": { "flake": false, "locked": { - "lastModified": 1775157685, - "narHash": "sha256-g8HgH7gADoEnrBN30BK3pz7+M2pT/p3xtfRFEuEov5w=", + "lastModified": 1775568994, + "narHash": "sha256-geh/xiRM8JFBo7lPuV9Op0LAZHz/VdhSQuCYNTthTJw=", "owner": "CachyOS", "repo": "kernel-patches", - "rev": "c1ba300617a12d257b5721572b9bbe28efae182f", + "rev": "b953e9a0044ab79b30abccee243afebfc185b622", "type": "github" }, "original": { @@ -468,11 +468,11 @@ ] }, "locked": { - "lastModified": 1775077333, - "narHash": "sha256-OXcxobt7lBkh1B8AjwreU+24myhtKpqeLfAeIyNLFY8=", + "lastModified": 1775425411, + "narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=", "owner": "nix-community", "repo": "home-manager", - "rev": "49ca96b2714c5931e17401eff87f3edd42d2b0f2", + "rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe", "type": "github" }, "original": { @@ -489,11 +489,11 @@ ] }, "locked": { - "lastModified": 1775360939, - "narHash": "sha256-XUBlSgUFdvTh6+K5LcI5mJu5F5L8scmJDMRiZM484TM=", + "lastModified": 1775598298, + "narHash": "sha256-FZRwskiertE+8wgFKjLoc/41UrVqzR2V3QseMBHuo/g=", "owner": "nix-community", "repo": "home-manager", - "rev": "2097a5c82bdc099c6135eae4b111b78124604554", + "rev": "98b4d61cfaf825c8b691afae0b6e152f0cc05c86", "type": "github" }, "original": { @@ -510,11 +510,11 @@ ] }, "locked": { - "lastModified": 1775077333, - "narHash": "sha256-OXcxobt7lBkh1B8AjwreU+24myhtKpqeLfAeIyNLFY8=", + "lastModified": 1775425411, + "narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=", "owner": "nix-community", "repo": "home-manager", - "rev": "49ca96b2714c5931e17401eff87f3edd42d2b0f2", + "rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe", "type": "github" }, "original": { @@ -590,11 +590,11 @@ ] }, "locked": { - "lastModified": 1772461523, - "narHash": "sha256-mI6A51do+hEUzeJKk9YSWfVHdI/SEEIBi2tp5Whq5mI=", + "lastModified": 1775496928, + "narHash": "sha256-Ds759WU03mGWtu3I43J+5GF5Ni8TvF+GYQUFD+fVeMo=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "7d63c04b4a2dd5e59ef943b4b143f46e713df804", + "rev": "cf95d93d17baa18f1d9b016b3afe27f820521a6e", "type": "github" }, "original": { @@ -622,11 +622,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1775414227, - "narHash": "sha256-Kg4EZA9ZG/YnJoDmr1AfPkTVCW+0LZEt8KHwnOHXf0A=", + "lastModified": 1775578056, + "narHash": "sha256-TiSPoIM8EBf6Z6Hrne5wX4hPfss1xTRcRfTL6+DfmLo=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "809b9b9e78c69c53b62dfc7d5de5c20ff8fe0626", + "rev": "75dc67e63f1873f1e97f73daf0ce284f75afa97c", "type": "github" }, "original": { @@ -668,11 +668,11 @@ ] }, "locked": { - "lastModified": 1772467975, - "narHash": "sha256-kipyuDBxrZq+beYpZqWzGvFWm4QbayW9agAvi94vDXY=", + "lastModified": 1774710575, + "narHash": "sha256-p7Rcw13+gA4Z9EI3oGYe3neQ3FqyOOfZCleBTfhJ95Q=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "5e1c6b9025aaf4d578f3eff7c0eb1f0c197a9507", + "rev": "0703df899520001209646246bef63358c9881e36", "type": "github" }, "original": { @@ -799,11 +799,11 @@ ] }, "locked": { - "lastModified": 1774211405, - "narHash": "sha256-6KNwP4ojUzv3YBlZU5BqCpTrWHcix1Jo01BISsTT0xk=", + "lastModified": 1774911391, + "narHash": "sha256-c4YVwO33Mmw+FIV8E0u3atJZagHvGTJ9Jai6RtiB8rE=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "cb4e152dc72095a2af422956c6b689590572231a", + "rev": "e6caa3d4d1427eedbdf556cf4ceb70f2d9c0b56d", "type": "github" }, "original": { @@ -853,11 +853,11 @@ ] }, "locked": { - "lastModified": 1773074819, - "narHash": "sha256-qRqYnXiKoJLRTcfaRukn7EifmST2IVBUMZOeZMAc5UA=", + "lastModified": 1775414057, + "narHash": "sha256-mDpHnf+MkdOxEqIM1TnckYYh9p1SXR8B3KQfNZ12M8s=", "owner": "hyprwm", "repo": "hyprwire", - "rev": "f68afd0e73687598cc2774804fedad76693046f0", + "rev": "86012ee01b0fdd8bf3101ef38816f2efbee42490", "type": "github" }, "original": { @@ -983,11 +983,11 @@ "scenefx": "scenefx" }, "locked": { - "lastModified": 1775385829, - "narHash": "sha256-1lrZM6TwIVoiU2/cO6+OMuA6Fh9h5bUE1ZKo43X9vg0=", + "lastModified": 1775461179, + "narHash": "sha256-4vvuk6tl8M2wuW3VJU9Uwc3HCrL95cSJImEODNNQEy8=", "owner": "mangowm", "repo": "mango", - "rev": "e3a0d54b9a0167a83f724d710f87f8bca6ecabae", + "rev": "e83a9dff820ce2215ecbbbea7d617d24d0825174", "type": "github" }, "original": { @@ -1218,11 +1218,11 @@ "nixpkgs-nixcord": "nixpkgs-nixcord" }, "locked": { - "lastModified": 1775403802, - "narHash": "sha256-L7iWk7TwbLboSdCH1an3mTqdCjq5c75ijC7IFGSEpso=", + "lastModified": 1775592269, + "narHash": "sha256-SB76MADRKDwYwLmKP3tpjlnhmQ9xVBE6WHyv9sskvZI=", "owner": "FlameFlag", "repo": "nixcord", - "rev": "43d45d61b7a94ee59868da04e411f9d198177577", + "rev": "814ebf38f04e99a37ebaf9159f5112238f828a1e", "type": "github" }, "original": { @@ -1233,11 +1233,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1775371993, - "narHash": "sha256-shlcgEOzW6rl7zmZeYBMP9EpF3O/cTL7/HpWlyqearw=", + "lastModified": 1775545155, + "narHash": "sha256-hTjWyj6wz9Iw6IjfrP+rZj1V1DjbVRCd1WjcpxH8Fqs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ff2af6f7ebc6c123603d5689aeea6461290f46b5", + "rev": "f97e195236002ce34b91d43ffe68557ac7d007fc", "type": "github" }, "original": { @@ -1294,11 +1294,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1775414637, - "narHash": "sha256-jf5ZzXIjxjRBLM0qJozClea3lAMVdLMGR/9Ev4KyFf4=", + "lastModified": 1775605449, + "narHash": "sha256-7xNGBc+aDnV5O2NEbVedKqTJZf7fMQplQ2KP0Uuso2c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2d14c6cdfe59bbef458fcd2a4bc5d9bccdce8340", + "rev": "ad1602de15363141e019f759c7c9fe8646b28b30", "type": "github" }, "original": { @@ -1326,11 +1326,11 @@ }, "nixpkgs-staging": { "locked": { - "lastModified": 1775412642, - "narHash": "sha256-kjpGgxvWKpPHwwXZPeuchtQH9sQeATeyqkR1ig9ClMk=", + "lastModified": 1775585988, + "narHash": "sha256-lIfMIN05ks3wNz3MqM9H6RkdNLg6RJuuDH0o4o1LOvI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "acacbdb7cb117f6d81412ba98ef999595eaa9072", + "rev": "2d38540b4428002cf24c82e81d947a3b2670d8a6", "type": "github" }, "original": { @@ -1342,11 +1342,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1775036866, - "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", + "lastModified": 1775423009, + "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", + "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", "type": "github" }, "original": { @@ -1374,11 +1374,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1775002709, - "narHash": "sha256-d3Yx83vSrN+2z/loBh4mJpyRqr9aAJqlke4TkpFmRJA=", + "lastModified": 1775305101, + "narHash": "sha256-/74n1oQPtKG52Yw41cbToxspxHbYz6O3vi+XEw16Qe8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bcd464ccd2a1a7cd09aa2f8d4ffba83b761b1d0e", + "rev": "36a601196c4ebf49e035270e10b2d103fe39076b", "type": "github" }, "original": { @@ -1418,11 +1418,11 @@ ] }, "locked": { - "lastModified": 1774104215, - "narHash": "sha256-EAtviqz0sEAxdHS4crqu7JGR5oI3BwaqG0mw7CmXkO8=", + "lastModified": 1775036584, + "narHash": "sha256-zW0lyy7ZNNT/x8JhzFHBsP2IPx7ATZIPai4FJj12BgU=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "f799ae951fde0627157f40aec28dec27b22076d0", + "rev": "4e0eb042b67d863b1b34b3f64d52ceb9cd926735", "type": "github" }, "original": { @@ -1538,11 +1538,11 @@ ] }, "locked": { - "lastModified": 1771956684, - "narHash": "sha256-+EtzmEzGA2xqwIvKrP0euYaOzrmTQWEWAiWV+k2WBEM=", + "lastModified": 1775529071, + "narHash": "sha256-z7LF/Vn8Zfbh5pgF/y7TPhz19AwTlQKrfGJdJHpOqOg=", "owner": "uiriansan", "repo": "SilentSDDM", - "rev": "34f82e1fb8412fff78b82a0dcce763492b36054c", + "rev": "f8ec3cd49dcd98c04860ca1ac105727b5cfc6981", "type": "github" }, "original": { @@ -1593,11 +1593,11 @@ ] }, "locked": { - "lastModified": 1774790928, - "narHash": "sha256-/JO77td8AOH45kg9IJl2DXDwbhn+cyQxYbCMu4Ae1CA=", + "lastModified": 1775421933, + "narHash": "sha256-JkEbzFDFTsUlVtHEzA8Y4r3O9LInhb96eOCbtGjGnbM=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "2bfdf55faf76fed12950b17d4af501e5a463607f", + "rev": "ec8d73085fdf807d55765335dc8126e14e7b2096", "type": "github" }, "original": { @@ -1788,11 +1788,11 @@ ] }, "locked": { - "lastModified": 1775367672, - "narHash": "sha256-nGC6qrRsWysfR7/8wsSooq0X71rfJjhq1b+dFI6oQtY=", + "lastModified": 1775453133, + "narHash": "sha256-VIlMG985ONqVqF+OnPuS5Shbz5k6tqbOWnDL7EH+IT4=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "33cd729244914f1e121477c5de148639c5e73c4a", + "rev": "8d0508ffceba8ad785ae442591dd115080a55142", "type": "github" }, "original": { diff --git a/homes/modules/programs/yazi/yazi.nix b/homes/modules/programs/yazi/yazi.nix index 2dcb306..1b70727 100644 --- a/homes/modules/programs/yazi/yazi.nix +++ b/homes/modules/programs/yazi/yazi.nix @@ -13,6 +13,7 @@ settings = { mgr = { show_hidden = true; + mouse_events = ["scroll"]; }; log = { enabled = false; From fea82f353259b1080067c9ddc45c0ea7fed4a2a6 Mon Sep 17 00:00:00 2001 From: foxora Date: Sat, 11 Apr 2026 23:31:53 +0100 Subject: [PATCH 50/59] changed stuff again :3 --- homes/aurora/default.nix | 4 +++- homes/modules/de/waybar/style.css | 3 ++- homes/modules/programs/neovim/lua/lsp/indentation.lua | 4 ++-- homes/modules/wm/hyprland/hypr/keybinds/virtual.conf | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/homes/aurora/default.nix b/homes/aurora/default.nix index 766fd81..c630189 100644 --- a/homes/aurora/default.nix +++ b/homes/aurora/default.nix @@ -85,7 +85,8 @@ # fonts nerd-fonts.departure-mono # pretty pixel art font i love!! x3 - nerd-fonts.jetbrains-mono + noto-fonts-cjk-sans # bitmap font for cjk support :3 + zpix-pixel-font # bitmap font for cjk support :3 # cli / tui tools and commands! eza # replaces: ls (rust) @@ -111,6 +112,7 @@ eva # calculator repl silicon # makes pretty images of code :3 wormhole-rs # send people stuff!! :3 + croc # other way to send people stuff!! :3 # cli fun pokeget-rs # prints a random pokemon to the terminal :3 diff --git a/homes/modules/de/waybar/style.css b/homes/modules/de/waybar/style.css index 4ce38ba..0b9ecdd 100644 --- a/homes/modules/de/waybar/style.css +++ b/homes/modules/de/waybar/style.css @@ -3,7 +3,7 @@ * { border: none; border-radius: 0; - font-family: 'DepartureMono Nerd Font'; + font-family: "DepartureMono Nerd Font", "Unifont"; font-size: 10px; font-weight: bold; min-height: 10px; @@ -49,6 +49,7 @@ tooltip label { padding: 4px 16px; border-radius: 32px; border: 1px solid @color01; + min-height: 14px; } /* diff --git a/homes/modules/programs/neovim/lua/lsp/indentation.lua b/homes/modules/programs/neovim/lua/lsp/indentation.lua index 63cf7d7..ede4134 100644 --- a/homes/modules/programs/neovim/lua/lsp/indentation.lua +++ b/homes/modules/programs/neovim/lua/lsp/indentation.lua @@ -1,5 +1,5 @@ vim.api.nvim_create_autocmd("FileType", { - pattern = { "lua", "nix", "gleam", "css" }, + pattern = { "lua", "nix", "gleam", "css", "json" }, callback = function() vim.opt_local.shiftwidth = 2 vim.opt_local.tabstop = 2 @@ -20,7 +20,7 @@ vim.api.nvim_create_autocmd("User", { pattern = "TelescopePreviewerLoaded", callback = function(args) local ft = args.data.filetype - if vim.tbl_contains({ "lua", "nix", "gleam", "css" }, ft) then + if vim.tbl_contains({ "lua", "nix", "gleam", "css", "json" }, ft) then vim.bo.shiftwidth = 2 vim.bo.tabstop = 2 vim.bo.expandtab = true diff --git a/homes/modules/wm/hyprland/hypr/keybinds/virtual.conf b/homes/modules/wm/hyprland/hypr/keybinds/virtual.conf index d396c7e..72a677f 100644 --- a/homes/modules/wm/hyprland/hypr/keybinds/virtual.conf +++ b/homes/modules/wm/hyprland/hypr/keybinds/virtual.conf @@ -1,6 +1,6 @@ # a submap for emulating keys/buttons/functions on the keyboard or mouse -bind = $mod+shift, c, submap, cursor +bind = $mod, a, submap, cursor submap = cursor # exit submap From 84264f025fb734af2bb3c0f4fadb51434716a024 Mon Sep 17 00:00:00 2001 From: foxora Date: Thu, 16 Apr 2026 18:07:11 +0100 Subject: [PATCH 51/59] am just a fox *wags tail* :3 --- .../programs/neovim/lua/lsp/indentation.lua | 26 ++++++++++++++++--- homes/modules/programs/nixcord.nix | 1 - 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/homes/modules/programs/neovim/lua/lsp/indentation.lua b/homes/modules/programs/neovim/lua/lsp/indentation.lua index ede4134..8516bad 100644 --- a/homes/modules/programs/neovim/lua/lsp/indentation.lua +++ b/homes/modules/programs/neovim/lua/lsp/indentation.lua @@ -1,5 +1,12 @@ vim.api.nvim_create_autocmd("FileType", { - pattern = { "lua", "nix", "gleam", "css", "json" }, + pattern = { + "lua", + "nix", + "gleam", + "css", + "json", + "haskell", + }, callback = function() vim.opt_local.shiftwidth = 2 vim.opt_local.tabstop = 2 @@ -8,7 +15,9 @@ vim.api.nvim_create_autocmd("FileType", { }) vim.api.nvim_create_autocmd("FileType", { - pattern = { "sql" }, + pattern = { + "sql", + }, callback = function() vim.opt_local.shiftwidth = 4 vim.opt_local.tabstop = 4 @@ -20,11 +29,20 @@ vim.api.nvim_create_autocmd("User", { pattern = "TelescopePreviewerLoaded", callback = function(args) local ft = args.data.filetype - if vim.tbl_contains({ "lua", "nix", "gleam", "css", "json" }, ft) then + if vim.tbl_contains({ + "lua", + "nix", + "gleam", + "css", + "json", + "haskell", + }, ft) then vim.bo.shiftwidth = 2 vim.bo.tabstop = 2 vim.bo.expandtab = true - elseif vim.tbl_contains({ "sql" }, ft) then + elseif vim.tbl_contains({ + "sql", + }, ft) then vim.bo.shiftwidth = 4 vim.bo.tabstop = 4 vim.bo.expandtab = true diff --git a/homes/modules/programs/nixcord.nix b/homes/modules/programs/nixcord.nix index 55d3cce..1ae1b7b 100644 --- a/homes/modules/programs/nixcord.nix +++ b/homes/modules/programs/nixcord.nix @@ -101,7 +101,6 @@ }; platformIndicators.enable = true; previewMessage.enable = true; - relationshipNotifier.enable = true; revealAllSpoilers.enable = true; serverInfo.enable = true; serverListIndicators.enable = true; From 2b4d295d0aaad9a34711e78ab6771cb9176d2120 Mon Sep 17 00:00:00 2001 From: foxora Date: Thu, 16 Apr 2026 21:54:26 +0100 Subject: [PATCH 52/59] re-enabled hlchunk --- homes/modules/programs/neovim/nixcats.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homes/modules/programs/neovim/nixcats.nix b/homes/modules/programs/neovim/nixcats.nix index e848ce9..79ee410 100644 --- a/homes/modules/programs/neovim/nixcats.nix +++ b/homes/modules/programs/neovim/nixcats.nix @@ -244,7 +244,7 @@ in { ui = { dressing = true; lualine = true; - hlchunk = false; # seems really laggy + hlchunk = true; }; qol = true; From ab3ec10a6b904581774997c21c2db63eb3974b25 Mon Sep 17 00:00:00 2001 From: foxora Date: Wed, 29 Apr 2026 15:56:11 +0100 Subject: [PATCH 53/59] updated flake + stuff broke lol --- flake.lock | 206 ++++++++++++++--------------- homes/aurora/default.nix | 2 +- homes/modules/programs/nixcord.nix | 5 +- hosts/nixarawrui/default.nix | 32 ++--- 4 files changed, 123 insertions(+), 122 deletions(-) diff --git a/flake.lock b/flake.lock index 1dbad20..3d4b901 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1775558810, - "narHash": "sha256-fy95EdPnqQlpbP8+rk0yWKclWShCUS5VKs6P7/1MF2c=", + "lastModified": 1776876344, + "narHash": "sha256-Ubqb/agkuMJK+k19gjQgHux/eOYRc1sRGoOZOho8+VY=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "7371b669b22aa2af980f913fc312a786d2f1abb2", + "rev": "648a13d0ee1e03a843b3e145b8ece15393058701", "type": "github" }, "original": { @@ -76,11 +76,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1774191766, - "narHash": "sha256-bvO+gfuUOVUiBEwAJ5A2RjpysPzCfyXD+DM8piOa1+4=", + "lastModified": 1777136912, + "narHash": "sha256-owyQdC2vi0kYC119fzyVQp0J4G0t1n4xXUwryhlBbqA=", "ref": "refs/heads/main", - "rev": "7a8fc2e646b97e5ae508a44d3449e3b41345d456", - "revCount": 1336, + "rev": "f66e12a76dbc4c669b2f1375f78bce49f5b19d66", + "revCount": 1363, "type": "git", "url": "https://codeberg.org/LGFae/awww" }, @@ -98,11 +98,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1775586808, - "narHash": "sha256-4Sk8qj8kFO3dhrxX5WVOGSISyILJTCmjR5eeGuX1lY4=", + "lastModified": 1777227006, + "narHash": "sha256-A7GcOXjfo2xmZ3ERgN0j6GcqaVzqIf5zpYQcdfDaMr0=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "97ca4cf337f839170998814f0f347857596a1794", + "rev": "0f7e2bea4088227a80502557f6c0e3b74949d6b5", "type": "github" }, "original": { @@ -114,11 +114,11 @@ "cachyos-kernel": { "flake": false, "locked": { - "lastModified": 1775535525, - "narHash": "sha256-Q1HqL7lxx3sIYaAb+e4pl9L4Le3a3bEm/2IY9kSzARU=", + "lastModified": 1776881435, + "narHash": "sha256-j8AobLjMzeKJugseObrVC4O5k7/aZCWoft2sCS3jWYs=", "owner": "CachyOS", "repo": "linux-cachyos", - "rev": "708043b2186d50d4e6ec1a1377b1452de08c3b91", + "rev": "1c61dfd1c3ad7762faa0db8b06c6af6c59cc4340", "type": "github" }, "original": { @@ -130,11 +130,11 @@ "cachyos-kernel-patches": { "flake": false, "locked": { - "lastModified": 1775568994, - "narHash": "sha256-geh/xiRM8JFBo7lPuV9Op0LAZHz/VdhSQuCYNTthTJw=", + "lastModified": 1777002108, + "narHash": "sha256-PIZCIf6xUTOUqLFbEGH0mSwu2O/YfeAmYlgdAbP4dhs=", "owner": "CachyOS", "repo": "kernel-patches", - "rev": "b953e9a0044ab79b30abccee243afebfc185b622", + "rev": "46476ae2538db486462aef8a9de37d19030cdaf2", "type": "github" }, "original": { @@ -390,11 +390,11 @@ "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { - "lastModified": 1772408722, - "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", + "lastModified": 1775087534, + "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", + "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", "type": "github" }, "original": { @@ -489,11 +489,11 @@ ] }, "locked": { - "lastModified": 1775598298, - "narHash": "sha256-FZRwskiertE+8wgFKjLoc/41UrVqzR2V3QseMBHuo/g=", + "lastModified": 1777258755, + "narHash": "sha256-EC07KwADRE2LdIk7vEDyAaD3I0ZUq24T9jQF9L0iEPk=", "owner": "nix-community", "repo": "home-manager", - "rev": "98b4d61cfaf825c8b691afae0b6e152f0cc05c86", + "rev": "7f8bbc93d63401e41368d6ddc46a4f631610fa90", "type": "github" }, "original": { @@ -532,11 +532,11 @@ ] }, "locked": { - "lastModified": 1774991950, - "narHash": "sha256-kScKj3qJDIWuN9/6PMmgy5esrTUkYinrO5VvILik/zw=", + "lastModified": 1776184304, + "narHash": "sha256-No6QGBmIv5ChiwKCcbkxjdEQ/RO2ZS1gD7SFy6EZ7rc=", "owner": "nix-community", "repo": "home-manager", - "rev": "f2d3e04e278422c7379e067e323734f3e8c585a7", + "rev": "3c7524c68348ef79ce48308e0978611a050089b2", "type": "github" }, "original": { @@ -561,11 +561,11 @@ ] }, "locked": { - "lastModified": 1772461003, - "narHash": "sha256-pVICsV7FtcEeVwg5y/LFh3XFUkVJninm/P1j/JHzEbM=", + "lastModified": 1776511930, + "narHash": "sha256-fCpwFiTW0rT7oKJqr3cqHMnkwypSwQKpbtUEtxdkgrM=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "b62396457b9cfe2ebf24fe05404b09d2a40f8ed7", + "rev": "39435900785d0c560c6ae8777d29f28617d031ef", "type": "github" }, "original": { @@ -590,11 +590,11 @@ ] }, "locked": { - "lastModified": 1775496928, - "narHash": "sha256-Ds759WU03mGWtu3I43J+5GF5Ni8TvF+GYQUFD+fVeMo=", + "lastModified": 1776426399, + "narHash": "sha256-RUESLKNikIeEq9ymGJ6nmcDXiSFQpUW1IhJ245nL3xM=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "cf95d93d17baa18f1d9b016b3afe27f820521a6e", + "rev": "68d064434787cf1ed4a2fe257c03c5f52f33cf84", "type": "github" }, "original": { @@ -622,11 +622,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1775578056, - "narHash": "sha256-TiSPoIM8EBf6Z6Hrne5wX4hPfss1xTRcRfTL6+DfmLo=", + "lastModified": 1777248628, + "narHash": "sha256-3RoogdcCOknnzMCNw4MxQBHlAL0qXZw/Jk1fN4Hm8jE=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "75dc67e63f1873f1e97f73daf0ce284f75afa97c", + "rev": "80763b13ff9b8abb94654d9f5ca635003c0b5d84", "type": "github" }, "original": { @@ -668,11 +668,11 @@ ] }, "locked": { - "lastModified": 1774710575, - "narHash": "sha256-p7Rcw13+gA4Z9EI3oGYe3neQ3FqyOOfZCleBTfhJ95Q=", + "lastModified": 1776426575, + "narHash": "sha256-KI6nIfVihn/DPaeB5Et46Xg3dkNHrrEtUd5LBBVomB0=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "0703df899520001209646246bef63358c9881e36", + "rev": "a968d211048e3ed538e47b84cb3649299578f19d", "type": "github" }, "original": { @@ -722,11 +722,11 @@ ] }, "locked": { - "lastModified": 1772459629, - "narHash": "sha256-/iwvNUYShmmnwmz/czEUh6+0eF5vCMv0xtDW0STPIuM=", + "lastModified": 1776426736, + "narHash": "sha256-rl7i4aY+9p8LysJp7o8uRWahCkpFznCgGHXszlTw7b0=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "7615ee388de18239a4ab1400946f3d0e498a8186", + "rev": "7833ff33b2e82d3406337b5dcf0d1cec595d83e9", "type": "github" }, "original": { @@ -799,11 +799,11 @@ ] }, "locked": { - "lastModified": 1774911391, - "narHash": "sha256-c4YVwO33Mmw+FIV8E0u3atJZagHvGTJ9Jai6RtiB8rE=", + "lastModified": 1777148223, + "narHash": "sha256-PTf7kRFFzCW6rIYxLH2fWfVJmj86FSYe3k6L8B+IM9o=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "e6caa3d4d1427eedbdf556cf4ceb70f2d9c0b56d", + "rev": "fa3992be2dfebe4ab06d753c6ca59bea298e798f", "type": "github" }, "original": { @@ -824,11 +824,11 @@ ] }, "locked": { - "lastModified": 1772459835, - "narHash": "sha256-978jRz/y/9TKmZb/qD4lEYHCQGHpEXGqy+8X2lFZsak=", + "lastModified": 1777148232, + "narHash": "sha256-Uv0WZLhu89SafuSOmYDA7akrPt4wBRmsa1ucasO5aXg=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "0a692d4a645165eebd65f109146b8861e3a925e7", + "rev": "fec9cf1abcc1011e46f0a0986f46bf93c6bf8b92", "type": "github" }, "original": { @@ -853,11 +853,11 @@ ] }, "locked": { - "lastModified": 1775414057, - "narHash": "sha256-mDpHnf+MkdOxEqIM1TnckYYh9p1SXR8B3KQfNZ12M8s=", + "lastModified": 1776728575, + "narHash": "sha256-z9eGphrArEBpl1O/GCH0wlY6z4K9vA6yWh2gAS6qytU=", "owner": "hyprwm", "repo": "hyprwire", - "rev": "86012ee01b0fdd8bf3101ef38816f2efbee42490", + "rev": "f3a80888783702a39691b684d099e16b83ed4702", "type": "github" }, "original": { @@ -876,11 +876,11 @@ ] }, "locked": { - "lastModified": 1768868561, - "narHash": "sha256-nvEOtV1Y5K9E1Lj+bPnQ6k1AneDM9OT3RbV3Urm/1Qs=", + "lastModified": 1776390028, + "narHash": "sha256-N/CV6Ldg1PmGNclROSR0qZ2wPwcxkxuPGF7uc34tQnM=", "owner": "ulyssa", "repo": "iamb", - "rev": "93fc47d019cd6a9d56f163aa6ba819ef1fd309d6", + "rev": "b10c98588bd9b22a83dd1275fbf797023aba4117", "type": "github" }, "original": { @@ -983,11 +983,11 @@ "scenefx": "scenefx" }, "locked": { - "lastModified": 1775461179, - "narHash": "sha256-4vvuk6tl8M2wuW3VJU9Uwc3HCrL95cSJImEODNNQEy8=", + "lastModified": 1776999768, + "narHash": "sha256-RP7eVqbnQ/uNCXh0HH8SXRIerMlkyHco+wpI9oxon0U=", "owner": "mangowm", "repo": "mango", - "rev": "e83a9dff820ce2215ecbbbea7d617d24d0825174", + "rev": "b9c6a2c1964cb59536c5d3e02d2ff981a7eb36d2", "type": "github" }, "original": { @@ -1005,11 +1005,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1775329298, - "narHash": "sha256-xmntQolopr1WwBO5rAC+SKyON+ritVQLUHZdvpjUM90=", + "lastModified": 1776340739, + "narHash": "sha256-s4FDictJlPtY6Shd6scG5hgrDMiHth09+svtvTA5NLA=", "owner": "microvm-nix", "repo": "microvm.nix", - "rev": "4a9ff5adcefd23e68de76f33ebc7b3909e06c09b", + "rev": "2f2f62fdfdca2750e3399f66bd03986ab967e5ca", "type": "github" }, "original": { @@ -1026,11 +1026,11 @@ "spectrum": "spectrum_2" }, "locked": { - "lastModified": 1775329298, - "narHash": "sha256-xmntQolopr1WwBO5rAC+SKyON+ritVQLUHZdvpjUM90=", + "lastModified": 1776340739, + "narHash": "sha256-s4FDictJlPtY6Shd6scG5hgrDMiHth09+svtvTA5NLA=", "owner": "microvm-nix", "repo": "microvm.nix", - "rev": "4a9ff5adcefd23e68de76f33ebc7b3909e06c09b", + "rev": "2f2f62fdfdca2750e3399f66bd03986ab967e5ca", "type": "github" }, "original": { @@ -1195,11 +1195,11 @@ }, "nixcats": { "locked": { - "lastModified": 1774835836, - "narHash": "sha256-6ok7iv/9R82vl6MYe3Lwyyb6S5bmW2PxEZtmjzlqyPs=", + "lastModified": 1776724015, + "narHash": "sha256-kFpzUivYI8F75cZcggmjKM8HEEJPajKNLweYsTYdM7Q=", "owner": "BirdeeHub", "repo": "nixCats-nvim", - "rev": "ebb9f279a55ca60ff4e37e4accf6518dc627aa8d", + "rev": "da76c45b33d589836946bb566bd91df4cd3cfb09", "type": "github" }, "original": { @@ -1218,11 +1218,11 @@ "nixpkgs-nixcord": "nixpkgs-nixcord" }, "locked": { - "lastModified": 1775592269, - "narHash": "sha256-SB76MADRKDwYwLmKP3tpjlnhmQ9xVBE6WHyv9sskvZI=", + "lastModified": 1777125640, + "narHash": "sha256-jKmRu5PknoI0pk3WEqMhVReosUubUCq3M/izEQWzb+4=", "owner": "FlameFlag", "repo": "nixcord", - "rev": "814ebf38f04e99a37ebaf9159f5112238f828a1e", + "rev": "0e738683dd7551a9cbfa343397b1592dfd785b7e", "type": "github" }, "original": { @@ -1233,11 +1233,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1775545155, - "narHash": "sha256-hTjWyj6wz9Iw6IjfrP+rZj1V1DjbVRCd1WjcpxH8Fqs=", + "lastModified": 1777187199, + "narHash": "sha256-RJlLGrl+xHndIVK1NbPkIsItePNB3X4PIe8UTk3AHnw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f97e195236002ce34b91d43ffe68557ac7d007fc", + "rev": "facea5e538604efa4893c08770fe9fca5bf62c2f", "type": "github" }, "original": { @@ -1279,11 +1279,11 @@ }, "nixpkgs-lib_3": { "locked": { - "lastModified": 1772328832, - "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", + "lastModified": 1774748309, + "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742", + "rev": "333c4e0545a6da976206c74db8773a1645b5870a", "type": "github" }, "original": { @@ -1294,11 +1294,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1775605449, - "narHash": "sha256-7xNGBc+aDnV5O2NEbVedKqTJZf7fMQplQ2KP0Uuso2c=", + "lastModified": 1777259123, + "narHash": "sha256-XhPsay0hrzv/Jn/ZL/jbpD024bEa+tEC5GNDNjEK2uQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ad1602de15363141e019f759c7c9fe8646b28b30", + "rev": "845227898adf311db865c0cc954828a25b98e2ea", "type": "github" }, "original": { @@ -1310,11 +1310,11 @@ }, "nixpkgs-nixcord": { "locked": { - "lastModified": 1773222311, - "narHash": "sha256-BHoB/XpbqoZkVYZCfXJXfkR+GXFqwb/4zbWnOr2cRcU=", + "lastModified": 1776734388, + "narHash": "sha256-vl3dkhlE5gzsItuHoEMVe+DlonsK+0836LIRDnm6MXQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0590cd39f728e129122770c029970378a79d076a", + "rev": "10e7ad5bbcb421fe07e3a4ad53a634b0cd57ffac", "type": "github" }, "original": { @@ -1326,11 +1326,11 @@ }, "nixpkgs-staging": { "locked": { - "lastModified": 1775585988, - "narHash": "sha256-lIfMIN05ks3wNz3MqM9H6RkdNLg6RJuuDH0o4o1LOvI=", + "lastModified": 1777250017, + "narHash": "sha256-9AlUWDDz+PN8mBD6Myi/EJNn7xB6U/GIA0TptIq8I7I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2d38540b4428002cf24c82e81d947a3b2670d8a6", + "rev": "cbf054cd9bd3f64159c577c1c0813de560e317fd", "type": "github" }, "original": { @@ -1342,11 +1342,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1775423009, - "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", + "lastModified": 1776877367, + "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", + "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57", "type": "github" }, "original": { @@ -1374,11 +1374,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1775305101, - "narHash": "sha256-/74n1oQPtKG52Yw41cbToxspxHbYz6O3vi+XEw16Qe8=", + "lastModified": 1777077449, + "narHash": "sha256-AIiMJiqvGrN4HyLEbKAoCSRRYn0rnlW5VbKNIMIYqm4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "36a601196c4ebf49e035270e10b2d103fe39076b", + "rev": "a4bf06618f0b5ee50f14ed8f0da77d34ecc19160", "type": "github" }, "original": { @@ -1418,11 +1418,11 @@ ] }, "locked": { - "lastModified": 1775036584, - "narHash": "sha256-zW0lyy7ZNNT/x8JhzFHBsP2IPx7ATZIPai4FJj12BgU=", + "lastModified": 1776796298, + "narHash": "sha256-PcRvlWayisPSjd0UcRQbhG8Oqw78AcPE6x872cPRHN8=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "4e0eb042b67d863b1b34b3f64d52ceb9cd926735", + "rev": "3cfd774b0a530725a077e17354fbdb87ea1c4aad", "type": "github" }, "original": { @@ -1538,11 +1538,11 @@ ] }, "locked": { - "lastModified": 1775529071, - "narHash": "sha256-z7LF/Vn8Zfbh5pgF/y7TPhz19AwTlQKrfGJdJHpOqOg=", + "lastModified": 1775652648, + "narHash": "sha256-mLE7i9r9qenayJ8adWm22SbqUwLuopvRhyoizuZTtyo=", "owner": "uiriansan", "repo": "SilentSDDM", - "rev": "f8ec3cd49dcd98c04860ca1ac105727b5cfc6981", + "rev": "a0fb8a48de772c0340dd6639b331ebf6ec2eb554", "type": "github" }, "original": { @@ -1593,11 +1593,11 @@ ] }, "locked": { - "lastModified": 1775421933, - "narHash": "sha256-JkEbzFDFTsUlVtHEzA8Y4r3O9LInhb96eOCbtGjGnbM=", + "lastModified": 1777183994, + "narHash": "sha256-zahis/vVFOsWv/HeyHbU13jxnrCC+ppIg49xG+viWxg=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "ec8d73085fdf807d55765335dc8126e14e7b2096", + "rev": "501256c3e670ca1679501ce3839ea805df00d8ba", "type": "github" }, "original": { @@ -1767,11 +1767,11 @@ ] }, "locked": { - "lastModified": 1773601989, - "narHash": "sha256-2tJf/CQoHApoIudxHeJye+0Ii7scR0Yyi7pNiWk0Hn8=", + "lastModified": 1777035886, + "narHash": "sha256-m1TNuBoSXUBSKhD9UVMkU90M0wFTPTfvIOOltO8IM8A=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "a9b862d1aa000a676d310cc62d249f7ad726233d", + "rev": "ecfcdcc781f48821d83e1e2a0e30d7beca0eeb5e", "type": "github" }, "original": { @@ -1788,11 +1788,11 @@ ] }, "locked": { - "lastModified": 1775453133, - "narHash": "sha256-VIlMG985ONqVqF+OnPuS5Shbz5k6tqbOWnDL7EH+IT4=", + "lastModified": 1777218171, + "narHash": "sha256-+JGU5Cw6Zm3XVl3xBCkbY7/lTxfLQpjuuhF0IB4dJ8k=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "8d0508ffceba8ad785ae442591dd115080a55142", + "rev": "8a8e30610393c7f1a766a119dea37bf82d0ebcf6", "type": "github" }, "original": { diff --git a/homes/aurora/default.nix b/homes/aurora/default.nix index c630189..a35e97d 100644 --- a/homes/aurora/default.nix +++ b/homes/aurora/default.nix @@ -167,7 +167,7 @@ # games r2modman # mod manager for lots of games!! prismlauncher # minecraft launcher - bottles # wineprefix manager + # bottles # wineprefix manager # vr sidequest # app store for sideloading onto vr headsets diff --git a/homes/modules/programs/nixcord.nix b/homes/modules/programs/nixcord.nix index 1ae1b7b..20fd49c 100644 --- a/homes/modules/programs/nixcord.nix +++ b/homes/modules/programs/nixcord.nix @@ -1,6 +1,5 @@ { inputs, - upkgs, mpkgs, ... }: { @@ -12,12 +11,13 @@ enable = true; equibop.enable = true; - equibop.package = upkgs.equibop; + equibop.package = mpkgs.equibop; vesktop.enable = true; discord = { vencord.enable = false; + vencord.package = mpkgs.vencord; equicord.enable = true; equicord.package = mpkgs.equicord; }; @@ -210,6 +210,7 @@ "1436985041203892315" "1438071327515742229" "1436965652861685891" + "1496677919404068954" ]; } { diff --git a/hosts/nixarawrui/default.nix b/hosts/nixarawrui/default.nix index db633e6..bafadd1 100644 --- a/hosts/nixarawrui/default.nix +++ b/hosts/nixarawrui/default.nix @@ -307,18 +307,18 @@ }; alvr = { - enable = true; + enable = false; - package = upkgs.alvr.overrideAttrs (old: rec { - postPatch = - (old.postPatch or "") - + '' - substituteInPlace alvr/server_openvr/src/lib.rs \ - --replace-fail \ - "let early_hmd_initialization = !dashboard_process_paths.is_empty();" \ - "let early_hmd_initialization = true;" - ''; - }); + # package = upkgs.alvr.overrideAttrs (old: rec { + # postPatch = + # (old.postPatch or "") + # + '' + # substituteInPlace alvr/server_openvr/src/lib.rs \ + # --replace-fail \ + # "let early_hmd_initialization = !dashboard_process_paths.is_empty();" \ + # "let early_hmd_initialization = true;" + # ''; + # }); openFirewall = true; }; @@ -374,11 +374,11 @@ }) # game stuff :3 - (lutris.override { - extraPkgs = upkgs: [ - libadwaita - ]; - }) + # (lutris.override { + # extraPkgs = upkgs: [ + # libadwaita + # ]; + # }) (steam.override { extraPkgs = upkgs: [ nss From 7f11df87df5ad4ff6aec18f3d677676d35cc2538 Mon Sep 17 00:00:00 2001 From: foxora Date: Wed, 29 Apr 2026 16:08:29 +0100 Subject: [PATCH 54/59] made all discord clients on master nixpkgs --- homes/modules/programs/nixcord.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/homes/modules/programs/nixcord.nix b/homes/modules/programs/nixcord.nix index 20fd49c..e0a1e47 100644 --- a/homes/modules/programs/nixcord.nix +++ b/homes/modules/programs/nixcord.nix @@ -14,6 +14,7 @@ equibop.package = mpkgs.equibop; vesktop.enable = true; + vesktop.package = mpkgs.vesktop; discord = { vencord.enable = false; From 01912eb42899b1ed954a7e31ed2c181d17ffdc98 Mon Sep 17 00:00:00 2001 From: foxora Date: Fri, 1 May 2026 07:12:53 +0100 Subject: [PATCH 55/59] minecraft speedrunning stuff --- flake.lock | 43 ++- flake.nix | 5 + homes/aurora/default.nix | 2 +- hosts/modules/programs/mcsr/default.nix | 88 ++++++ .../programs/mcsr/eye-overlay-trans.png | Bin 0 -> 62216 bytes hosts/modules/programs/mcsr/waywall.lua | 263 ++++++++++++++++++ hosts/nixarawrui/default.nix | 2 + 7 files changed, 401 insertions(+), 2 deletions(-) create mode 100644 hosts/modules/programs/mcsr/default.nix create mode 100644 hosts/modules/programs/mcsr/eye-overlay-trans.png create mode 100644 hosts/modules/programs/mcsr/waywall.lua diff --git a/flake.lock b/flake.lock index 3d4b901..26b80df 100644 --- a/flake.lock +++ b/flake.lock @@ -386,6 +386,27 @@ } }, "flake-parts_4": { + "inputs": { + "nixpkgs-lib": [ + "mcsr", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1772408722, + "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_5": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_3" }, @@ -996,6 +1017,25 @@ "type": "github" } }, + "mcsr": { + "inputs": { + "flake-parts": "flake-parts_4", + "nixpkgs": [ + "nixpkgs-unstable" + ] + }, + "locked": { + "lastModified": 1777411535, + "narHash": "sha256-6oMlfP8QdXadFVzSOdh8TOxHbZi64r4/j0k19fVj8mw=", + "rev": "cf54c03940bb73853cad234d04ffc0ac96a1b441", + "type": "tarball", + "url": "https://git.uku3lig.net/api/v1/repos/uku/mcsr-nixos/archive/cf54c03940bb73853cad234d04ffc0ac96a1b441.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://git.uku3lig.net/uku/mcsr-nixos/archive/main.tar.gz" + } + }, "microvm": { "inputs": { "nixpkgs": [ @@ -1211,7 +1251,7 @@ "nixcord": { "inputs": { "flake-compat": "flake-compat_5", - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_5", "nixpkgs": [ "nixpkgs" ], @@ -1458,6 +1498,7 @@ "hyprland-git": "hyprland-git", "iamb": "iamb", "mango": "mango", + "mcsr": "mcsr", "microvm": "microvm_2", "millennium": "millennium", "nixcats": "nixcats", diff --git a/flake.nix b/flake.nix index b5ffaf7..9f18969 100644 --- a/flake.nix +++ b/flake.nix @@ -90,6 +90,11 @@ url = "github:uiriansan/SilentSDDM"; inputs.nixpkgs.follows = "nixpkgs-unstable"; }; + + mcsr = { + url = "https://git.uku3lig.net/uku/mcsr-nixos/archive/main.tar.gz"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; }; nixConfig = { diff --git a/homes/aurora/default.nix b/homes/aurora/default.nix index a35e97d..5f1c92c 100644 --- a/homes/aurora/default.nix +++ b/homes/aurora/default.nix @@ -166,7 +166,7 @@ # games r2modman # mod manager for lots of games!! - prismlauncher # minecraft launcher + # prismlauncher # minecraft launcher # bottles # wineprefix manager # vr diff --git a/hosts/modules/programs/mcsr/default.nix b/hosts/modules/programs/mcsr/default.nix new file mode 100644 index 0000000..ca2427e --- /dev/null +++ b/hosts/modules/programs/mcsr/default.nix @@ -0,0 +1,88 @@ +{ + inputs, + pkgs, + upkgs, + lib, + config, + ... +}: let + cfg = config.programs.waywall; + + mcsrPkgs = inputs.mcsr.packages.${pkgs.stdenv.hostPlatform.system}; + # thin = pkgs.fetchurl { + # url = "https://v.uku.moe/u/thin.png"; + # hash = "sha256-VzT9a0/+JMG+To80+xuQSo4x2w6+zavCvUJ6irBkpVg="; + # }; + # wide = pkgs.fetchurl { + # url = "https://v.uku.moe/u/wide.png"; + # hash = "sha256-xJX+QladHQiQYBdKZEB9kuEaxBWVZuuStf4r4gIv5uo="; + # }; + # tall = pkgs.fetchurl { + # url = "https://v.uku.moe/u/tall.png"; + # hash = "sha256-RLyV6iFVDlJKKEdA3CBAQR/sIj2WnhZVBAmLzVmS7JA="; + # }; +in { + imports = [inputs.mcsr.nixosModules.waywall]; + + options = { + programs.waywall = { + width = lib.mkOption { + type = lib.types.int; + default = 1920; + }; + + height = lib.mkOption { + type = lib.types.int; + default = 1080; + }; + }; + }; + + config = { + nixpkgs.overlays = [ + (final: prev: { + prismlauncher = prev.prismlauncher.override { + jdks = [ + mcsrPkgs.graalvm-21 + upkgs.openjdk8 + ]; + + additionalLibs = with pkgs; [ + libx11 + libxt + libxtst + libxcb + libxkbcommon + libxinerama + ]; + }; + }) + ]; + + environment.systemPackages = with pkgs; [ + prismlauncher + ]; + + programs.waywall = { + enable = true; + config = { + enableWaywork = true; + programs = [mcsrPkgs.ninjabrain-bot]; + + files = { + eye_overlay = ./eye-overlay-trans.png; + # inherit thin wide tall; + }; + + text = + '' + local resolution = { w = ${toString cfg.width}, h = ${toString cfg.height} } + -- end globals + '' + + (builtins.readFile ./waywall.lua); + + # linkWithSystemd = false; + }; + }; + }; +} diff --git a/hosts/modules/programs/mcsr/eye-overlay-trans.png b/hosts/modules/programs/mcsr/eye-overlay-trans.png new file mode 100644 index 0000000000000000000000000000000000000000..3038324cc5b2df253c52dbbd3ccda4c2ace77387 GIT binary patch literal 62216 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 literal 0 HcmV?d00001 diff --git a/hosts/modules/programs/mcsr/waywall.lua b/hosts/modules/programs/mcsr/waywall.lua new file mode 100644 index 0000000..c569295 --- /dev/null +++ b/hosts/modules/programs/mcsr/waywall.lua @@ -0,0 +1,263 @@ +-- vim: foldmethod=marker +local waywall = require("waywall") +local helpers = require("waywall.helpers") + +local Scene = require("waywork.scene") +local Modes = require("waywork.modes") +local Keys = require("waywork.keys") +local Processes = require("waywork.processes") + +local scene = Scene.SceneManager.new(waywall) +local ModeManager = Modes.ModeManager.new(waywall) + +-- config -- +-- https://arjuncgore.github.io/waywall-boat-eye-calc/ +local normal_sens = 12.8000006 +local tall_sens = 0.86348038 + +local pie_colors = { + { input = "#e145c2", output = "#a000a0" }, + { input = "#e96d4d", output = "#aa3310" }, + { input = "#45cb65", output = "#00a000" }, + { input = "#4de1ca", output = "#1a7286" }, + { input = "#c46de1", output = "#ff55ff" }, +} +-- config -- + +-- utils {{{ +_G["WAYWORK_GLOBAL_GUARD"] = false + +local function toggle_global_guard() + _G["WAYWORK_GLOBAL_GUARD"] = not _G["WAYWORK_GLOBAL_GUARD"] + return _G["WAYWORK_GLOBAL_GUARD"] +end + +local function mode_guard() + return not _G["WAYWORK_GLOBAL_GUARD"] and not waywall.get_key("F3") +end + +local function smart_enable_group(mode, status) + scene:enable_group(mode, status) + scene:enable_group("normal", not status) +end + +local function piechart_src(res) + return { x = res.w - 93, y = res.h - 221, w = 33, h = 42 } +end + +local function piechart_dst(res) + ---@diagnostic disable: undefined-global + -- x = right_of_thin - 11 (gap between edge and pie) - 160 (pie width / 2) - 99 (mirror width / 2) + if res.w == resolution.w and res.h == resolution.h then + return { x = res.w - 270, y = res.h - 390, w = 33 * 6, h = 42 * 6 } + else + return { x = (resolution.w + res.w) / 2 - 270, y = (resolution.h + res.h) / 2 - 390, w = 33 * 6, h = 42 * 6 } + end + ---@diagnostic enable: undefined-global +end + +---@diagnostic disable-next-line: undefined-global +local ensure_ninjabrain = Processes.ensure_application(waywall, programs.ninjabrain_bot)("ninjabrain.*\\.jar") +-- }}} + +-- background images {{{ +-- for _, name in ipairs({ "wide", "thin", "tall" }) do +-- scene:register(name .. "_bg", { +-- kind = "image", +-- ---@diagnostic disable-next-line: undefined-global +-- path = files[name], +-- options = { + +-- ---@diagnostic disable: undefined-global +-- dst = { x = 0, y = 0, w = resolution.w, h = resolution.h }, +-- ---@diagnostic enable: undefined-global + +-- depth = -1, +-- }, +-- groups = { name }, +-- }) +-- end +-- }}} + +-- thin {{{ +---@diagnostic disable: undefined-global +local thin_res = { w = resolution.h * 0.28, h = resolution.h } +local e_scale = resolution.w > 2560 and 20 or 10 +local left_middle = (resolution.w - thin_res.w) / 4 +---@diagnostic enable: undefined-global + +scene:register("e_counter", { + kind = "mirror", + options = { + src = { x = 1, y = 37, w = 49, h = 9 }, + ---@diagnostic disable-next-line: undefined-global + dst = { x = left_middle - (49 * e_scale / 2), y = resolution.h / 10.8, w = 49 * e_scale, h = 9 * e_scale }, + depth = 0, + }, + groups = { "thin" }, +}) + +for _, ck in ipairs(pie_colors) do + scene:register("prct_mirror_" .. ck.input, { + kind = "mirror", + options = { + src = piechart_src(thin_res), + dst = piechart_dst(thin_res), + depth = 1, + color_key = ck, + }, + groups = { "thin" }, + }) +end + +ModeManager:define("thin", { + width = thin_res.w, + height = thin_res.h, + on_enter = function() + smart_enable_group("thin", true) + end, + on_exit = function() + smart_enable_group("thin", false) + end, + toggle_guard = mode_guard, +}) +-- }}} + +-- wide {{{ +---@diagnostic disable: undefined-global +local wide_res = { w = resolution.w, h = resolution.h / 3.6 } +---@diagnostic enable: undefined-global + +ModeManager:define("wide", { + width = wide_res.w, + height = wide_res.h, + on_enter = function() + smart_enable_group("wide", true) + end, + on_exit = function() + smart_enable_group("wide", false) + end, + toggle_guard = mode_guard, +}) +-- }}} + +-- tall {{{ +---@diagnostic disable: undefined-global +local tall_res = { w = 384, h = 16384 } +local measure_w = (resolution.w - tall_res.w) / 2 +local measure_h = (resolution.h * measure_w) / resolution.w +local measure_dst = { x = 0, y = (resolution.h - measure_h) / 2, w = measure_w, h = measure_h } +---@diagnostic enable: undefined-global + +scene:register("eye_measure", { + kind = "mirror", + options = { + src = { x = (tall_res.w - 60) / 2, y = (tall_res.h - 580) / 2, w = 60, h = 580 }, + dst = measure_dst, + depth = 0, + }, + groups = { "tall" }, +}) + +scene:register("eye_overlay", { + kind = "image", + ---@diagnostic disable-next-line: undefined-global + path = files.eye_overlay, + options = { dst = measure_dst, depth = 1 }, + groups = { "tall" }, +}) + +ModeManager:define("tall", { + width = tall_res.w, + height = tall_res.h, + on_enter = function() + smart_enable_group("tall", true) + waywall.set_sensitivity(tall_sens) + end, + on_exit = function() + smart_enable_group("tall", false) + waywall.set_sensitivity(0) + end, + toggle_guard = mode_guard, +}) +-- }}} + +-- normal res mirrors {{{ +for _, ck in ipairs(pie_colors) do + scene:register("prct_mirror_normal_" .. ck.input, { + kind = "mirror", + options = { + ---@diagnostic disable: undefined-global + src = piechart_src(resolution), + dst = piechart_dst(resolution), + ---@diagnostic enable: undefined-global + depth = 1, + color_key = ck, + }, + groups = { "normal" }, + }) +end +-- }}} + +-- startup actions +waywall.listen("load", function() + -- wait for title screen + repeat + local error, state = pcall(waywall.state) + waywall.sleep(1000) + until error == true and state.screen == "title" + + -- actual actions + ensure_ninjabrain() + scene:enable_group("normal", true) +end) + +local config = { + input = { + layout = "us", + repeat_rate = 40, + repeat_delay = 300, + + sensitivity = normal_sens, + confine_pointer = true, + + remaps = { + ["MB4"] = "F5", + ["MB5"] = "F3", + }, + }, + + theme = { + background = "#00000000", + -- https://github.com/Smithay/smithay/issues/1894 + ninb_anchor = "right", + }, + + ---@diagnostic disable: undefined-global + window = { + fullscreen_width = resolution.w, + fullscreen_height = resolution.h, + }, + ---@diagnostic enable: undefined-global + + actions = Keys.actions({ + ["*-F2"] = function() + toggle_global_guard() + end, + ["*-V"] = function() + return ModeManager:toggle("thin") + end, + ["*-B"] = function() + return ModeManager:toggle("tall") + end, + ["*-G"] = function() + return ModeManager:toggle("wide") + end, + ["Ctrl-Shift-L"] = function() + ensure_ninjabrain() + helpers.toggle_floating() + end, + }), +} + +return config diff --git a/hosts/nixarawrui/default.nix b/hosts/nixarawrui/default.nix index bafadd1..d5abd9f 100644 --- a/hosts/nixarawrui/default.nix +++ b/hosts/nixarawrui/default.nix @@ -9,6 +9,8 @@ ./hardware-configuration.nix ./modules/amdgpu-ignore-ctx-privileges.nix + + ../modules/programs/mcsr ]; # Use the systemd-boot EFI boot loader. From bfd70c514eb98427e35a77a61472157e720bc99c Mon Sep 17 00:00:00 2001 From: foxora Date: Sat, 2 May 2026 20:37:07 +0100 Subject: [PATCH 56/59] idk what i did --- flake.lock | 92 ++++++++++++------------- homes/aurora/default.nix | 3 +- homes/modules/programs/nixcord.nix | 7 +- hosts/modules/programs/mcsr/waywall.lua | 4 +- hosts/nixarawrui/default.nix | 2 +- 5 files changed, 54 insertions(+), 54 deletions(-) diff --git a/flake.lock b/flake.lock index 26b80df..3e7881f 100644 --- a/flake.lock +++ b/flake.lock @@ -98,11 +98,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1777227006, - "narHash": "sha256-A7GcOXjfo2xmZ3ERgN0j6GcqaVzqIf5zpYQcdfDaMr0=", + "lastModified": 1777575332, + "narHash": "sha256-JNlUkjKUfoHtvUINkQdXQ9y1rjem4iaLby2IBEOwMK8=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "0f7e2bea4088227a80502557f6c0e3b74949d6b5", + "rev": "8bfb8fc988a2e4636629c81d0eebb2b3158aa884", "type": "github" }, "original": { @@ -114,11 +114,11 @@ "cachyos-kernel": { "flake": false, "locked": { - "lastModified": 1776881435, - "narHash": "sha256-j8AobLjMzeKJugseObrVC4O5k7/aZCWoft2sCS3jWYs=", + "lastModified": 1777460646, + "narHash": "sha256-NeS1O3PlSU+VQ7qvvdFttkHEInwNhGwz5Hx1L+C3lcg=", "owner": "CachyOS", "repo": "linux-cachyos", - "rev": "1c61dfd1c3ad7762faa0db8b06c6af6c59cc4340", + "rev": "fbcbeb4d0bb4cc702582b953985a0b3b08c16962", "type": "github" }, "original": { @@ -130,11 +130,11 @@ "cachyos-kernel-patches": { "flake": false, "locked": { - "lastModified": 1777002108, - "narHash": "sha256-PIZCIf6xUTOUqLFbEGH0mSwu2O/YfeAmYlgdAbP4dhs=", + "lastModified": 1777306094, + "narHash": "sha256-YNvqoVdMe/SqXm91cpCA6mVOigK3Zzoab6HPvMiqGqo=", "owner": "CachyOS", "repo": "kernel-patches", - "rev": "46476ae2538db486462aef8a9de37d19030cdaf2", + "rev": "9bcd294d660c932f55f732d951ee79ea707f64f3", "type": "github" }, "original": { @@ -510,11 +510,11 @@ ] }, "locked": { - "lastModified": 1777258755, - "narHash": "sha256-EC07KwADRE2LdIk7vEDyAaD3I0ZUq24T9jQF9L0iEPk=", + "lastModified": 1777594677, + "narHash": "sha256-h90sHwoRJLRvaTpZroTvU2JRHDFj0czUafM8eqLe1RI=", "owner": "nix-community", "repo": "home-manager", - "rev": "7f8bbc93d63401e41368d6ddc46a4f631610fa90", + "rev": "899c08a15beae5da51a5cecd6b2b994777a948da", "type": "github" }, "original": { @@ -643,11 +643,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1777248628, - "narHash": "sha256-3RoogdcCOknnzMCNw4MxQBHlAL0qXZw/Jk1fN4Hm8jE=", + "lastModified": 1777585694, + "narHash": "sha256-aQQiIZUWcSp3MR/ItkxHnv8GCMZZg2jPh1IW/bXeF/E=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "80763b13ff9b8abb94654d9f5ca635003c0b5d84", + "rev": "a45de66d22d696cd4e60444176641d59bc65db6c", "type": "github" }, "original": { @@ -820,11 +820,11 @@ ] }, "locked": { - "lastModified": 1777148223, - "narHash": "sha256-PTf7kRFFzCW6rIYxLH2fWfVJmj86FSYe3k6L8B+IM9o=", + "lastModified": 1777492286, + "narHash": "sha256-PwuoEJQcjSKJNP5T55qhfDwIP0tw5zxEhfu8GDfKfeg=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "fa3992be2dfebe4ab06d753c6ca59bea298e798f", + "rev": "ec5c0c709706bad5b82f667fd8758eae442577ce", "type": "github" }, "original": { @@ -1025,11 +1025,11 @@ ] }, "locked": { - "lastModified": 1777411535, - "narHash": "sha256-6oMlfP8QdXadFVzSOdh8TOxHbZi64r4/j0k19fVj8mw=", - "rev": "cf54c03940bb73853cad234d04ffc0ac96a1b441", + "lastModified": 1777502373, + "narHash": "sha256-vK+Us7fQoCMJ9uAxQIo/rYvXBgAzmZkzX6i7kHpQ3Gw=", + "rev": "1f24f320429cabee34f119178eecb4df34a19662", "type": "tarball", - "url": "https://git.uku3lig.net/api/v1/repos/uku/mcsr-nixos/archive/cf54c03940bb73853cad234d04ffc0ac96a1b441.tar.gz" + "url": "https://git.uku3lig.net/api/v1/repos/uku/mcsr-nixos/archive/1f24f320429cabee34f119178eecb4df34a19662.tar.gz" }, "original": { "type": "tarball", @@ -1235,11 +1235,11 @@ }, "nixcats": { "locked": { - "lastModified": 1776724015, - "narHash": "sha256-kFpzUivYI8F75cZcggmjKM8HEEJPajKNLweYsTYdM7Q=", + "lastModified": 1777273601, + "narHash": "sha256-xBUa8Tl9V7IXI+VmLEuDc81La/EhoSn1C3EVSnJ3cfU=", "owner": "BirdeeHub", "repo": "nixCats-nvim", - "rev": "da76c45b33d589836946bb566bd91df4cd3cfb09", + "rev": "f69ea013e328841a7def7037ed59788a76be8816", "type": "github" }, "original": { @@ -1258,11 +1258,11 @@ "nixpkgs-nixcord": "nixpkgs-nixcord" }, "locked": { - "lastModified": 1777125640, - "narHash": "sha256-jKmRu5PknoI0pk3WEqMhVReosUubUCq3M/izEQWzb+4=", + "lastModified": 1777597615, + "narHash": "sha256-zTp+gZSfkvvKZYn8IFJvVdLhygyGe+QvH5D2XJmlKes=", "owner": "FlameFlag", "repo": "nixcord", - "rev": "0e738683dd7551a9cbfa343397b1592dfd785b7e", + "rev": "ac02c236b473ea77cc87578ba3f0a8421c835aaf", "type": "github" }, "original": { @@ -1273,11 +1273,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1777187199, - "narHash": "sha256-RJlLGrl+xHndIVK1NbPkIsItePNB3X4PIe8UTk3AHnw=", + "lastModified": 1777554572, + "narHash": "sha256-UmFofZDlG7wQuiLGma4TJGLgiGjrjKC3b8T/1GvFrGs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "facea5e538604efa4893c08770fe9fca5bf62c2f", + "rev": "c3d7954dc42e4fa7fffe3def8214cea2a7cbbeff", "type": "github" }, "original": { @@ -1334,11 +1334,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1777259123, - "narHash": "sha256-XhPsay0hrzv/Jn/ZL/jbpD024bEa+tEC5GNDNjEK2uQ=", + "lastModified": 1777615065, + "narHash": "sha256-NlD1vh0zpzTrOqjOpCjmNay6Lqko5DBBQvc/yYlxHV0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "845227898adf311db865c0cc954828a25b98e2ea", + "rev": "8c4a37782c2bee477ed2a3050b17a789a68becd2", "type": "github" }, "original": { @@ -1366,11 +1366,11 @@ }, "nixpkgs-staging": { "locked": { - "lastModified": 1777250017, - "narHash": "sha256-9AlUWDDz+PN8mBD6Myi/EJNn7xB6U/GIA0TptIq8I7I=", + "lastModified": 1777595981, + "narHash": "sha256-cLbsRN94E9LnMWEtJoYJR8PGvKNLWTO7nHLRsTqujM0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cbf054cd9bd3f64159c577c1c0813de560e317fd", + "rev": "ce83a640412770d3df9623a8f602b1dd2251d1c9", "type": "github" }, "original": { @@ -1382,11 +1382,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1776877367, - "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=", + "lastModified": 1777268161, + "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57", + "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76", "type": "github" }, "original": { @@ -1414,11 +1414,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1777077449, - "narHash": "sha256-AIiMJiqvGrN4HyLEbKAoCSRRYn0rnlW5VbKNIMIYqm4=", + "lastModified": 1777428379, + "narHash": "sha256-ypxFOeDz+CqADEQNL72haqGjvZQdBR5Vc7pyx2JDttI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a4bf06618f0b5ee50f14ed8f0da77d34ecc19160", + "rev": "755f5aa91337890c432639c60b6064bb7fe67769", "type": "github" }, "original": { @@ -1829,11 +1829,11 @@ ] }, "locked": { - "lastModified": 1777218171, - "narHash": "sha256-+JGU5Cw6Zm3XVl3xBCkbY7/lTxfLQpjuuhF0IB4dJ8k=", + "lastModified": 1777564084, + "narHash": "sha256-O9VRkxg+2j+sh+c73wi4VeIBECoqW2PlnCR9Qe1nQKA=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "8a8e30610393c7f1a766a119dea37bf82d0ebcf6", + "rev": "d93443c0f6fdb3b179bed68856f322dba4842612", "type": "github" }, "original": { diff --git a/homes/aurora/default.nix b/homes/aurora/default.nix index 5f1c92c..a41860c 100644 --- a/homes/aurora/default.nix +++ b/homes/aurora/default.nix @@ -148,8 +148,7 @@ imhex # hex editor kicad # open source electronics design program easyeda2kicad - # FIX: its fucking broken: https://github.com/NixOS/nixpkgs/pull/494721 - mpkgs.libreoffice-qt # word, excel, pdf etc open source programs + libreoffice-qt # word, excel, pdf etc open source programs hunspell # spell checker obs-studio cytoscape diff --git a/homes/modules/programs/nixcord.nix b/homes/modules/programs/nixcord.nix index e0a1e47..ce9e174 100644 --- a/homes/modules/programs/nixcord.nix +++ b/homes/modules/programs/nixcord.nix @@ -1,5 +1,6 @@ { inputs, + upkgs, mpkgs, ... }: { @@ -11,16 +12,16 @@ enable = true; equibop.enable = true; - equibop.package = mpkgs.equibop; + equibop.package = upkgs.equibop; vesktop.enable = true; vesktop.package = mpkgs.vesktop; discord = { vencord.enable = false; - vencord.package = mpkgs.vencord; + vencord.package = upkgs.vencord; equicord.enable = true; - equicord.package = mpkgs.equicord; + equicord.package = upkgs.equicord; }; config = { diff --git a/hosts/modules/programs/mcsr/waywall.lua b/hosts/modules/programs/mcsr/waywall.lua index c569295..df967d9 100644 --- a/hosts/modules/programs/mcsr/waywall.lua +++ b/hosts/modules/programs/mcsr/waywall.lua @@ -12,8 +12,8 @@ local ModeManager = Modes.ModeManager.new(waywall) -- config -- -- https://arjuncgore.github.io/waywall-boat-eye-calc/ -local normal_sens = 12.8000006 -local tall_sens = 0.86348038 +local normal_sens = 8.72284201 +local tall_sens = 0.5884377 local pie_colors = { { input = "#e145c2", output = "#a000a0" }, diff --git a/hosts/nixarawrui/default.nix b/hosts/nixarawrui/default.nix index d5abd9f..a42abcc 100644 --- a/hosts/nixarawrui/default.nix +++ b/hosts/nixarawrui/default.nix @@ -309,7 +309,7 @@ }; alvr = { - enable = false; + enable = true; # package = upkgs.alvr.overrideAttrs (old: rec { # postPatch = From a2475d22dc334793ec85836992d7170205a2548c Mon Sep 17 00:00:00 2001 From: foxora Date: Sun, 3 May 2026 10:49:49 +0100 Subject: [PATCH 57/59] updated flake :3 --- flake.lock | 102 ++++++++++++++--------------- homes/modules/programs/nixcord.nix | 7 +- 2 files changed, 55 insertions(+), 54 deletions(-) diff --git a/flake.lock b/flake.lock index 3e7881f..864db1d 100644 --- a/flake.lock +++ b/flake.lock @@ -98,11 +98,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1777575332, - "narHash": "sha256-JNlUkjKUfoHtvUINkQdXQ9y1rjem4iaLby2IBEOwMK8=", + "lastModified": 1777746826, + "narHash": "sha256-fAbcHwnhw294NL+a+2E2bidNiaxhM935RrsJLqKcnc4=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "8bfb8fc988a2e4636629c81d0eebb2b3158aa884", + "rev": "26aa2e8f054184252d08558290471a397164aeff", "type": "github" }, "original": { @@ -114,11 +114,11 @@ "cachyos-kernel": { "flake": false, "locked": { - "lastModified": 1777460646, - "narHash": "sha256-NeS1O3PlSU+VQ7qvvdFttkHEInwNhGwz5Hx1L+C3lcg=", + "lastModified": 1777639499, + "narHash": "sha256-EyELzah58EHIADP4siMoSzsCOPd71bZkmlVpcUb9Oi8=", "owner": "CachyOS", "repo": "linux-cachyos", - "rev": "fbcbeb4d0bb4cc702582b953985a0b3b08c16962", + "rev": "1c6414dbda46c13abcb951ef6c5a790cb9e157ea", "type": "github" }, "original": { @@ -331,11 +331,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1775087534, - "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", + "lastModified": 1777678872, + "narHash": "sha256-EPIFsulyon7Z1vLQq5Fk64GR8L7cQsT+IPhcsukVbgk=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", + "rev": "5250617bffd85403b14dbf43c3870e7f255d2c16", "type": "github" }, "original": { @@ -411,11 +411,11 @@ "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { - "lastModified": 1775087534, - "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", + "lastModified": 1777678872, + "narHash": "sha256-EPIFsulyon7Z1vLQq5Fk64GR8L7cQsT+IPhcsukVbgk=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", + "rev": "5250617bffd85403b14dbf43c3870e7f255d2c16", "type": "github" }, "original": { @@ -489,11 +489,11 @@ ] }, "locked": { - "lastModified": 1775425411, - "narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=", + "lastModified": 1777771528, + "narHash": "sha256-YycygK6n7KeW1YCobdFJcORWzkmrvNcp6xT+IovA0d4=", "owner": "nix-community", "repo": "home-manager", - "rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe", + "rev": "0585fbf645640973e3398863bbaf3bd1ddce4a51", "type": "github" }, "original": { @@ -510,11 +510,11 @@ ] }, "locked": { - "lastModified": 1777594677, - "narHash": "sha256-h90sHwoRJLRvaTpZroTvU2JRHDFj0czUafM8eqLe1RI=", + "lastModified": 1777780644, + "narHash": "sha256-CYpc+mk28rmcQWGygeM8CA+Z8SZYy8BOyQtiW18spao=", "owner": "nix-community", "repo": "home-manager", - "rev": "899c08a15beae5da51a5cecd6b2b994777a948da", + "rev": "b9311028044a9e9b2cf27db15ef0a87d464e212d", "type": "github" }, "original": { @@ -531,11 +531,11 @@ ] }, "locked": { - "lastModified": 1775425411, - "narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=", + "lastModified": 1777771528, + "narHash": "sha256-YycygK6n7KeW1YCobdFJcORWzkmrvNcp6xT+IovA0d4=", "owner": "nix-community", "repo": "home-manager", - "rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe", + "rev": "0585fbf645640973e3398863bbaf3bd1ddce4a51", "type": "github" }, "original": { @@ -643,11 +643,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1777585694, - "narHash": "sha256-aQQiIZUWcSp3MR/ItkxHnv8GCMZZg2jPh1IW/bXeF/E=", + "lastModified": 1777759969, + "narHash": "sha256-7KSqSehOHNHQfM0sRAcGQbfz0vDuItox8i61X8/nzYw=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "a45de66d22d696cd4e60444176641d59bc65db6c", + "rev": "6ec0228c38a6203e4789fe7e7e793a558521c109", "type": "github" }, "original": { @@ -1258,11 +1258,11 @@ "nixpkgs-nixcord": "nixpkgs-nixcord" }, "locked": { - "lastModified": 1777597615, - "narHash": "sha256-zTp+gZSfkvvKZYn8IFJvVdLhygyGe+QvH5D2XJmlKes=", + "lastModified": 1777740049, + "narHash": "sha256-O8rXPZaARIjp4fh20wkeRWeElYbp4Dgp8pKk3Ikkj40=", "owner": "FlameFlag", "repo": "nixcord", - "rev": "ac02c236b473ea77cc87578ba3f0a8421c835aaf", + "rev": "853aa014283c1d3e58df7213c36d3a739cab1b6f", "type": "github" }, "original": { @@ -1273,11 +1273,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1777554572, - "narHash": "sha256-UmFofZDlG7wQuiLGma4TJGLgiGjrjKC3b8T/1GvFrGs=", + "lastModified": 1777718177, + "narHash": "sha256-qq56SczKpUNKcm8xdOsXYLzaX37p1bLS0fFaCMB7s3Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c3d7954dc42e4fa7fffe3def8214cea2a7cbbeff", + "rev": "e59d8bfa2cc42b1e1104595ac4292cfedce7f1a4", "type": "github" }, "original": { @@ -1289,11 +1289,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1774748309, - "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=", + "lastModified": 1777168982, + "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "333c4e0545a6da976206c74db8773a1645b5870a", + "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14", "type": "github" }, "original": { @@ -1319,11 +1319,11 @@ }, "nixpkgs-lib_3": { "locked": { - "lastModified": 1774748309, - "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=", + "lastModified": 1777168982, + "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "333c4e0545a6da976206c74db8773a1645b5870a", + "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14", "type": "github" }, "original": { @@ -1334,11 +1334,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1777615065, - "narHash": "sha256-NlD1vh0zpzTrOqjOpCjmNay6Lqko5DBBQvc/yYlxHV0=", + "lastModified": 1777798537, + "narHash": "sha256-hY/pzDFcznuHlaJrbc0GME7WrzUY9o44peQryT7xbFI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8c4a37782c2bee477ed2a3050b17a789a68becd2", + "rev": "5f49e619c2519edeafbb56a79550fdb6703d4739", "type": "github" }, "original": { @@ -1350,11 +1350,11 @@ }, "nixpkgs-nixcord": { "locked": { - "lastModified": 1776734388, - "narHash": "sha256-vl3dkhlE5gzsItuHoEMVe+DlonsK+0836LIRDnm6MXQ=", + "lastModified": 1777428379, + "narHash": "sha256-ypxFOeDz+CqADEQNL72haqGjvZQdBR5Vc7pyx2JDttI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "10e7ad5bbcb421fe07e3a4ad53a634b0cd57ffac", + "rev": "755f5aa91337890c432639c60b6064bb7fe67769", "type": "github" }, "original": { @@ -1366,11 +1366,11 @@ }, "nixpkgs-staging": { "locked": { - "lastModified": 1777595981, - "narHash": "sha256-cLbsRN94E9LnMWEtJoYJR8PGvKNLWTO7nHLRsTqujM0=", + "lastModified": 1777791170, + "narHash": "sha256-TFBAl/DxLx1VQQm5X+S/8vIDpzWPEqugfQH5/pbS8AY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ce83a640412770d3df9623a8f602b1dd2251d1c9", + "rev": "c205d8fd78779c17c9665002b3445400a4173c6d", "type": "github" }, "original": { @@ -1382,11 +1382,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1777268161, - "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", + "lastModified": 1777578337, + "narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76", + "rev": "15f4ee454b1dce334612fa6843b3e05cf546efab", "type": "github" }, "original": { @@ -1634,11 +1634,11 @@ ] }, "locked": { - "lastModified": 1777183994, - "narHash": "sha256-zahis/vVFOsWv/HeyHbU13jxnrCC+ppIg49xG+viWxg=", + "lastModified": 1777789800, + "narHash": "sha256-XHCvLGu/bEEZRzXVKFu1i+2YB102Nr00n8e7xrzsfVs=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "501256c3e670ca1679501ce3839ea805df00d8ba", + "rev": "d0e921cc48aab6137d203a3eab19601dc2bdc0c3", "type": "github" }, "original": { diff --git a/homes/modules/programs/nixcord.nix b/homes/modules/programs/nixcord.nix index ce9e174..2335e3a 100644 --- a/homes/modules/programs/nixcord.nix +++ b/homes/modules/programs/nixcord.nix @@ -1,7 +1,6 @@ { inputs, upkgs, - mpkgs, ... }: { imports = [ @@ -11,13 +10,15 @@ programs.nixcord = { enable = true; - equibop.enable = true; + # broken rn: https://github.com/FlameFlag/nixcord/issues/200 + equibop.enable = false; equibop.package = upkgs.equibop; vesktop.enable = true; - vesktop.package = mpkgs.vesktop; + vesktop.package = upkgs.vesktop; discord = { + # can't have both enabled vencord.enable = false; vencord.package = upkgs.vencord; equicord.enable = true; From 8a44655415a3ccd8e668c8bf1ea4ce6c96f42da0 Mon Sep 17 00:00:00 2001 From: foxora Date: Sun, 3 May 2026 12:23:11 +0100 Subject: [PATCH 58/59] rust-analyzer had bug on master branch --- homes/modules/programs/neovim/nixcats.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/homes/modules/programs/neovim/nixcats.nix b/homes/modules/programs/neovim/nixcats.nix index 79ee410..78ed79b 100644 --- a/homes/modules/programs/neovim/nixcats.nix +++ b/homes/modules/programs/neovim/nixcats.nix @@ -2,7 +2,7 @@ # https://github.com/BirdeeHub/nix-wrapper-modules { inputs, - mpkgs, + upkgs, ... }: let inherit @@ -62,7 +62,7 @@ in { docs = [nix-doc]; # TODO: i forgot how to integrate this into neovim }; rust = { - lsp = [cargo mpkgs.rust-analyzer]; + lsp = [cargo upkgs.rust-analyzer]; # nightly rustfmt has nicer features :3 format = [(rustfmt.override {asNightly = true;})]; formatters = { @@ -197,7 +197,7 @@ in { rust.lsp = { # it literally won't see the rust-analyzer provided to it # if you don't use an envrionment variable to tell it - RUST_ANALYZER_CMD = "${mpkgs.rust-analyzer}/bin/rust-analyzer"; + RUST_ANALYZER_CMD = "${upkgs.rust-analyzer}/bin/rust-analyzer"; }; elixir.lsp = { ELIXIR_LS_CMD = "${pkgs.elixir-ls}/scripts/language_server.sh"; From 1776e1d58d85124f82c08b66b323c9cb73fe5cf9 Mon Sep 17 00:00:00 2001 From: foxora Date: Sun, 3 May 2026 15:06:05 +0100 Subject: [PATCH 59/59] actually fixed rust-analyzer this time --- flake.lock | 60 ++++++++++++++++++++++- flake.nix | 18 +++++-- homes/modules/programs/neovim/nixcats.nix | 17 ++++--- 3 files changed, 80 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 864db1d..bb69c6b 100644 --- a/flake.lock +++ b/flake.lock @@ -227,12 +227,33 @@ } }, "fenix": { + "inputs": { + "nixpkgs": [ + "nixpkgs-unstable" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1777796307, + "narHash": "sha256-L7xLjorTwVf2aLu5b0ZZY2D0RFXwD/a/a/fFFDikB2w=", + "owner": "nix-community", + "repo": "fenix", + "rev": "0f9881f2344c0b1c100bd9e774555759b7da6fd5", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, + "fenix_2": { "inputs": { "nixpkgs": [ "iamb", "nixpkgs" ], - "rust-analyzer-src": "rust-analyzer-src" + "rust-analyzer-src": "rust-analyzer-src_2" }, "locked": { "lastModified": 1760510549, @@ -890,7 +911,7 @@ "iamb": { "inputs": { "crane": "crane", - "fenix": "fenix", + "fenix": "fenix_2", "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs-unstable" @@ -1364,6 +1385,22 @@ "type": "github" } }, + "nixpkgs-rust": { + "locked": { + "lastModified": 1776371872, + "narHash": "sha256-hVIxbmDzNoXnzobtujvL189+YPrqr0QWF5fn+13+CtY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "838f1611dc4c0078432071819d6fffe046148813", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "838f1611dc4c0078432071819d6fffe046148813", + "type": "github" + } + }, "nixpkgs-staging": { "locked": { "lastModified": 1777791170, @@ -1493,6 +1530,7 @@ "awww": "awww", "cachyos": "cachyos", "cerulean": "cerulean", + "fenix": "fenix", "home-manager": "home-manager_2", "home-manager-unstable": "home-manager-unstable", "hyprland-git": "hyprland-git", @@ -1505,6 +1543,7 @@ "nixcord": "nixcord", "nixpkgs": "nixpkgs_3", "nixpkgs-master": "nixpkgs-master", + "nixpkgs-rust": "nixpkgs-rust", "nixpkgs-staging": "nixpkgs-staging", "nixpkgs-unstable": "nixpkgs-unstable", "sddm-silent": "sddm-silent", @@ -1514,6 +1553,23 @@ } }, "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1777768857, + "narHash": "sha256-zfekJcaVctfAps1KDHwZpwkvAQn7GObRHh3Gl3xocGI=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "1102c0b633599564919e36076d4362d7e68dbddc", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, + "rust-analyzer-src_2": { "flake": false, "locked": { "lastModified": 1760457219, diff --git a/flake.nix b/flake.nix index 9f18969..ef91d7c 100644 --- a/flake.nix +++ b/flake.nix @@ -9,6 +9,9 @@ nixpkgs-staging.url = "github:NixOS/nixpkgs/staging-next"; nixpkgs-master.url = "github:NixOS/nixpkgs/master"; + # currently a regression: https://github.com/rust-lang/rust-analyzer/pull/22207 + nixpkgs-rust.url = "github:NixOS/nixpkgs/838f1611dc4c0078432071819d6fffe046148813"; + home-manager = { url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; @@ -52,6 +55,11 @@ nixcats.url = "github:BirdeeHub/nixCats-nvim"; + fenix = { + url = "github:nix-community/fenix"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; + awww = { url = "git+https://codeberg.org/LGFae/awww"; inputs.nixpkgs.follows = "nixpkgs-unstable"; @@ -85,14 +93,14 @@ }; }; - # temp theme until i bother creating my own