new formatting, nixvim is working

This commit is contained in:
vali 2024-05-22 14:29:45 +02:00
commit 88db34c822
88 changed files with 1994 additions and 1845 deletions

View file

@ -1,6 +1,10 @@
{ config, lib, pkgs, ... }:
with lib;
let
{
config,
lib,
pkgs,
...
}:
with lib; let
cfg = config.modules.programs.fish;
username = config.modules.other.system.username;
# not needed because I'm using nh os switch
@ -12,7 +16,7 @@ in {
extraAliases = mkOption {
type = types.attrs;
description = "extra shell aliases";
default = { };
default = {};
};
};
@ -22,12 +26,12 @@ in {
users.users.${username}.shell = pkgs.fish;
environment = {
shells = [ pkgs.fish ];
pathsToLink = [ "/share/fish" ];
shells = [pkgs.fish];
pathsToLink = ["/share/fish"];
};
home-manager.users.${username} = {
home.packages = with pkgs; [ nix-output-monitor ];
home.packages = with pkgs; [nix-output-monitor];
programs.zoxide.enable = true;
programs.zoxide.enableFishIntegration = true;
programs.fish = {
@ -55,24 +59,26 @@ in {
src = pkgs.fishPlugins.tide.src;
}
];
shellAbbrs = {
c = "clear";
cc = "cd ~ && clear";
mv = "mv -iv";
rm = "trash -v";
ls = "eza --icons";
l = "eza -a --icons";
la = "eza -lha --icons --git";
kys = "shutdown now";
lg = "lazygit";
cd = "z";
v = "nvim";
h = "hx";
k = "kak";
e = "emacs";
update = ''nh os switch "${gitPath}"'';
flake = "cd '${gitPath}'";
} // cfg.extraAliases;
shellAbbrs =
{
c = "clear";
cc = "cd ~ && clear";
mv = "mv -iv";
rm = "trash -v";
ls = "eza --icons";
l = "eza -a --icons";
la = "eza -lha --icons --git";
kys = "shutdown now";
lg = "lazygit";
cd = "z";
v = "nvim";
h = "hx";
k = "kak";
e = "emacs";
update = ''nh os switch "${gitPath}"'';
flake = "cd '${gitPath}'";
}
// cfg.extraAliases;
};
};
};