diff --git a/flake.lock b/flake.lock index fef2532..d337fbf 100644 --- a/flake.lock +++ b/flake.lock @@ -184,11 +184,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-wBVLwFjGszsaibW+oPRSRFq6vzKPxSmfsh1evEQ56Ow=", - "path": "/nix/store/5129406lph0jsh20wbmqclcrkmy93a9b-source/system/extras/pydev", + "path": "/nix/store/g3jpiga00m0jbm5jcyrsbvzbbqapg7i8-source/system/extras/pydev", "type": "path" }, "original": { - "path": "/nix/store/5129406lph0jsh20wbmqclcrkmy93a9b-source/system/extras/pydev", + "path": "/nix/store/g3jpiga00m0jbm5jcyrsbvzbbqapg7i8-source/system/extras/pydev", "type": "path" } }, diff --git a/home-manager/autumn/home.nix b/home-manager/autumn/home.nix index 5481a12..633e49c 100644 --- a/home-manager/autumn/home.nix +++ b/home-manager/autumn/home.nix @@ -29,8 +29,8 @@ file = { "config.ini" = { enable = true; - source = "../packages/avizo/config.ini"; - target = "avizo/config.ini"; + source = ../packages/avizo/config.ini; + target = ".config/avizo/config.ini"; }; }; }; diff --git a/home-manager/packages/avizo/config.ini b/home-manager/packages/avizo/config.ini index 84dbc73..cebe87e 100644 --- a/home-manager/packages/avizo/config.ini +++ b/home-manager/packages/avizo/config.ini @@ -3,7 +3,7 @@ ;time = 5.0 # The base directory to resolve relative image-path against (default is $XDG_DATA_HOME/avizo). -;image-base-dir = +image-base-dir = ~/avizo-images # The image opacity; allowed values range from 0 (fully transparent) to 1.0 (fully opaque). ;image-opacity = 1.0 @@ -26,10 +26,10 @@ y-offset = 0.5 x-offset = 0.5 # The border radius of the notification in px. -border-radius = 0 +border-radius = 4 # Sets the border width of the notification in px. -;border-width = 1 +border-width = 4 # The block height of the progress indicator. ;block-height = 10 diff --git a/home-manager/packages/starship/starship.nix b/home-manager/packages/starship/starship.nix index f7fe9c3..56e7707 100644 --- a/home-manager/packages/starship/starship.nix +++ b/home-manager/packages/starship/starship.nix @@ -5,5 +5,6 @@ programs.starship = { enable = true; enableFishIntegration = true; + enableZshIntegration = true; }; } diff --git a/home-manager/packages/zellij/zellij.nix b/home-manager/packages/zellij/zellij.nix index a2af1e9..81c40d0 100644 --- a/home-manager/packages/zellij/zellij.nix +++ b/home-manager/packages/zellij/zellij.nix @@ -4,7 +4,7 @@ programs.zellij = { enable = true; # enableFishIntegration = true; - exitShellOnExit = true; + # exitShellOnExit = true; settings = { themes = { custom = { diff --git a/home-manager/packages/zsh/zsh.nix b/home-manager/packages/zsh/zsh.nix new file mode 100644 index 0000000..383f561 --- /dev/null +++ b/home-manager/packages/zsh/zsh.nix @@ -0,0 +1,29 @@ +{ config, pkgs, ... }: + +{ + + home.packages = with pkgs; [ + oh-my-zsh + ]; + + programs.zsh = { + enable = true; + antidote = { + enable = true; + plugins = {}; + useFriendlyNames = true; + }; + autosuggestions = { + enable = true; + }; + shellAliases = { + ".." = "cd .."; + "..." = "cd ../.."; + "...." = "cd ../../.."; + "pls" = "pls -d typ -d perm -d user -d group -d size -d mtime -d git"; + "z" = "zoxide"; + }; + }; + +} + diff --git a/system/yukigekko/configuration.nix b/system/yukigekko/configuration.nix index 1c86e0b..61ce708 100644 --- a/system/yukigekko/configuration.nix +++ b/system/yukigekko/configuration.nix @@ -80,6 +80,7 @@ swaylock-effects code-cursor-fhs ]; + environment.pathsToLink = ["/share/zsh"]; virtualisation.containers.policy = { default = [{type = "insecureAcceptAnything";}];