iofq/nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update con

Browse source
This commit is contained in:
iofq 2024-09-08 13:39:39 -05:00
parent d7d5226ed2
commit 001edf9832
15 changed files with 214 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

1
home-manager/shared/programs/dev/default.nix
View file

@ -5,6 +5,7 @@
};
home.packages = with pkgs; [
ripgrep
fd
k9s
kubectl
python3

2
home-manager/shared/programs/nvim/default.nix
View file

@ -1,5 +1,5 @@
{pkgs, ...}: {
home.packages = with pkgs.unstable; [
home.packages = with pkgs; [
nvim-pkg
];
}

70
home-manager/shared/programs/shell/default.nix
View file

@ -11,8 +11,55 @@
packages = with pkgs; [
tree
eza
bat
];
};
programs.fish = {
enable = true;
interactiveShellInit = ''
set fish_greeting # Disable greeting
set -U tide_right_prompt_items status\x1ecmd_duration\x1etime
'';
shellInit = "
fish_add_path /usr/local/go/bin
fish_add_path ~/go/bin
fish_add_path ~/.local/bin
set -gx MANPAGER 'nvim +Man!'
set -gx EDITOR 'nvim'
set -gx _JAVA_AWT_WM_NONREPARENTING 1
set -gx NIX_FLAKE '/home/e/dev/nix'
";
plugins = [
{ name = "fzf"; src = pkgs.fishPlugins.fzf-fish.src; }
{ name = "puffer"; src = pkgs.fishPlugins.puffer.src; }
];
functions = {
nix = {
wraps = "nix";
body = ''
if status is-interactive
and test (count $argv) = 1 -a "$argv[1]" = develop
nix develop --command (status fish-path)
else
command nix $argv
end
'';
};
};
shellAbbrs = {
g = "git";
k = "kubectl";
};
shellAliases = {
":q" = "exit";
hms = "home-manager switch --flake $NIX_FLAKE#${host.username}";
rbs = "sudo nixos-rebuild switch --flake $NIX_FLAKE#${host.hostName}";
nvim-dev = "nix run ~/dev/nvim.nix";
mpv = "mpv --no-keepaspect-window";
cat = "bat -P";
tcd = "cd $(mktemp -d)";
};
};
programs.bash = {
enable = true;
enableCompletion = true;
@ -25,13 +72,6 @@
la = "eza -lahr";
ll = "la";
":q" = "exit";
mpv = "mpv --no-keepaspect-window";
hms = "home-manager switch --flake $NIX_FLAKE#${host.username}";
rbs = "sudo nixos-rebuild switch --flake $NIX_FLAKE#${host.hostName}";
update = "nix flake update $NIX_FLAKE && rbs && hms";
nvim-dev = "nix run ~/dev/nvim.nix";
g = "git";
k = "kubectl";
};
shellOptions = [
"cmdhist"
@ -45,15 +85,8 @@
bashrcExtra = ''
export PROMPT_COMMAND="prompt_command;history -a"
export PATH="/usr/local/go/bin:~/go/bin:~/.bin:~/.local/bin:$PATH"
export GPG_2FA="mail@10110110.xyz"
export MANPAGER="nvim +Man!"
export EDITOR="nvim"
export _JAVA_AWT_WM_NONREPARENTING=1
export NIX_FLAKE="/home/e/dev/nix"
[[ $- != *i* ]] && return
function exists {
type $1 >/dev/null 2>&1
}
function prompt_command {
GIT_BRANCH=$(git symbolic-ref --short HEAD 2>/dev/null | cut -c 1-10)
@ -72,7 +105,13 @@
cmd="eza"
builtin cd "$@" && $cmd
}
exists "kubectl" && source <(kubectl completion bash)
'';
initExtra = ''
if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
then
shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
fi
'';
};
programs.fzf = {
@ -82,6 +121,7 @@
};
programs.direnv = {
enable = true;
silent = true;
enableBashIntegration = true;
nix-direnv.enable = true;
};

1
home-manager/shared/wayland/default.nix
View file

@ -60,4 +60,5 @@
}
];
};
home.file.".icons/default".source = "${pkgs.vanilla-dmz}/share/icons/DMZ-Black";
}

20
home-manager/shared/wayland/hyprland/default.nix
View file

@ -5,6 +5,7 @@
extraConfig = ''
monitor=,preferred,auto,1
'';
plugins = [ pkgs.hyprlandPlugins.hyprexpo ];
settings = {
"$mod" = "SUPER";
general = {
@ -14,6 +15,8 @@
};
misc = {
disable_hyprland_logo = true;
new_window_takes_over_fullscreen = 1;
exit_window_retains_fullscreen = 1;
};
decoration = {
blur = {
@ -49,6 +52,7 @@
natural_scroll = true;
tap_button_map = "lrm";
middle_button_emulation = false;
drag_lock = true;
};
touchdevice = {
enabled = false;
@ -61,8 +65,8 @@
binde = [
"$mod ALT, h, resizeactive, -50 0"
"$mod ALT, l, resizeactive, 50 0"
"$mod ALT, k, resizeactive, 0 50"
"$mod ALT, j, resizeactive, 0 -50"
"$mod ALT, j, resizeactive, 0 50"
"$mod ALT, k, resizeactive, 0 -50"
];
bind =
[
@ -70,12 +74,14 @@
"$mod, x, killactive"
"$mod, f, fullscreen"
"$mod SHIFT, Escape, exit"
"$mod SHIFT, f, fakefullscreen"
"$mod SHIFT, f, fullscreenstate, 0 3"
"$mod, a, hyprexpo:expo, toggle"
"$mod, Space, exec, ${pkgs.bemenu}/bin/bemenu-run"
"$mod, t, togglefloating"
"$mod, bracketleft, exec, grimshot --notify save area /tmp/scrot-$(date \"+%Y-%m-%d\"T\"%H:%M:%S\").png"
"$mod, bracketright, exec, grimshot --notify copy area"
"$mod SHIFT, q, exec, loginctl lock-session"
"$mod SHIFT, q, exec, swaylock"
"$mod SHIFT, BACKSPACE, exit"
",XF86MonBrightnessDown, exec, light -U 10"
",XF86MonBrightnessUp, exec, light -A 10"
",XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +1%"
@ -95,6 +101,10 @@
"$mod SHIFT, l, movewindow, r"
"$mod SHIFT, k, movewindow, u"
"$mod SHIFT, j, movewindow, d"
"$mod, COMMA, focusmonitor, l"
"$mod, PERIOD, focusmonitor, r"
"$mod SHIFT, COMMA, movewindow, mon:l"
"$mod SHIFT, PERIOD, movewindow, mon:r"
]
++ (
# workspaces
@ -106,7 +116,7 @@
in
builtins.toString (x + 1 - (c * 10));
in [
"$mod, ${ws}, workspace, ${toString (x + 1)}"
"$mod, ${ws}, focusworkspaceoncurrentmonitor, ${toString (x + 1)}"
"$mod SHIFT, ${ws}, movetoworkspacesilent, ${toString (x + 1)}"
]
)