merge
This commit is contained in:
commit
125ad513d7
16 changed files with 197 additions and 82 deletions
|
@ -3,7 +3,7 @@ let
|
|||
dwm = pkgs.dwm.overrideAttrs (old: {
|
||||
src = builtins.fetchGit {
|
||||
url = "https://github.com/FredzyW/dwm-conf.git";
|
||||
rev = "05276318843d1bfe90a8aae266c9e997bf97e577";
|
||||
rev = "7e10a592cbfd1cea2b6c5e77c3738716a390eb65";
|
||||
};
|
||||
nativeBuildInputs = with pkgs; [
|
||||
xorg.libX11.dev
|
||||
|
@ -28,3 +28,5 @@ in
|
|||
home.packages = [ dwm dwmblocks ];
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
builtins.fetchGit {
|
||||
url = "https://github.com/rockofox/firefox-minima";
|
||||
ref = "main";
|
||||
rev = "c5580fd04e9b198320f79d441c78a641517d7af5"; # <-- Change this
|
||||
rev = "dc40a861b24b378982c265a7769e3228ffccd45a"; # <-- Change this
|
||||
}
|
||||
}/userChrome.css";
|
||||
'';
|
||||
|
|
|
@ -61,6 +61,8 @@
|
|||
set SYSTEM_DIR "$FLAKE_DIR#jobb"
|
||||
set -Ux FZF_CTRL_R_OPTS "--reverse"
|
||||
set -Ux FZF_TMUX_OPTS "-p"
|
||||
set -e GOROOT
|
||||
set -e GOPATH
|
||||
|
||||
# Mocha
|
||||
set -Ux FZF_DEFAULT_OPTS "\
|
||||
|
|
|
@ -11,12 +11,12 @@
|
|||
# name = "Iosevka Nerd Font Bold";
|
||||
# name = "ComicShannsMono Nerd Font Bold";
|
||||
name = "Hack Nerd Font Mono Bold";
|
||||
size = 13;
|
||||
size = 12;
|
||||
};
|
||||
shellIntegration = {
|
||||
mode = "no-cursor";
|
||||
};
|
||||
theme = "Catppuccin-Mocha";
|
||||
themeFile = "Catppuccin-Mocha";
|
||||
settings = {
|
||||
confirm_os_window_close = 2;
|
||||
cursor_shape = "block";
|
||||
|
|
|
@ -27,42 +27,12 @@
|
|||
user = "fw";
|
||||
identityFile = "/home/fw/.ssh/fw-ssh-key";
|
||||
};
|
||||
"ha1" = {
|
||||
hostname = "192.168.0.180";
|
||||
port = 22;
|
||||
user = "fw";
|
||||
identityFile = "/home/fw/.ssh/fw-ssh-key";
|
||||
};
|
||||
"ha2" = {
|
||||
hostname = "192.168.0.133";
|
||||
port = 22;
|
||||
user = "fw";
|
||||
identityFile = "/home/fw/.ssh/fw-ssh-key";
|
||||
};
|
||||
"ha3" = {
|
||||
hostname = "192.168.0.120";
|
||||
port = 22;
|
||||
user = "fw";
|
||||
identityFile = "/home/fw/.ssh/fw-ssh-key";
|
||||
};
|
||||
"ha4" = {
|
||||
hostname = "192.168.0.52";
|
||||
port = 22;
|
||||
user = "fw";
|
||||
identityFile = "/home/fw/.ssh/fw-ssh-key";
|
||||
};
|
||||
"mac" = {
|
||||
hostname = "192.168.0.149";
|
||||
port = 22;
|
||||
user = "ifacts";
|
||||
identityFile = "/home/fw/.ssh/ifacts-ssh-key";
|
||||
};
|
||||
"backups" = {
|
||||
hostname = "192.168.0.120";
|
||||
port = 22;
|
||||
user = "github";
|
||||
identityFile = "/home/fw/.ssh/github-ssh-key";
|
||||
};
|
||||
"malmo" = {
|
||||
hostname = "192.168.0.138";
|
||||
port = 22;
|
||||
|
@ -86,6 +56,30 @@
|
|||
user = "fw";
|
||||
identityFile = "/home/fw/.ssh/id_rsa";
|
||||
};
|
||||
"kube01" = {
|
||||
hostname = "192.168.0.177";
|
||||
port = 22;
|
||||
user = "fw";
|
||||
identityFile = "/home/fw/.ssh/fw-ssh-key";
|
||||
};
|
||||
"runner01" = {
|
||||
hostname = "192.168.0.184";
|
||||
port = 22;
|
||||
user = "fw";
|
||||
identityFile = "/home/fw/.ssh/fw-ssh-key";
|
||||
};
|
||||
"docker03" = {
|
||||
hostname = "192.168.0.118";
|
||||
port = 22;
|
||||
user = "fw";
|
||||
identityFile = "/home/fw/.ssh/fw-ssh-key";
|
||||
};
|
||||
"table" = {
|
||||
hostname = "192.168.0.157";
|
||||
port = 22;
|
||||
user = "fw";
|
||||
identityFile = "/home/fw/.ssh/fw-ssh-key";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -7,16 +7,6 @@
|
|||
tmuxPlugins.sensible
|
||||
tmuxPlugins.pain-control
|
||||
tmuxPlugins.sessionist
|
||||
tmuxPlugins.logging
|
||||
{
|
||||
plugin = tmuxPlugins.resurrect;
|
||||
extraConfig = ''
|
||||
resurrect_dir="$HOME/.tmux/resurrect"
|
||||
set -g @resurrect-dir $resurrect_dir
|
||||
set -g @resurrect-hook-post-save-all 'target=$(readlink -f $resurrect_dir/last); sed "s| --cmd .*-vim-pack-dir||g; s|/etc/profiles/per-user/$USER/bin/||g" $target | sponge $target'
|
||||
set -g @resurrect-strategy-nvim 'session'
|
||||
'';
|
||||
}
|
||||
{
|
||||
plugin = tmuxPlugins.continuum;
|
||||
extraConfig = ''
|
||||
|
@ -24,8 +14,6 @@
|
|||
set -g @continuum-restore 'on'
|
||||
'';
|
||||
}
|
||||
fw-pkgs.tmuxPlugins.spotify
|
||||
fw-pkgs.tmuxPlugins.tmux-fzf-window
|
||||
{
|
||||
plugin = fw-pkgs.tmuxPlugins.minimal;
|
||||
extraConfig = ''
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue