sokai/mynixos-config
1
1
Fork 0
forked from mirrors_public/oddlama_nix-config
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: begin zsh again

Browse source
This commit is contained in:
oddlama 2023-02-15 02:58:32 +01:00
parent 86b5751410
commit 9d54466669
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
6 changed files with 100 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

30
flake.lock generated
View file

@ -8,11 +8,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1676134447, "lastModified": 1676153903,
"narHash": "sha256-PU+6hKp7wbxCCRF5RO5g//Q0G+Rhbj92VrprvXtTOlc=", "narHash": "sha256-uetRyjgMiZCs6srmZ10M764Vn7F53M9mVuqnzHmyBqU=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "6053c559c59ca0ebd57330cd356964f85befaff8", "rev": "ea17cc71b4e1bc5b2601f210a1c85db9453ad723",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -120,11 +120,11 @@
}, },
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1676283394,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -134,11 +134,11 @@
}, },
"flake-utils_2": { "flake-utils_2": {
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1676283394,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -223,11 +223,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1675942811, "lastModified": 1676300157,
"narHash": "sha256-/v4Z9mJmADTpXrdIlAjFa1e+gkpIIROR670UVDQFwIw=", "narHash": "sha256-1HjRzfp6LOLfcj/HJHdVKWAkX9QRAouoh6AjzJiIerU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "724bfc0892363087709bd3a5a1666296759154b1", "rev": "545c7a31e5dedea4a6d372712a18e00ce097d462",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -266,11 +266,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1675688762, "lastModified": 1676279938,
"narHash": "sha256-oit/SxMk0B380ASuztBGQLe8TttO1GJiXF8aZY9AYEc=", "narHash": "sha256-RDyvVdituVQQZtGA7DNaJruJLDz/pfkREpUcI4ZQvsk=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "ab608394886fb04b8a5df3cb0bab2598400e3634", "rev": "1583077009b6ef4236d1899c0f43cf1ce1db8085",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
users/common/default.nix
View file

@ -13,6 +13,7 @@
./starship.nix ./starship.nix
#./tmux.nix #./tmux.nix
#./xdg.nix #./xdg.nix
./zsh.nix
]; ];
home = { home = {

2
users/common/fish.nix
View file

@ -7,8 +7,6 @@ with lib; {
# FIXME: ctrl-del not working # FIXME: ctrl-del not working
# FIXME: DEL also deletes to the left :( # FIXME: DEL also deletes to the left :(
# FIXME: ignore certain history entries (" .*", ...) # FIXME: ignore certain history entries (" .*", ...)
# FIXME: after tab give space
# FIXME: fzf tab let multi
programs.fish = { programs.fish = {
enable = true; enable = true;
interactiveShellInit = mkMerge [ interactiveShellInit = mkMerge [

82
users/common/zsh.nix Normal file
View file

@ -0,0 +1,82 @@
{
lib,
pkgs,
...
}:
with lib; {
programs.zsh = {
enable = true;
envExtra = ''
umask 077
'';
dotDir = ".config/zsh";
history = {
path = "/dev/null";
save = 0;
size = 0;
};
initExtra = mkMerge [
(mkBefore ''
unset HISTFILE
# Reset all keybinds and use emacs keybinds
bindkey -d
bindkey -e
typeset -A key
key=(
Home "''${terminfo[khome]}"
End "''${terminfo[kend]}"
Insert "''${terminfo[kich1]}"
Delete "''${terminfo[kdch1]}"
Up "''${terminfo[kcuu1]}"
Down "''${terminfo[kcud1]}"
Left "''${terminfo[kcub1]}"
Right "''${terminfo[kcuf1]}"
PageUp "''${terminfo[kpp]}"
PageDown "''${terminfo[knp]}"
BackTab "''${terminfo[kcbt]}"
)
bindkey "''${key[Delete]}" delete-char
bindkey "''${key[Home]}" beginning-of-line
bindkey "''${key[End]}" end-of-line
bindkey "''${key[Up]}" history-beginning-search-backward-end
bindkey "''${key[Down]}" history-beginning-search-forward-end
bindkey "''${key[PageUp]}" history-beginning-search-backward-end
bindkey "''${key[PageDown]}" history-beginning-search-forward-end
'')
(mkAfter ''
'')
];
plugins = [
{
name = "fzf-tab";
src = pkgs.fetchFromGitHub {
owner = "Aloxaf";
repo = "fzf-tab";
rev = "69024c27738138d6767ea7246841fdfc6ce0d0eb";
sha256 = "07wwcplyb2mw10ia9y510iwfhaijnsdcb8yv2y3ladhnxjd6mpf8";
};
}
{
name = "fast-syntax-highlighting";
src = pkgs.fetchFromGitHub {
owner = "zdharma-continuum";
repo = "fast-syntax-highlighting";
rev = "7c390ee3bfa8069b8519582399e0a67444e6ea61";
sha256 = "0gh4is2yzwiky79bs8b5zhjq9khksrmwlaf13hk3mhvpgs8n1fn0";
};
}
{
name = "zsh-autosuggestions";
src = pkgs.fetchFromGitHub {
owner = "zsh-users";
repo = "zsh-autosuggestions";
rev = "a411ef3e0992d4839f0732ebeb9823024afaaaa8";
sha256 = "1g3pij5qn2j7v7jjac2a63lxd97mcsgw6xq6k5p7835q9fjiid98";
};
}
];
};
}

2
users/myuser/default.nix
View file

@ -15,7 +15,7 @@ with lib; {
["wheel" "input" "video"] ["wheel" "input" "video"]
++ optionals config.sound.enable ["audio"]; ++ optionals config.sound.enable ["audio"];
isNormalUser = true; isNormalUser = true;
shell = pkgs.fish; shell = pkgs.zsh;
}; };
home-manager.users.myuser = { home-manager.users.myuser = {

2
users/root/default.nix
View file

@ -8,7 +8,7 @@ with lib; {
users.users.root = { users.users.root = {
hashedPassword = "$6$EBo/CaxB.dQoq2W8$lo2b5vKgJlLPdGGhEqa08q3Irf1Zd1PcFBCwJOrG8lqjwbABkn1DEhrMh1P3ezwnww2HusUBuZGDSMa4nvSQg1"; hashedPassword = "$6$EBo/CaxB.dQoq2W8$lo2b5vKgJlLPdGGhEqa08q3Irf1Zd1PcFBCwJOrG8lqjwbABkn1DEhrMh1P3ezwnww2HusUBuZGDSMa4nvSQg1";
openssh.authorizedKeys.keys = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA5Uq+CDy5Pmt3If5M6d8K/Q7HArU6sZ7sgoj3T521Wm"]; openssh.authorizedKeys.keys = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA5Uq+CDy5Pmt3If5M6d8K/Q7HArU6sZ7sgoj3T521Wm"];
shell = pkgs.fish; shell = pkgs.zsh;
}; };
home-manager.users.root = { home-manager.users.root = {