Compare commits
5 commits
7919eb1845
...
245712de7b
Author | SHA1 | Date | |
---|---|---|---|
|
245712de7b | ||
|
b6e1aa0d82 | ||
|
575b232445 | ||
|
9438fface2 | ||
|
ba60bb30e6 |
22
flake.lock
22
flake.lock
|
@ -496,16 +496,16 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720042825,
|
"lastModified": 1736373539,
|
||||||
"narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
|
"narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
|
"rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "release-24.05",
|
"ref": "release-24.11",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -770,16 +770,16 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
"nixpkgs_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1724531977,
|
"lastModified": 1738702386,
|
||||||
"narHash": "sha256-XROVLf9ti4rrNCFLr+DmXRZtPjCQTW4cYy59owTEmxk=",
|
"narHash": "sha256-nJj8f78AYAxl/zqLiFGXn5Im1qjFKU8yBPKoWEeZN5M=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "2527da1ef492c495d5391f3bcf9c1dd9f4514e32",
|
"rev": "030ba1976b7c0e1a67d9716b17308ccdab5b381e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"ref": "nixos-24.05",
|
"ref": "nixos-24.11",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -1208,11 +1208,11 @@
|
||||||
},
|
},
|
||||||
"unstable": {
|
"unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1724819573,
|
"lastModified": 1738680400,
|
||||||
"narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
|
"narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
|
"rev": "799ba5bffed04ced7067a91798353d360788b30d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -3,12 +3,12 @@
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
# Nixpkgs
|
# Nixpkgs
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
|
||||||
unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
||||||
|
|
||||||
# Home manager
|
# Home manager
|
||||||
home-manager.url = "github:nix-community/home-manager/release-24.05";
|
home-manager.url = "github:nix-community/home-manager/release-24.11";
|
||||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
hardware.url = "github:nixos/nixos-hardware";
|
hardware.url = "github:nixos/nixos-hardware";
|
||||||
|
|
||||||
|
|
|
@ -25,35 +25,31 @@ set -g visual-silence off
|
||||||
setw -g monitor-activity off
|
setw -g monitor-activity off
|
||||||
set -g bell-action none
|
set -g bell-action none
|
||||||
|
|
||||||
# clock mode
|
|
||||||
setw -g clock-mode-colour yellow
|
|
||||||
|
|
||||||
# copy mode
|
# copy mode
|
||||||
setw -g mode-style 'fg=black bg=green bold'
|
setw -g mode-style 'fg=black bg=blue bold'
|
||||||
|
|
||||||
# panes
|
# panes
|
||||||
set -g pane-border-style 'fg=green'
|
set -g pane-border-style 'fg=blue'
|
||||||
set -g pane-active-border-style 'fg=yellow'
|
set -g pane-active-border-style 'fg=black'
|
||||||
|
|
||||||
# statusbar
|
# statusbar
|
||||||
set -g status-position bottom
|
set -g status-position bottom
|
||||||
set -g status-justify left
|
set -g status-justify left
|
||||||
set -g status-style 'fg=green'
|
set -g status-style 'fg=blue'
|
||||||
|
|
||||||
set -g status-left ''
|
set -g status-left ''
|
||||||
set -g status-left-length 10
|
set -g status-left-length 10
|
||||||
|
|
||||||
set -g status-right-style 'fg=black bg=yellow'
|
set -g status-right-style 'fg=black bg=blue'
|
||||||
set -g status-right '%Y-%m-%d %H:%M '
|
set -g status-right ''
|
||||||
set -g status-right-length 50
|
|
||||||
|
|
||||||
setw -g window-status-current-style 'fg=black bg=green'
|
setw -g window-status-current-style 'fg=black bg=blue'
|
||||||
setw -g window-status-current-format ' #I #W #F '
|
setw -g window-status-current-format ' #I #W #F '
|
||||||
|
|
||||||
setw -g window-status-style 'fg=green bg=black'
|
setw -g window-status-style 'fg=blue bg=black'
|
||||||
setw -g window-status-format ' #I #[fg=white]#W #[fg=yellow]#F '
|
setw -g window-status-format ' #I #[fg=white]#W #[fg=yellow]#F '
|
||||||
|
|
||||||
setw -g window-status-bell-style 'fg=yellow bg=green bold'
|
setw -g window-status-bell-style 'fg=black bg=blue bold'
|
||||||
|
|
||||||
# messages
|
# messages
|
||||||
set -g message-style 'fg=yellow bg=green bold'
|
set -g message-style 'fg=black bg=blue bold'
|
||||||
|
|
|
@ -62,8 +62,9 @@
|
||||||
# ssb-patchwork
|
# ssb-patchwork
|
||||||
pandoc
|
pandoc
|
||||||
taskwarrior-tui
|
taskwarrior-tui
|
||||||
# TODO marked broken
|
|
||||||
# python3Packages.howdoi
|
# llms (needs 24.11)
|
||||||
|
aider-chat
|
||||||
|
|
||||||
(pkgs.writeScriptBin "jq-repl" ''
|
(pkgs.writeScriptBin "jq-repl" ''
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
|
@ -26,11 +26,15 @@
|
||||||
email-domains = !git log --format="%aE" | awk -F'@' '{print $2}' | sort -u
|
email-domains = !git log --format="%aE" | awk -F'@' '{print $2}' | sort -u
|
||||||
# pretty log
|
# pretty log
|
||||||
ls = !git log --graph --abbrev-commit --decorate --color=always --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) - %C(dim red)%an%C(reset)%C(bold yellow)%d%C(reset)' --all
|
ls = !git log --graph --abbrev-commit --decorate --color=always --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) - %C(dim red)%an%C(reset)%C(bold yellow)%d%C(reset)' --all
|
||||||
|
undo = !git reset HEAD~1 --mixed
|
||||||
|
blm = blame -w -C -C -C
|
||||||
[filter "lfs"]
|
[filter "lfs"]
|
||||||
required = true
|
required = true
|
||||||
smudge = git-lfs smudge -- %f
|
smudge = git-lfs smudge -- %f
|
||||||
process = git-lfs filter-process
|
process = git-lfs filter-process
|
||||||
clean = git-lfs clean -- %f
|
clean = git-lfs clean -- %f
|
||||||
|
[url "git@github.com:"]
|
||||||
|
insteadOf = https://github.com/
|
||||||
[url "https://github.com/"]
|
[url "https://github.com/"]
|
||||||
insteadOf = gh:
|
insteadOf = gh:
|
||||||
[url "git@github.com:"]
|
[url "git@github.com:"]
|
||||||
|
|
|
@ -56,6 +56,7 @@
|
||||||
pull.rebase = false;
|
pull.rebase = false;
|
||||||
push.autoSetupRemote = true;
|
push.autoSetupRemote = true;
|
||||||
init.defaultBranch = "main";
|
init.defaultBranch = "main";
|
||||||
|
"url \"git@github.com:\"" = { insteadOf = "https://github.com/"; };
|
||||||
};
|
};
|
||||||
|
|
||||||
aliases = {
|
aliases = {
|
||||||
|
@ -94,6 +95,8 @@
|
||||||
|
|
||||||
# delete merged branches
|
# delete merged branches
|
||||||
bdm = "!git branch --merged | grep -v '*' | xargs -n 1 git branch -d";
|
bdm = "!git branch --merged | grep -v '*' | xargs -n 1 git branch -d";
|
||||||
|
undo = "!git reset HEAD~1 --mixed";
|
||||||
|
blm = "blame -w -C -C -C";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue