mirror of
https://github.com/Swarsel/.dotfiles.git
synced 2025-12-06 17:17:22 +01:00
Merge branch 'main' of github.com:Swarsel/.dotfiles
This commit is contained in:
Swarsel
commit
0998d0c1c3
GPG key ID:
26A54C31F2A4FD84
10 changed files with 961 additions and 11 deletions
|
|
@ -447,6 +447,9 @@ A short overview over each input and what it does:
|
|||
|
||||
impermanence.url = "github:nix-community/impermanence";
|
||||
|
||||
zjstatus = {
|
||||
url = "github:dj95/zjstatus";
|
||||
};
|
||||
#+end_src
|
||||
*** let
|
||||
:PROPERTIES:
|
||||
|
|
@ -532,6 +535,7 @@ In this section I am creating some attributes that define general concepts of my
|
|||
(import ./overlays { inherit inputs; }).additions
|
||||
(import ./overlays { inherit inputs; }).modifications
|
||||
(import ./overlays { inherit inputs; }).nixpkgs-stable
|
||||
(import ./overlays { inherit inputs; }).zjstatus
|
||||
inputs.nur.overlay
|
||||
inputs.emacs-overlay.overlay
|
||||
inputs.nixgl.overlay
|
||||
|
|
@ -4455,6 +4459,11 @@ This file now holds all of the "nixpkgs-changes" that I am using across the conf
|
|||
nixpkgs-stable = final: _prev: {
|
||||
stable = import inputs.nixpkgs-stable { inherit (final) system; };
|
||||
};
|
||||
|
||||
zjstatus = final: _prev: {
|
||||
zjstatus = inputs.zjstatus.packages.${_prev.system}.default;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#+end_src
|
||||
|
|
@ -6530,6 +6539,8 @@ This section sets up all the imports that are used in the home-manager section.
|
|||
./gammastep.nix
|
||||
# ./safeeyes.nix
|
||||
./yubikey-touch-detector.nix
|
||||
./zellij.nix
|
||||
./tmux.nix
|
||||
];
|
||||
|
||||
nix = {
|
||||
|
|
@ -7402,10 +7413,11 @@ The theme is handled by stylix.
|
|||
programs.kitty = {
|
||||
enable = true;
|
||||
keybindings = {
|
||||
"ctrl+shift+left" = "no_op";
|
||||
"ctrl+shift+right" = "no_op";
|
||||
"ctrl+shift+home" = "no_op";
|
||||
"ctrl+shift+end" = "no_op";
|
||||
};
|
||||
settings = {
|
||||
scrollback_lines = 10000;
|
||||
enable_audio_bell = false;
|
||||
notify_on_cmd_finish = "always 20";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -7470,13 +7482,343 @@ Here we set some aliases (some of them should be shellApplications instead) as w
|
|||
}
|
||||
];
|
||||
initExtra = ''
|
||||
bindkey "^[[1;5D" backward-word
|
||||
bindkey "^[[1;5C" forward-word
|
||||
bindkey "^[[1;5D" backward-word
|
||||
bindkey "^[[1;5C" forward-word
|
||||
|
||||
vterm_printf() {
|
||||
if [ -n "$TMUX" ] && ([ "''${TERM%%-*}" = "tmux" ] || [ "''${TERM%%-*}" = "screen" ]); then
|
||||
# Tell tmux to pass the escape sequences through
|
||||
printf "\ePtmux;\e\e]%s\007\e\\" "$1"
|
||||
elif [ "''${TERM%%-*}" = "screen" ]; then
|
||||
# GNU screen (screen, screen-256color, screen-256color-bce)
|
||||
printf "\eP\e]%s\007\e\\" "$1"
|
||||
else
|
||||
printf "\e]%s\e\\" "$1"
|
||||
fi
|
||||
}
|
||||
'';
|
||||
};
|
||||
}
|
||||
#+end_src
|
||||
|
||||
**** zellij
|
||||
#+begin_src nix :tangle profiles/common/home/zellij.nix
|
||||
{ pkgs, config, ... }:
|
||||
let
|
||||
inherit (config.lib.stylix) colors;
|
||||
sesh = pkgs.writeScriptBin "sesh" ''
|
||||
#! /usr/bin/env sh
|
||||
|
||||
# Taken from https://github.com/zellij-org/zellij/issues/884#issuecomment-1851136980
|
||||
# select a directory using zoxide
|
||||
ZOXIDE_RESULT=$(zoxide query --interactive)
|
||||
# checks whether a directory has been selected
|
||||
if [[ -z "$ZOXIDE_RESULT" ]]; then
|
||||
# if there was no directory, select returns without executing
|
||||
exit 0
|
||||
fi
|
||||
# extracts the directory name from the absolute path
|
||||
SESSION_TITLE=$(echo "$ZOXIDE_RESULT" | sed 's#.*/##')
|
||||
|
||||
# get the list of sessions
|
||||
SESSION_LIST=$(zellij list-sessions -n | awk '{print $1}')
|
||||
|
||||
# checks if SESSION_TITLE is in the session list
|
||||
if echo "$SESSION_LIST" | grep -q "^$SESSION_TITLE$"; then
|
||||
# if so, attach to existing session
|
||||
zellij attach "$SESSION_TITLE"
|
||||
else
|
||||
# if not, create a new session
|
||||
echo "Creating new session $SESSION_TITLE and CD $ZOXIDE_RESULT"
|
||||
cd $ZOXIDE_RESULT
|
||||
zellij attach -c "$SESSION_TITLE"
|
||||
fi
|
||||
'';
|
||||
|
||||
in
|
||||
{
|
||||
programs.zellij = {
|
||||
enable = true;
|
||||
};
|
||||
home.packages = [
|
||||
# pkgs.tmate
|
||||
# sesh
|
||||
];
|
||||
# xdg.configFile."zellij/config.kdl".source = ../../../programs/zellij/config.kdl;
|
||||
# xdg.configFile."zellij/layouts/default.kdl".text = ''
|
||||
# layout {
|
||||
# swap_tiled_layout name="vertical" {
|
||||
# tab max_panes=5 {
|
||||
# pane split_direction="vertical" {
|
||||
# pane
|
||||
# pane { children; }
|
||||
# }
|
||||
# }
|
||||
# tab max_panes=8 {
|
||||
# pane split_direction="vertical" {
|
||||
# pane { children; }
|
||||
# pane { pane; pane; pane; pane; }
|
||||
# }
|
||||
# }
|
||||
# tab max_panes=12 {
|
||||
# pane split_direction="vertical" {
|
||||
# pane { children; }
|
||||
# pane { pane; pane; pane; pane; }
|
||||
# pane { pane; pane; pane; pane; }
|
||||
# }
|
||||
# }
|
||||
# }
|
||||
|
||||
# swap_tiled_layout name="horizontal" {
|
||||
# tab max_panes=5 {
|
||||
# pane
|
||||
# pane
|
||||
# }
|
||||
# tab max_panes=8 {
|
||||
# pane {
|
||||
# pane split_direction="vertical" { children; }
|
||||
# pane split_direction="vertical" { pane; pane; pane; pane; }
|
||||
# }
|
||||
# }
|
||||
# tab max_panes=12 {
|
||||
# pane {
|
||||
# pane split_direction="vertical" { children; }
|
||||
# pane split_direction="vertical" { pane; pane; pane; pane; }
|
||||
# pane split_direction="vertical" { pane; pane; pane; pane; }
|
||||
# }
|
||||
# }
|
||||
# }
|
||||
|
||||
# swap_tiled_layout name="stacked" {
|
||||
# tab min_panes=5 {
|
||||
# pane split_direction="vertical" {
|
||||
# pane
|
||||
# pane stacked=true { children; }
|
||||
# }
|
||||
# }
|
||||
# }
|
||||
|
||||
# swap_floating_layout name="staggered" {
|
||||
# floating_panes
|
||||
# }
|
||||
|
||||
# swap_floating_layout name="enlarged" {
|
||||
# floating_panes max_panes=10 {
|
||||
# pane { x "5%"; y 1; width "90%"; height "90%"; }
|
||||
# pane { x "5%"; y 2; width "90%"; height "90%"; }
|
||||
# pane { x "5%"; y 3; width "90%"; height "90%"; }
|
||||
# pane { x "5%"; y 4; width "90%"; height "90%"; }
|
||||
# pane { x "5%"; y 5; width "90%"; height "90%"; }
|
||||
# pane { x "5%"; y 6; width "90%"; height "90%"; }
|
||||
# pane { x "5%"; y 7; width "90%"; height "90%"; }
|
||||
# pane { x "5%"; y 8; width "90%"; height "90%"; }
|
||||
# pane { x "5%"; y 9; width "90%"; height "90%"; }
|
||||
# pane focus=true { x 10; y 10; width "90%"; height "90%"; }
|
||||
# }
|
||||
# }
|
||||
|
||||
# swap_floating_layout name="spread" {
|
||||
# floating_panes max_panes=1 {
|
||||
# pane {y "50%"; x "50%"; }
|
||||
# }
|
||||
# floating_panes max_panes=2 {
|
||||
# pane { x "1%"; y "25%"; width "45%"; }
|
||||
# pane { x "50%"; y "25%"; width "45%"; }
|
||||
# }
|
||||
# floating_panes max_panes=3 {
|
||||
# pane focus=true { y "55%"; width "45%"; height "45%"; }
|
||||
# pane { x "1%"; y "1%"; width "45%"; }
|
||||
# pane { x "50%"; y "1%"; width "45%"; }
|
||||
# }
|
||||
# floating_panes max_panes=4 {
|
||||
# pane { x "1%"; y "55%"; width "45%"; height "45%"; }
|
||||
# pane focus=true { x "50%"; y "55%"; width "45%"; height "45%"; }
|
||||
# pane { x "1%"; y "1%"; width "45%"; height "45%"; }
|
||||
# pane { x "50%"; y "1%"; width "45%"; height "45%"; }
|
||||
# }
|
||||
# }
|
||||
|
||||
# default_tab_template {
|
||||
# pane size=2 borderless=true {
|
||||
# plugin location="file://${pkgs.zjstatus}/bin/zjstatus.wasm" {
|
||||
# format_left "{mode}#[bg=#${colors.base00}] {tabs}"
|
||||
# format_center ""
|
||||
# format_right "#[bg=#${colors.base00},fg=#${colors.base0D}]#[bg=#${colors.base0D},fg=#${colors.base01},bold] #[bg=#${colors.base02},fg=#${colors.base05},bold] {session} #[bg=#${colors.base03},fg=#${colors.base05},bold]"
|
||||
# format_space ""
|
||||
# format_hide_on_overlength "true"
|
||||
# format_precedence "crl"
|
||||
|
||||
# border_enabled "false"
|
||||
# border_char "─"
|
||||
# border_format "#[fg=#6C7086]{char}"
|
||||
# border_position "top"
|
||||
|
||||
# mode_normal "#[bg=#${colors.base0B},fg=#${colors.base02},bold] NORMAL#[bg=#${colors.base03},fg=#${colors.base0B}]█"
|
||||
# mode_locked "#[bg=#${colors.base04},fg=#${colors.base02},bold] LOCKED #[bg=#${colors.base03},fg=#${colors.base04}]█"
|
||||
# mode_resize "#[bg=#${colors.base08},fg=#${colors.base02},bold] RESIZE#[bg=#${colors.base03},fg=#${colors.base08}]█"
|
||||
# mode_pane "#[bg=#${colors.base0D},fg=#${colors.base02},bold] PANE#[bg=#${colors.base03},fg=#${colors.base0D}]█"
|
||||
# mode_tab "#[bg=#${colors.base07},fg=#${colors.base02},bold] TAB#[bg=#${colors.base03},fg=#${colors.base07}]█"
|
||||
# mode_scroll "#[bg=#${colors.base0A},fg=#${colors.base02},bold] SCROLL#[bg=#${colors.base03},fg=#${colors.base0A}]█"
|
||||
# mode_enter_search "#[bg=#${colors.base0D},fg=#${colors.base02},bold] ENT-SEARCH#[bg=#${colors.base03},fg=#${colors.base0D}]█"
|
||||
# mode_search "#[bg=#${colors.base0D},fg=#${colors.base02},bold] SEARCHARCH#[bg=#${colors.base03},fg=#${colors.base0D}]█"
|
||||
# mode_rename_tab "#[bg=#${colors.base07},fg=#${colors.base02},bold] RENAME-TAB#[bg=#${colors.base03},fg=#${colors.base07}]█"
|
||||
# mode_rename_pane "#[bg=#${colors.base0D},fg=#${colors.base02},bold] RENAME-PANE#[bg=#${colors.base03},fg=#${colors.base0D}]█"
|
||||
# mode_session "#[bg=#${colors.base0E},fg=#${colors.base02},bold] SESSION#[bg=#${colors.base03},fg=#${colors.base0E}]█"
|
||||
# mode_move "#[bg=#${colors.base0F},fg=#${colors.base02},bold] MOVE#[bg=#${colors.base03},fg=#${colors.base0F}]█"
|
||||
# mode_prompt "#[bg=#${colors.base0D},fg=#${colors.base02},bold] PROMPT#[bg=#${colors.base03},fg=#${colors.base0D}]█"
|
||||
# mode_tmux "#[bg=#${colors.base09},fg=#${colors.base02},bold] TMUX#[bg=#${colors.base03},fg=#${colors.base09}]█"
|
||||
|
||||
# // formatting for inactive tabs
|
||||
# tab_normal "#[bg=#${colors.base03},fg=#${colors.base0D}]█#[bg=#${colors.base0D},fg=#${colors.base02},bold]{index} #[bg=#${colors.base02},fg=#${colors.base05},bold] {name}{floating_indicator}#[bg=#${colors.base03},fg=#${colors.base02},bold]█"
|
||||
# tab_normal_fullscreen "#[bg=#${colors.base03},fg=#${colors.base0D}]█#[bg=#${colors.base0D},fg=#${colors.base02},bold]{index} #[bg=#${colors.base02},fg=#${colors.base05},bold] {name}{fullscreen_indicator}#[bg=#${colors.base03},fg=#${colors.base02},bold]█"
|
||||
# tab_normal_sync "#[bg=#${colors.base03},fg=#${colors.base0D}]█#[bg=#${colors.base0D},fg=#${colors.base02},bold]{index} #[bg=#${colors.base02},fg=#${colors.base05},bold] {name}{sync_indicator}#[bg=#${colors.base03},fg=#${colors.base02},bold]█"
|
||||
|
||||
# // formatting for the current active tab
|
||||
# tab_active "#[bg=#${colors.base03},fg=#${colors.base09}]█#[bg=#${colors.base09},fg=#${colors.base02},bold]{index} #[bg=#${colors.base02},fg=#${colors.base05},bold] {name}{floating_indicator}#[bg=#${colors.base03},fg=#${colors.base02},bold]█"
|
||||
# tab_active_fullscreen "#[bg=#${colors.base03},fg=#${colors.base09}]█#[bg=#${colors.base09},fg=#${colors.base02},bold]{index} #[bg=#${colors.base02},fg=#${colors.base05},bold] {name}{fullscreen_indicator}#[bg=#${colors.base03},fg=#${colors.base02},bold]█"
|
||||
# tab_active_sync "#[bg=#${colors.base03},fg=#${colors.base09}]█#[bg=#${colors.base09},fg=#${colors.base02},bold]{index} #[bg=#${colors.base02},fg=#${colors.base05},bold] {name}{sync_indicator}#[bg=#${colors.base03},fg=#${colors.base02},bold]█"
|
||||
|
||||
# // separator between the tabs
|
||||
# tab_separator "#[bg=#${colors.base00}] "
|
||||
|
||||
# // indicators
|
||||
# tab_sync_indicator " "
|
||||
# tab_fullscreen_indicator " "
|
||||
# tab_floating_indicator " "
|
||||
|
||||
# command_git_branch_command "git rev-parse --abbrev-ref HEAD"
|
||||
# command_git_branch_format "#[fg=blue] {stdout} "
|
||||
# command_git_branch_interval "10"
|
||||
# command_git_branch_rendermode "static"
|
||||
|
||||
# datetime "#[fg=#6C7086,bold] {format} "
|
||||
# datetime_format "%A, %d %b %Y %H:%M"
|
||||
# datetime_timezone "Europe/London"
|
||||
# }
|
||||
# }
|
||||
# children
|
||||
# }
|
||||
# }
|
||||
# '';
|
||||
|
||||
|
||||
}
|
||||
#+end_src
|
||||
**** tmux
|
||||
#+begin_src nix :tangle profiles/common/home/tmux.nix
|
||||
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
tmux-super-fingers = pkgs.tmuxPlugins.mkTmuxPlugin
|
||||
{
|
||||
pluginName = "tmux-super-fingers";
|
||||
version = "unstable-2023-01-06";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "artemave";
|
||||
repo = "tmux_super_fingers";
|
||||
rev = "2c12044984124e74e21a5a87d00f844083e4bdf7";
|
||||
sha256 = "sha256-cPZCV8xk9QpU49/7H8iGhQYK6JwWjviL29eWabuqruc=";
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
|
||||
home.packages = with pkgs; [
|
||||
lsof
|
||||
sesh
|
||||
];
|
||||
|
||||
programs.tmux = {
|
||||
enable = true;
|
||||
shell = "${pkgs.zsh}/bin/zsh";
|
||||
terminal = "tmux-256color";
|
||||
historyLimit = 100000;
|
||||
plugins = with pkgs;
|
||||
[
|
||||
tmuxPlugins.tmux-thumbs
|
||||
{
|
||||
plugin = tmux-super-fingers;
|
||||
extraConfig = "set -g @super-fingers-key f";
|
||||
}
|
||||
|
||||
tmuxPlugins.sensible
|
||||
# must be before continuum edits right status bar
|
||||
{
|
||||
plugin = tmuxPlugins.catppuccin;
|
||||
extraConfig = ''
|
||||
set -g @catppuccin_flavour 'frappe'
|
||||
set -g @catppuccin_window_tabs_enabled on
|
||||
set -g @catppuccin_date_time "%H:%M"
|
||||
'';
|
||||
}
|
||||
{
|
||||
plugin = tmuxPlugins.resurrect;
|
||||
extraConfig = ''
|
||||
set -g @resurrect-strategy-vim 'session'
|
||||
set -g @resurrect-strategy-nvim 'session'
|
||||
set -g @resurrect-capture-pane-contents 'on'
|
||||
'';
|
||||
}
|
||||
{
|
||||
plugin = tmuxPlugins.continuum;
|
||||
extraConfig = ''
|
||||
set -g @continuum-restore 'on'
|
||||
set -g @continuum-boot 'on'
|
||||
set -g @continuum-save-interval '10'
|
||||
'';
|
||||
}
|
||||
tmuxPlugins.better-mouse-mode
|
||||
tmuxPlugins.yank
|
||||
];
|
||||
extraConfig = ''
|
||||
set -g default-terminal "tmux-256color"
|
||||
set -ag terminal-overrides ",xterm-256color:RGB"
|
||||
|
||||
set-option -g prefix C-a
|
||||
unbind-key C-b
|
||||
bind-key C-a send-prefix
|
||||
|
||||
set -g mouse on
|
||||
|
||||
# Change splits to match nvim and easier to remember
|
||||
# Open new split at cwd of current split
|
||||
unbind %
|
||||
unbind '"'
|
||||
bind | split-window -h -c "#{pane_current_path}"
|
||||
bind - split-window -v -c "#{pane_current_path}"
|
||||
|
||||
# Use vim keybindings in copy mode
|
||||
set-window-option -g mode-keys vi
|
||||
|
||||
# v in copy mode starts making selection
|
||||
bind-key -T copy-mode-vi v send-keys -X begin-selection
|
||||
bind-key -T copy-mode-vi C-v send-keys -X rectangle-toggle
|
||||
bind-key -T copy-mode-vi y send-keys -X copy-selection-and-cancel
|
||||
|
||||
# Escape turns on copy mode
|
||||
bind Escape copy-mode
|
||||
|
||||
# Easier reload of config
|
||||
bind r source-file ~/.config/tmux/tmux.conf
|
||||
|
||||
set-option -g status-position top
|
||||
|
||||
# make Prefix p paste the buffer.
|
||||
unbind p
|
||||
bind p paste-buffer
|
||||
|
||||
# Bind Keys
|
||||
bind-key -T prefix C-g split-window \
|
||||
"$SHELL --login -i -c 'navi --print | head -c -1 | tmux load-buffer -b tmp - ; tmux paste-buffer -p -t {last} -b tmp -d'"
|
||||
bind-key -T prefix C-l switch -t notes
|
||||
bind-key -T prefix C-d switch -t dotfiles
|
||||
bind-key e send-keys "tmux capture-pane -p -S - | nvim -c 'set buftype=nofile' +" Enter
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
#+end_src
|
||||
**** Mail
|
||||
:PROPERTIES:
|
||||
:CUSTOM_ID: h:506d01fc-c20b-473a-ac78-bce4b53fe0e3
|
||||
|
|
@ -12127,3 +12469,12 @@ This sets up the =dashboard=, which is really quite useless. But, it looks cool
|
|||
|
||||
|
||||
#+end_src
|
||||
|
||||
*** vterm
|
||||
|
||||
#+begin_src emacs-lisp
|
||||
|
||||
(use-package vterm
|
||||
:ensure t)
|
||||
|
||||
#+end_src
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue