diff --git a/flake.lock b/flake.lock index 27b21f4..afb8a4e 100644 --- a/flake.lock +++ b/flake.lock @@ -666,11 +666,11 @@ ] }, "locked": { - "lastModified": 1782103446, - "narHash": "sha256-+vMR3KPBVoY9nJrQI9qje5H1vmv51dJgMYkUuYimtJg=", + "lastModified": 1782233665, + "narHash": "sha256-h/xOtrByoA/Ak1lWHn0O1lVZz4qWYbwOSLQ8YSwQO0I=", "owner": "nix-community", "repo": "home-manager", - "rev": "d8dac1f668fd861369571be3678ec75b1573e7e3", + "rev": "062581938b4a378a82dfbb294b494808157153a1", "type": "github" }, "original": { @@ -1194,11 +1194,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1782068713, - "narHash": "sha256-Vujeg1QyOCnEMCNV1U7aFDllD0w2lEl8c0uJyKM+cOI=", + "lastModified": 1782159764, + "narHash": "sha256-255zJue+y2e3nfTj8WJgn9/YWc5ntyrNSu8iUVAegT8=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "756ed060ca6adcdf3e65371e3725b89c58a1354d", + "rev": "f0b6b9acd227ed4822b0dfa55998919a55d466e6", "type": "github" }, "original": { @@ -1308,11 +1308,11 @@ "nixpkgs-nixcord": "nixpkgs-nixcord" }, "locked": { - "lastModified": 1781918107, - "narHash": "sha256-Fva6sbK1BiMgi9b+F7zDcBDNUeUlavWpO7hGi27xu4A=", + "lastModified": 1782234043, + "narHash": "sha256-W0lBYBrJswKonk6IAr2cIiUNQEQ0aSgWLTT0wDrUssE=", "owner": "kaylorben", "repo": "nixcord", - "rev": "d9aad20784cb2fe8142f2e934d29e1c722cc71d6", + "rev": "696566e64b1bfe2049efd1cbf9e26cb6cd46cb61", "type": "github" }, "original": { @@ -1478,11 +1478,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1782014548, - "narHash": "sha256-zYKx9xcbPvk4zOzkny3w2/AkuKhJqGwRD+piA3urkx8=", + "lastModified": 1782145344, + "narHash": "sha256-8cz8/2hWTYdsPcpqWXa/IAkyjw1xBv3tx2UPNzkpe3c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "72349305fb839e27697873de7a4ce3a98c378f48", + "rev": "8dc49b8b206a683d1f6605e0fd993c0f5d49c98d", "type": "github" }, "original": { @@ -1510,11 +1510,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1781607440, - "narHash": "sha256-eM+l4TVD26SNoEjcxRcpispqZi5Qrqj/G0ZY4LfqwfM=", - "rev": "3e41b24abd260e8f71dbe2f5737d24122f972158", + "lastModified": 1782118813, + "narHash": "sha256-PacaMKpRQEyOpBOGPt+LkVCbDXr+zDr/yIcAQsJRhqM=", + "rev": "b3c092d3c36d91e2f61f3dfb39a159f180a56659", "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1017567.3e41b24abd26/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1020200.b3c092d3c36d/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -1577,11 +1577,11 @@ ] }, "locked": { - "lastModified": 1782133810, - "narHash": "sha256-037T8qwCrig4A5X8JaIa+9gxoifWA91TGhbwzmvpY1g=", + "lastModified": 1782253630, + "narHash": "sha256-JMC0i3UCl/5yBOrcxl+YHxhhITFj7KXfw6xmWO6V3hU=", "owner": "nix-community", "repo": "NUR", - "rev": "797063acfe02907eff9e65da527cbc4ccf8703c8", + "rev": "5cfb02daed3a124636fcb5497d6c0c7033851ed0", "type": "github" }, "original": { @@ -1786,11 +1786,11 @@ ] }, "locked": { - "lastModified": 1780975129, - "narHash": "sha256-428T1pLXnbVeUgZx2wWEkbvl3ZORjras34ANZ3ACp5A=", + "lastModified": 1782184651, + "narHash": "sha256-4XHdXp3MRa++XiGkltJChCtdbCmSlNTwQRfWQOhqbRw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "fe64e6b409dc513274d2941f8da13bbd0fdcf44e", + "rev": "f59bc28dd0b89e9c0240d1b80195559fc79c2471", "type": "github" }, "original": { @@ -1806,11 +1806,11 @@ ] }, "locked": { - "lastModified": 1781943681, - "narHash": "sha256-NFHmA7H47adqiyp+0iEOyZOQhmigDqA/NBAlf4imB6U=", + "lastModified": 1782165805, + "narHash": "sha256-478kKQBvK6SYTOdN2h9jhKJv94nbXRbFMfuL1WshErg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "420f8d2e9882911f65cfac15cc706f639ba96cca", + "rev": "56b24064fdcaedca53553b1a6d607fd23b613a24", "type": "github" }, "original": { @@ -2126,11 +2126,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1781718334, - "narHash": "sha256-Ova9OQemsGRmg2b22W9HQSRhtjwS1C9mLUtkYqEjyRs=", + "lastModified": 1782196692, + "narHash": "sha256-vkci6lC9aGRLbQsBpr+rTjkpJ1G7h7JzsV4SK2mfCew=", "owner": "notashelf", "repo": "tuigreet", - "rev": "a75f469d51a11b35f9766153d35d15c535b268a6", + "rev": "2412c8f18d191fdc6c4bb202da77794cdd9c3165", "type": "github" }, "original": { diff --git a/modules/desktop/hyprland/plugins.nix b/modules/desktop/hyprland/plugins.nix index 6314295..fdbfdb2 100644 --- a/modules/desktop/hyprland/plugins.nix +++ b/modules/desktop/hyprland/plugins.nix @@ -26,8 +26,9 @@ settings.plugin.hyprfocus = { # keep-sorted start - bounce_strength = 0.995; - mode = "bounce"; + keyboard_focus_animation = "shrink"; + mouse_focus_animation = "shrink"; + shrink_percentage = 0.995; # keep-sorted end }; }; diff --git a/modules/profiles/personal.nix b/modules/profiles/personal.nix index 4960b6e..7f7b83c 100644 --- a/modules/profiles/personal.nix +++ b/modules/profiles/personal.nix @@ -83,6 +83,7 @@ # keep-sorted start block=yes bonsai cpond + diffnav direnv gitfetch onefetch diff --git a/modules/programs/cli/diffnav.nix b/modules/programs/cli/diffnav.nix new file mode 100644 index 0000000..a7e932f --- /dev/null +++ b/modules/programs/cli/diffnav.nix @@ -0,0 +1,38 @@ +{ + flake.modules.homeManager.diffnav = { + # keep-sorted start + lib, + pkgs, + # keep-sorted end + ... + }: let + inherit + (lib) + # keep-sorted start + getExe + mkForce + # keep-sorted end + ; + inherit (pkgs) writeShellApplication; + + diffnavPager = writeShellApplication { + name = "diffnav-pager"; + text = '' + diff_file="$(mktemp)" + trap 'rm -f "$diff_file"' EXIT + + cat > "$diff_file" + + if [[ ! -s "$diff_file" ]]; then + exit 0 + fi + + exec ${getExe pkgs.diffnav} "$@" < "$diff_file" + ''; + }; + in { + home.packages = [pkgs.diffnav]; + + programs.git.iniContent.pager.diff = mkForce (getExe diffnavPager); + }; +} diff --git a/modules/programs/tui/opencode/default.nix b/modules/programs/tui/opencode/default.nix index 4d4232b..d3489cb 100644 --- a/modules/programs/tui/opencode/default.nix +++ b/modules/programs/tui/opencode/default.nix @@ -62,7 +62,6 @@ --prefix PATH : ${makeBinPath ((with pkgs; [ # keep-sorted start libnotify - nur.repos.adam0.modular-mcp wl-clipboard # keep-sorted end ]) diff --git a/modules/programs/tui/television/settings.nix b/modules/programs/tui/television/settings.nix index c1a3967..265c5de 100644 --- a/modules/programs/tui/television/settings.nix +++ b/modules/programs/tui/television/settings.nix @@ -15,9 +15,6 @@ # keep-sorted end }; - # Remove the ugly status bar. - status_bar.hidden = true; - # keep-sorted start preview_panel.border_type = borderType; results_panel.border_type = borderType; diff --git a/modules/services/scx-loader.nix b/modules/services/scx-loader.nix index 50f41c1..670ace5 100644 --- a/modules/services/scx-loader.nix +++ b/modules/services/scx-loader.nix @@ -1,8 +1,8 @@ { - flake.modules.nixos.scx = {pkgs, ...}: { + flake.modules.nixos.scx-loader = {pkgs, ...}: { services.scx-loader = { enable = true; - schedsPackages = pkgs.scx.rustscheds; + schedsPackages = [pkgs.scx.rustscheds]; config = { default_sched = "scx_lavd";