Compare commits

...

2 commits

Author SHA1 Message Date
cy
8d68a5a65d
flake update
Signed-off-by: cy <cy@cy7.sh>
2025-01-27 20:26:02 -05:00
cy
f26bbc3b4f
make justfile better and cleanup zsh
Signed-off-by: cy <cy@cy7.sh>
2025-01-27 20:23:15 -05:00
3 changed files with 27 additions and 31 deletions

50
flake.lock generated
View file

@ -562,11 +562,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737762889, "lastModified": 1737968762,
"narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=", "narHash": "sha256-xiPARGKwocaMtv+U/rgi+h2g56CZZEmrcl7ldRaslq8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "daf04c5950b676f47a794300657f1d3d14c1a120", "rev": "e1ae908bcc30af792b0bb0a52e53b03d2577255e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -710,11 +710,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737675503, "lastModified": 1738009885,
"narHash": "sha256-FUWpqPOsEJwK8oomffat+lgKnoxJHArRlWo2j17EhxQ=", "narHash": "sha256-zPch36LSTs8dZJZlIiufXuY7wut06xp4CMdf/oqXoq0=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "3e18a1ceec7df4514f5a045441e5f98dd003db09", "rev": "cf43eeb6b376cc36f70b0632bc39dc949b9f3b59",
"revCount": 131, "revCount": 132,
"type": "git", "type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module" "url": "https://git.lix.systems/lix-project/nixos-module"
}, },
@ -737,11 +737,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1737924584, "lastModified": 1737961005,
"narHash": "sha256-8XAz2IFUdSN7IblSWgQQVjivlZ0uWn3Y5jN3G6+/jss=", "narHash": "sha256-b4hqJNgyx8lnngz7NFcJ1W+59xQnMQYF0EK5g0IOy7c=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "d3682c753abbbc8d41578aa12e6f10508d801f4b", "rev": "e98ae62893568dd31e7a7e4e75e1dbbf23f759a0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -770,11 +770,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1737918541, "lastModified": 1737956052,
"narHash": "sha256-NKartmApYTAjteTg78OAIAYGvtl9QCDcKp8tPk3KCuI=", "narHash": "sha256-Gr+tkCSuhQ5NT04hv/PoHExCgbuqRA/GZQv+le40LNY=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "baa051891237054f2d4db86d7bcfe0f17440c35f", "rev": "9b4d73f13a6906537faf01b5c5e5e2fee9dd602e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -832,11 +832,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737504076, "lastModified": 1737926801,
"narHash": "sha256-/B4XJnzYU/6K1ZZOBIgsa3K4pqDJrnC2579c44c+4rI=", "narHash": "sha256-un7IETRNjUm83jM5Gd/7BO4rCzzkom46O0FDMo5toaI=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "65cc1fa8e36ceff067daf6cfb142331f02f524d3", "rev": "62ba0a22426721c94e08f0779ed8235d5672869b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1045,11 +1045,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1737917096, "lastModified": 1738003704,
"narHash": "sha256-wOo5jWu88VRbm0TTNl9KxE4nIkfnXVKxLvZwpTn75wk=", "narHash": "sha256-9VC5icfSf0tI8HSRjzsvOjrJZcLvNy/LKkQYsd14tSY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a47cb26bbe26d63321cbb96de6d1981d790d9748", "rev": "24cc55b1d2d585dd57ce24f26ad96dd7fd73af39",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1082,11 +1082,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737914312, "lastModified": 1737995534,
"narHash": "sha256-PBF4R+yQt5Sls7CsA9Miwx28XtOP/yqaqejZ3RKSes0=", "narHash": "sha256-in2EtlH84FJ5+7l2vBWhUiknmDFAHTuHIPSBiMhICyw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "8e5422bf3e76f410b97d2da640d0829e87657de9", "rev": "af4483c025ecf02ba36b2013eed0062ccd629809",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1105,11 +1105,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737823349, "lastModified": 1737924095,
"narHash": "sha256-LAppb+sftyvJbPdrBG1uN9GYWHz6q7bUpkpDjljcSRo=", "narHash": "sha256-9RO/IlxiE7bpY7GYsdDMNB533PnDOBo9UvYyXXqlN4c=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "f91a0ac0f4ecf0ad1d1d88140f66520dae6ce4bd", "rev": "5efc9c966bb9bdad07a3c28667eac38b758c6f18",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -39,11 +39,6 @@
initExtra = '' initExtra = ''
# disable control+s to pause terminal # disable control+s to pause terminal
unsetopt FLOW_CONTROL unsetopt FLOW_CONTROL
# manually integrate fzf cause we need to make sure zsh-vi-mode
# won't override C-r
function zvm_after_init() {
eval "$(${pkgs.fzf}/bin/fzf --zsh)"
}
# useful emacs mode bindings # useful emacs mode bindings
bindkey -M viins "^E" end-of-line bindkey -M viins "^E" end-of-line

View file

@ -1,9 +1,10 @@
update: update:
git branch -D update
git switch -c update git switch -c update
nix flake update nix flake update
git add flake.lock git add flake.lock
git commit -s -m "flake update" git commit -s -m "flake update"
git push git push -f
git switch main git switch main
upgrade: upgrade: