thomasave
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update to new Zsh config structure

This commit is contained in:
Thomas Avé 2025-05-05 12:37:27 +02:00
parent b9c2e7bbb9
commit dc696e87c4
9 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
flake.lock
View File

@ -129,11 +129,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1745184749, "lastModified": 1746413188,
"narHash": "sha256-sBBtnaOTQCdtWp3PBGG0fwTcylqa/jKK9PMxe60mNLE=", "narHash": "sha256-i6BoiQP0PasExESQHszC0reQHfO6D4aI2GzOwZMOI20=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "b71ca269615b0837724dac13358a2f0d6816d372", "rev": "8a318641ac13d3bc0a53651feaee9560f9b2d89a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -197,11 +197,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1744932701, "lastModified": 1746328495,
"narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -213,11 +213,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1744932701, "lastModified": 1746328495,
"narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -250,11 +250,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1745188403, "lastModified": 1746440823,
"narHash": "sha256-MMzdUXTRfWQs/B9536JPG2iiefn7lv8lOx3HCTPxBoU=", "narHash": "sha256-aRDrEl65gpA0zoSbc1PgMTqKg2KftKwPmT4Wcco0O8U=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "8af9941539ff23e18fce666ac2c8020e128b3a0a", "rev": "fce799ca5f9de092ed27f5c31ed98ab0c83308c6",
"type": "github" "type": "github"
}, },
"original": { "original": {

14
flake.nix
View File

@ -28,6 +28,20 @@
{ nixpkgs.overlays = [ { nixpkgs.overlays = [
nur.overlays.default nur.overlays.default
(self: super: { utillinux = super.util-linux; }) (self: super: { utillinux = super.util-linux; })
# (final: prev: {
# sunshine = prev.sunshine.overrideAttrs (old: {
# src = prev.fetchFromGitHub {
# owner = "LizardByte";
# repo = "Sunshine";
# rev = "64544e7960f5141f71438d72e5dedad81c03729c";
# hash = "sha256-gDLV9GQ7mbPj1t6Bm4NyS49p4eKc66uAyhG4KmhD+fM=";
# fetchSubmodules = true;
# };
# preferLocalBuild = true;
# allowSubstitutes = false;
# version = "64544e7960f5141f71438d72e5dedad81c03729c";
# });
# })
]; } ]; }
{ {
networking.hostName = host; networking.hostName = host;

2
home/Arm.nix
View File

@ -23,7 +23,7 @@ in
XDG_RUNTIME_DIR = "/run/ubuntu/$(id -u)"; XDG_RUNTIME_DIR = "/run/ubuntu/$(id -u)";
}; };
programs.zsh.initExtra = pkgs.lib.mkForce '' programs.zsh.initContent = pkgs.lib.mkAfter ''
LOCAL_SEARCH_DIRS=(~/.dotfiles/) LOCAL_SEARCH_DIRS=(~/.dotfiles/)
REMOTE_SEARCH_DIRS=() REMOTE_SEARCH_DIRS=()
''; '';

1
home/Kell.nix
View File

@ -52,5 +52,6 @@ in
"HDMI-A-1,preferred,5760x550,1" "HDMI-A-1,preferred,5760x550,1"
]; ];
input.kb_options = "compose:rctrl, caps:super, altwin:swap_alt_win"; input.kb_options = "compose:rctrl, caps:super, altwin:swap_alt_win";
# input.kb_options = "compose:rctrl, caps:super";
}; };
} }

2
home/Pi.nix
View File

@ -23,7 +23,7 @@ in
XDG_RUNTIME_DIR = "/run/user/$(id -u)"; XDG_RUNTIME_DIR = "/run/user/$(id -u)";
}; };
programs.zsh.initExtra = pkgs.lib.mkForce '' programs.zsh.initContent = pkgs.lib.mkAfter ''
LOCAL_SEARCH_DIRS=(~/.dotfiles/) LOCAL_SEARCH_DIRS=(~/.dotfiles/)
REMOTE_SEARCH_DIRS=() REMOTE_SEARCH_DIRS=()
if [ -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' ]; then if [ -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' ]; then

2
home/Tolnedra.nix
View File

@ -31,7 +31,7 @@
XDG_RUNTIME_DIR = "/run/user/$(id -u)"; XDG_RUNTIME_DIR = "/run/user/$(id -u)";
}; };
programs.zsh.initExtra = pkgs.lib.mkForce '' programs.zsh.initContent = pkgs.lib.mkAfter ''
LOCAL_SEARCH_DIRS=(~/.dotfiles/) LOCAL_SEARCH_DIRS=(~/.dotfiles/)
REMOTE_SEARCH_DIRS=() REMOTE_SEARCH_DIRS=()
''; '';

2
home/Vault.nix
View File

@ -71,7 +71,7 @@ in
XDG_RUNTIME_DIR = "/run/user/$(id -u)"; XDG_RUNTIME_DIR = "/run/user/$(id -u)";
}; };
programs.zsh.initExtra = pkgs.lib.mkForce '' programs.zsh.initContent = pkgs.lib.mkAfter ''
LOCAL_SEARCH_DIRS=(~/.dotfiles/ ~/Storage/Thomas/ ~/Storage/Etienne/ ~/Storage/Magda\ and\ Etienne/ ~/Containers/) LOCAL_SEARCH_DIRS=(~/.dotfiles/ ~/Storage/Thomas/ ~/Storage/Etienne/ ~/Storage/Magda\ and\ Etienne/ ~/Containers/)
REMOTE_SEARCH_DIRS=() REMOTE_SEARCH_DIRS=()
''; '';

2
home/bash/default.nix
View File

@ -55,7 +55,7 @@
enableCompletion = true; enableCompletion = true;
historySize = 10000000; historySize = 10000000;
historyFile = "${config.xdg.dataHome}/bash/history"; historyFile = "${config.xdg.dataHome}/bash/history";
initExtra = '' initExtra = pkgs.lib.mkAfter ''
bind 'set show-all-if-ambiguous on' bind 'set show-all-if-ambiguous on'
bind 'set completion-ignore-case on' bind 'set completion-ignore-case on'
bind 'TAB:menu-complete' bind 'TAB:menu-complete'

4
home/zsh/default.nix
View File

@ -55,9 +55,9 @@
enableCompletion = true; enableCompletion = true;
syntaxHighlighting.enable = false; syntaxHighlighting.enable = false;
autosuggestion.enable = true; autosuggestion.enable = true;
initExtra = ''export LD_LIBRARY_PATH=${pkgs.sqlite.out}/lib:$LD_LIBRARY_PATH''; initContent = pkgs.lib.mkBefore ''
initExtraFirst = ''
ZVM_VI_INSERT_ESCAPE_BINDKEY=jj ZVM_VI_INSERT_ESCAPE_BINDKEY=jj
export LD_LIBRARY_PATH=${pkgs.sqlite.out}/lib:$LD_LIBRARY_PATH
source ${./files/waypipe.zsh} source ${./files/waypipe.zsh}
source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme
source ${./files/p10k.zsh} source ${./files/p10k.zsh}