summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Vink <59492084+ivi-vink@users.noreply.github.com>2025-01-01 10:04:57 +0000
committerMike Vink <59492084+ivi-vink@users.noreply.github.com>2025-01-01 10:04:57 +0000
commit945602c95dbd54c3d952e049e370ece6a7fbff07 (patch)
tree1a189eb2497d9b3e413fba1896a7a9e739d9ce1f
parent9b2131222a6724ec34af4fefc2cc2a540cdd7773 (diff)
clean
-rw-r--r--machines/vm-aarch64.nix2
-rwxr-xr-xmut/bin/desktop-open-pipe (renamed from mut/bin/xdg-open-pipe)12
-rwxr-xr-xmut/bin/xdg-open2
-rw-r--r--mut/ghostty/config1
-rw-r--r--profiles/core/home.nix98
5 files changed, 11 insertions, 104 deletions
diff --git a/machines/vm-aarch64.nix b/machines/vm-aarch64.nix
index f0ee056..565bab7 100644
--- a/machines/vm-aarch64.nix
+++ b/machines/vm-aarch64.nix
@@ -5,7 +5,7 @@
];
system.stateVersion = "24.05";
virtualisation.vmware.guest.enable = true;
- virtualisation.docker.enable = true;
+ virtualisation.docker.enable = false;
virtualisation.docker.rootless = {
enable = true;
setSocketVariable = true;
diff --git a/mut/bin/xdg-open-pipe b/mut/bin/desktop-open-pipe
index 7ae22e1..0ef1901 100755
--- a/mut/bin/xdg-open-pipe
+++ b/mut/bin/desktop-open-pipe
@@ -1,9 +1,13 @@
#!/usr/bin/env bash
-pipe="$HOME/.xdg-open-pipe"
-rm "$pipe"
-mkfifo "$pipe"
+name="$HOME/.cache/desktop-open.pipe"
while true; do
{
- /nix/store/zcw13r2mmpzlnv2yvfl13mcpky3hivq1-system-path/bin/xdg-open "$(cat "$pipe")"
+ /nix/store/zcw13r2mmpzlnv2yvfl13mcpky3hivq1-system-path/bin/xdg-open "$(cat "$name")"
} >/dev/null 2>&1
done
+
+finish () {
+ rm -vf "$name"
+}
+
+trap finish EXIT
diff --git a/mut/bin/xdg-open b/mut/bin/xdg-open
index af5b213..6a5d254 100755
--- a/mut/bin/xdg-open
+++ b/mut/bin/xdg-open
@@ -1,2 +1,2 @@
#!/bin/bash
-echo "$@" | tee "$HOME/.xdg-open-pipe"
+echo "$@" | tee "$HOME/.cache/desktop-open.pipe"
diff --git a/mut/ghostty/config b/mut/ghostty/config
index dafa2b7..656cc20 100644
--- a/mut/ghostty/config
+++ b/mut/ghostty/config
@@ -8,6 +8,7 @@ keybind = alt+shift+k=increase_font_size:1
keybind = alt+shift+j=decrease_font_size:1
keybind = ctrl+zero=unbind
+keybind = ctrl+enter=unbind
theme=GruvboxLuke
window-decoration=false
confirm-close-surface=false
diff --git a/profiles/core/home.nix b/profiles/core/home.nix
index 5a7570d..5fd82f0 100644
--- a/profiles/core/home.nix
+++ b/profiles/core/home.nix
@@ -6,42 +6,6 @@
...
}:
with lib; {
- programs.tmux = {
- enable = true;
- extraConfig = ''
- set-option -g default-shell ${config.my.shell}/bin/zsh
- set -g status off
- set -s set-clipboard on
- setw -g mouse on
- set -g default-terminal "st-256color"
- set -ga terminal-overrides ",xterm-256color:Tc"
- set-option -g focus-events on
- set-option -sg escape-time 10
- unbind M-x
- set -g prefix M-x
- bind M-x send-prefix
-
- bind -n M-w switch-client -T windows
- bind -T windows c if 'n=`tmux list-panes | grep -c ^`; [ $n -gt 1 ]' {
- kill-pane
- }
- bind -T windows n splitp
- bind -T windows N splitp -h
- bind -T windows h select-pane -L
- bind -T windows j select-pane -D
- bind -T windows k select-pane -U
- bind -T windows l select-pane -R
- bind -T windows _ resize-pane -Z
- bind -T windows = selectl even-vertical
-
- set-window-option -g mode-keys vi
- bind-key -T copy-mode-vi v send -X begin-selection
- bind-key -T copy-mode-vi V send -X select-line
- bind-key -T copy-mode-vi y send -X copy-pipe-and-cancel 'xclip -in -selection clipboard'
- bind-key -T copy-mode-vi : command-prompt
- '';
- };
-
hm = {
programs.password-store = {
enable = true;
@@ -49,10 +13,6 @@ with lib; {
PASSWORD_STORE_DIR = config.synced.password-store.path;
};
};
-
- # fonts.fontconfig.enable = true;
- # https://github.com/nix-community/home-manager/issues/4692
- # home.file.".local/bin".source = config.lib.meta.mkMutableSymlink /mut/bin;
home.file.".config/ghostty".source = config.lib.meta.mkMutableSymlink /mut/ghostty;
xdg = {
enable = true;
@@ -124,15 +84,6 @@ with lib; {
};
};
- # programs.ssh = {
- # enable = true;
- # matchBlocks = {
- # "*" = {
- # identityFile = "${config.my.home}/.ssh/id_ed25519_sk";
- # };
- # };
- # };
-
programs.starship = {
enable = true;
enableZshIntegration = false;
@@ -401,55 +352,6 @@ with lib; {
alias use-fido-ssh="export SSH_AUTH_SOCK=~/.ssh/ssh_auth_sock"
'';
};
-
- bash = {
- enable = false;
- bashrcExtra = ''
- export EDITOR="nvim"
- # export TERMINAL="st"
- ( command -v brew ) &>/dev/null && eval "$(/opt/homebrew/bin/brew shellenv)"
- ( command -v docker ) &>/dev/null && eval "$(docker completion bash)"
- ( command -v kubectl ) &>/dev/null && eval "$(kubectl completion bash)"
- ( command -v zoxide ) &>/dev/null && eval "$(zoxide init bash)"
- export PATH="$PATH:$HOME/.local/bin:/opt/homebrew/bin:${config.my.home}/.krew/bin:${config.my.home}/.cargo/bin:${pkgs.ncurses}/bin"
- [[ -f ~/.cache/wal/sequences ]] && (cat ~/.cache/wal/sequences &)
- unset LD_PRELOAD
- # include nix.sh if it exists
-
- export COLORTERM=truecolor
- export GPG_TTY="$(tty)"
- gpgconf --launch gpg-agent
-
- if [ ! -S ~/.ssh/ssh_auth_sock ]; then
- eval `ssh-agent`
- ln -sf "$SSH_AUTH_SOCK" ~/.ssh/ssh_auth_sock
- fi
- export SSH_AUTH_SOCK=~/.ssh/ssh_auth_sock
- # ssh-add -l > /dev/null || ssh-add ~/.ssh/id_ed25519_sk
- '';
- shellAliases = {
- k9s = "k9s ";
- k = "kubectl ";
- d = "docker ";
- ls = "ls --color=auto";
- s = "${
- if machine.isDarwin
- then "darwin-rebuild"
- else "sudo nixos-rebuild"
- } switch --flake ${config.my.home}/flake#${config.networking.hostName}";
- b = "/run/current-system/bin/switch-to-configuration boot";
- v = "nvim";
- M = "xrandr --output HDMI1 --auto --output eDP1 --off";
- m = "xrandr --output eDP1 --auto --output HDMI1 --off";
- mM = "xrandr --output eDP1 --auto --output HDMI1 --off";
- newflake = "nix flake new -t ~/flake ";
- ansible-flake = "nix flake new -t ~/flake#ansible ";
- go-flake = "nix flake new -t ~/flake#go ";
- lock-pass = "gpgconf --kill gpg-agent";
- use-gpg-ssh = "export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)";
- use-fido-ssh = "export SSH_AUTH_SOCK=~/.ssh/ssh_auth_sock";
- };
- };
};
# https://github.com/drduh/config/blob/master/gpg.conf