diff --git a/config/network.nix b/config/network.nix index 25d4273..f68609c 100644 --- a/config/network.nix +++ b/config/network.nix @@ -9,6 +9,8 @@ ... }: { + services.netbird.enable = true; + environment.systemPackages = with pkgs; [ openvpn networkmanagerapplet @@ -19,6 +21,5 @@ networkmanager openssh dig - netbird ]; } diff --git a/config/programs.nix b/config/programs.nix index 6d5e7e5..bb1cc3b 100644 --- a/config/programs.nix +++ b/config/programs.nix @@ -32,6 +32,8 @@ speedcrunch remmina netbird-ui + vial + via # Browsers librewolf diff --git a/shared/dwm.nix b/shared/dwm.nix index c1905f9..a12f8b4 100644 --- a/shared/dwm.nix +++ b/shared/dwm.nix @@ -8,7 +8,7 @@ let dwm = pkgs.dwm.overrideAttrs (old: { src = builtins.fetchGit { url = "https://github.com/FredzyW/dwm-conf.git"; - rev = "9c31e04088fbe20be6dce79c55b9368d3f37654a"; + rev = "fc45c6741b02db90ecd94d17ec6a2ed32a94da02"; }; nativeBuildInputs = with pkgs; [ xorg.libX11.dev diff --git a/shared/kitty.nix b/shared/kitty.nix index 2d81694..7bda25b 100644 --- a/shared/kitty.nix +++ b/shared/kitty.nix @@ -11,14 +11,14 @@ if myhostname == "laptop" then { # name = "Iosevka Nerd Font Bold"; - name = "ComicShannsMono Nerd Font Bold"; + name = "ComicShannsMono Nerd Font"; # name = "Hack Nerd Font Mono Bold"; - size = 15; + size = 18; } else { # name = "Iosevka Nerd Font Bold"; - name = "ComicShannsMono Nerd Font Bold"; + name = "ComicShannsMono Nerd Font"; # name = "Hack Nerd Font Mono Bold"; size = 12; }; @@ -32,5 +32,15 @@ cursor_blink_interval = 0; enable_audio_bell = false; }; + keybindings = { + "ctrl+alt+k" = "launch --location=hsplit --cwd=current"; + "ctrl+alt+l" = "launch --location=vsplit --cwd=current"; + "ctrl+shift+n" = "next_tab"; + "ctrl+shift+b" = "prev_tab"; + "ctrl+h" = "neighboring_window left"; + "ctrl+l" = "neighboring_window right"; + "ctrl+j" = "neighboring_window down"; + "ctrl+k" = "neighboring_window up"; + }; }; } diff --git a/shared/tmux.nix b/shared/tmux.nix index 15f908d..79ac482 100644 --- a/shared/tmux.nix +++ b/shared/tmux.nix @@ -32,8 +32,10 @@ bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'xclip -in -selection clipboard' bind -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel "xclip -i -f -selection primary | xclip -i -selection clipboard" - set -g default-terminal "st-256color" - set -g terminal-overrides "st-256color" + # set -g default-terminal "st-256color" + # set -g terminal-overrides "st-256color" + set -g default-terminal "xterm-kitty" + set -g terminal-overrides "xterm-kitty" set -ga terminal-overrides ",xterm-256color:Tc" set -as terminal-overrides ',*:Smulx=\E[4::%p1%dm'