Compare commits

..

No commits in common. "9057c3600fcdb830478b349cb2b64b4ed1ea6bc6" and "b927205c9daa36759b082fbef0f6679b5b9e4e0e" have entirely different histories.

5 changed files with 12 additions and 21 deletions

View file

@ -190,11 +190,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709204054, "lastModified": 1708988456,
"narHash": "sha256-U1idK0JHs1XOfSI1APYuXi4AEADf+B+ZU4Wifc0pBHk=", "narHash": "sha256-RCz7Xe64tN2zgWk+MVHkzg224znwqknJ1RnB7rVqUWw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2f3367769a93b226c467551315e9e270c3f78b15", "rev": "1d085ea4444d26aa52297758b333b449b2aa6fca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -226,7 +226,7 @@
"mac-brcm-fw": { "mac-brcm-fw": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1709065070, "lastModified": 1701034142,
"narHash": "sha256-+kW8ogc6DykjMVlrr+3vWKs9ZUdJ9EW72LbY7k/Qvh4=", "narHash": "sha256-+kW8ogc6DykjMVlrr+3vWKs9ZUdJ9EW72LbY7k/Qvh4=",
"path": "/home/jade/nix-configs/mac-brcm-fw", "path": "/home/jade/nix-configs/mac-brcm-fw",
"type": "path" "type": "path"
@ -345,11 +345,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1709128929, "lastModified": 1708831307,
"narHash": "sha256-GWrv9a+AgGhG4/eI/CyVVIIygia7cEy68Huv3P8oyaw=", "narHash": "sha256-0iL/DuGjiUeck1zEaL+aIe2WvA3/cVhp/SlmTcOZXH4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c8e74c2f83fe12b4e5a8bd1abbc090575b0f7611", "rev": "5bf1cadb72ab4e77cb0b700dab76bcdaf88f706b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -466,11 +466,11 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1709150264, "lastModified": 1708807242,
"narHash": "sha256-HofykKuisObPUfj0E9CJVfaMhawXkYx3G8UIFR/XQ38=", "narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9099616b93301d5cf84274b184a3a5ec69e94e08", "rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -11,7 +11,6 @@
garamond-libre garamond-libre
ocr-a ocr-a
amiri amiri
libertine
]; ];
fonts.fontDir.enable = true; fonts.fontDir.enable = true;
home-manager.users.jade = {pkgs, ...}: { home-manager.users.jade = {pkgs, ...}: {

View file

@ -10,14 +10,6 @@
xdg.configFile."mprocs/mprocs.yaml" = { xdg.configFile."mprocs/mprocs.yaml" = {
text = builtins.toJSON { text = builtins.toJSON {
proc_list_width = 15; proc_list_width = 15;
keymap_procs = {
"<l>" = {c = "toggle-focus";};
};
keymap_term = {
"<C-a>" = null;
# Ctrl-m so it doesnt overlap with zellij or helix
"<C-M>" = {c = "toggle-focus";};
};
}; };
}; };
}; };

View file

@ -35,7 +35,7 @@
display-inlay-hints = true; display-inlay-hints = true;
}; };
shell = ["nu" "-c"]; shell = ["nu" "-c"];
idle-timeout = 30; idle-timeout = 0;
indent-guides = { indent-guides = {
render = true; render = true;
character = ""; character = "";

View file

@ -803,7 +803,7 @@ def glog [
] { ] {
git log --pretty=%h»¦«%s»¦«%aN»¦«%aE»¦«%aD -n $amount git log --pretty=%h»¦«%s»¦«%aN»¦«%aE»¦«%aD -n $amount
| lines | lines
| split column "»¦«" commit subject name email date | split column "»¦«u commit subject name email date"
} }
def typed [ def typed [