diff --git a/flake.lock b/flake.lock index b1f4803..f8a3df4 100644 --- a/flake.lock +++ b/flake.lock @@ -190,11 +190,11 @@ ] }, "locked": { - "lastModified": 1709204054, - "narHash": "sha256-U1idK0JHs1XOfSI1APYuXi4AEADf+B+ZU4Wifc0pBHk=", + "lastModified": 1708988456, + "narHash": "sha256-RCz7Xe64tN2zgWk+MVHkzg224znwqknJ1RnB7rVqUWw=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f3367769a93b226c467551315e9e270c3f78b15", + "rev": "1d085ea4444d26aa52297758b333b449b2aa6fca", "type": "github" }, "original": { @@ -226,7 +226,7 @@ "mac-brcm-fw": { "flake": false, "locked": { - "lastModified": 1709065070, + "lastModified": 1701034142, "narHash": "sha256-+kW8ogc6DykjMVlrr+3vWKs9ZUdJ9EW72LbY7k/Qvh4=", "path": "/home/jade/nix-configs/mac-brcm-fw", "type": "path" @@ -345,11 +345,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1709128929, - "narHash": "sha256-GWrv9a+AgGhG4/eI/CyVVIIygia7cEy68Huv3P8oyaw=", + "lastModified": 1708831307, + "narHash": "sha256-0iL/DuGjiUeck1zEaL+aIe2WvA3/cVhp/SlmTcOZXH4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c8e74c2f83fe12b4e5a8bd1abbc090575b0f7611", + "rev": "5bf1cadb72ab4e77cb0b700dab76bcdaf88f706b", "type": "github" }, "original": { @@ -466,11 +466,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1709150264, - "narHash": "sha256-HofykKuisObPUfj0E9CJVfaMhawXkYx3G8UIFR/XQ38=", + "lastModified": 1708807242, + "narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9099616b93301d5cf84274b184a3a5ec69e94e08", + "rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a", "type": "github" }, "original": { diff --git a/modules/desktop/creative.nix b/modules/desktop/creative.nix index efbeedb..93cbfe5 100644 --- a/modules/desktop/creative.nix +++ b/modules/desktop/creative.nix @@ -11,7 +11,6 @@ garamond-libre ocr-a amiri - libertine ]; fonts.fontDir.enable = true; home-manager.users.jade = {pkgs, ...}: { diff --git a/modules/mprocs.nix b/modules/mprocs.nix index 7d6b96b..cbf7153 100644 --- a/modules/mprocs.nix +++ b/modules/mprocs.nix @@ -10,14 +10,6 @@ xdg.configFile."mprocs/mprocs.yaml" = { text = builtins.toJSON { proc_list_width = 15; - keymap_procs = { - "" = {c = "toggle-focus";}; - }; - keymap_term = { - "" = null; - # Ctrl-m so it doesnt overlap with zellij or helix - "" = {c = "toggle-focus";}; - }; }; }; }; diff --git a/modules/shell/helix.nix b/modules/shell/helix.nix index b182b86..14029d7 100644 --- a/modules/shell/helix.nix +++ b/modules/shell/helix.nix @@ -35,7 +35,7 @@ display-inlay-hints = true; }; shell = ["nu" "-c"]; - idle-timeout = 30; + idle-timeout = 0; indent-guides = { render = true; character = "│"; diff --git a/other/config.nu b/other/config.nu index 7b1d322..2f1a437 100644 --- a/other/config.nu +++ b/other/config.nu @@ -803,7 +803,7 @@ def glog [ ] { git log --pretty=%h»¦«%s»¦«%aN»¦«%aE»¦«%aD -n $amount | lines - | split column "»¦«" commit subject name email date + | split column "»¦«u commit subject name email date" } def typed [