Espanso for ..date expansion etc.

It turns out that all other methods I have tried overrides disabling the
touchpad while typing. Only interception-tools seems to work.

.gitignore

@@ -0,0 +1,3 @@
+fish/*
+!fish/config.fish
+!fish/functions/*

bin/columnize

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 # 
 # The MIT License (MIT)

bin/prettygit

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 HASH="%C(yellow)%h%C(reset)"
 RELATIVE_TIME="%C(green)%ar%C(reset)"

fish/config.fish

@@ -1,14 +1,34 @@
 set -x DOTFILES $HOME/dotfiles
 
 if test -z "$FISH_SETUP_PATH"
-    set -x PATH $HOME/dotfiles/bin $PATH
-    set -x PATH . $PATH
+    set -xp PATH $HOME/.pyenv/bin
+    set -xp PATH $HOME/.local/bin
+    set -xp PATH $HOME/dotfiles/bin
+    set -xp PATH $HOME/bin
+    set -xp PATH .
 
     set -x FISH_SETUP_PATH
 end
 
 set -x LANG sv_SE.UTF-8
 set -x LC_ALL sv_SE.UTF-8
-set -x EDITOR nvim
 
-alias v vim
+set -x EDITOR nvim
+alias v nvim
+
+if type -q pyenv
+    pyenv init --path | source
+end
+# pyenv virtualenv-init - | source
+
+alias dc="docker compose"
+alias dce="docker compose exec"
+alias drh="docker run -it --rm -v (pwd):/usr/(pwd) -w /usr/(pwd)"
+
+
+# Include local config if present
+
+if test -r $DOTFILES/fish/local.fish
+  source $DOTFILES/fish/local.fish
+end
+

fish/functions/fish_right_prompt.fish

@@ -1,13 +1,13 @@
 function fish_right_prompt
-    set -l ref (git symbolic-ref HEAD ^/dev/null)
+    set -l ref (git symbolic-ref HEAD 2>/dev/null)
     if test -z $ref
         return
     end
-    
-    git diff --no-ext-diff --quiet --exit-code ^/dev/null
+
+    git diff --no-ext-diff --quiet --exit-code 2>/dev/null
     or set -l dirty 'yes'
 
-    git diff-index --cached --quiet HEAD -- ^/dev/null
+    git diff-index --cached --quiet HEAD -- 2>/dev/null
     or set -l staged 'yes'
 
     set_color normal
@@ -21,7 +21,7 @@ function fish_right_prompt
         set_color green
     end
     echo -sn (string replace refs/heads/ '' -- $ref)
-    
+
     set_color normal
     echo -sn ']'
-end
+end

git/gitconfig

@@ -1,6 +1,8 @@
 [user]
 	name = Thomas Lovén
 	email = thomasloven@gmail.com
+[init]
+  defaultBranch = main
 [credential]
 	helper = cache
 [color]

init.vim

@@ -1,24 +1,45 @@
+" Display tab characters, trailing spaces and nbsp
 set list
 set listchars=tab:→\ ,trail:␣,nbsp:⋅
+
+" Remove unnecessary stuff from bottom of window
 set noruler
 set laststatus=2
 
+" Nice line numbers
 set number
 set relativenumber
 
+" Spaces over tabs every day of the week (except in makefiles)
 set expandtab
 set tabstop=2
 set shiftwidth=2
 set softtabstop=2
 set smartindent
 
+" Window navigation shortcuts
 nnoremap <c-h> <c-w>h
 nnoremap <c-j> <c-w>j
 nnoremap <c-k> <c-w>k
 nnoremap <c-l> <c-w>l
 
+" ö for quick command access on Swedish keyboards
 nnoremap ö :
 
+" Some navigation shortcuts for Swedish keyboards
+nnoremap - `
+nmap Å [
+nmap å ]
+omap Å [
+omap å ]
+xmap Å [
+xmap å ]
+noremap ÅÅ [[
+noremap åå ]]
+nnoremap <space>, <c-^>
+nnoremap <tab> %
+
+" Some searching options
 set ignorecase
 set smartcase
 set incsearch
@@ -29,4 +50,9 @@ noremap / /\v
 nnoremap * *N
 noh
 
-set hidden
+set hidden
+
+" Uppercase last word on c-^
+inoremap <C-]> <Esc>gUiw`]a
+
+nnoremap <silent> § :NERDTreeToggle<CR>

install.sh

@@ -1,37 +1,112 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-sudo -n apt-get update
-sudo -n DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-  fish \
-  neovim
+function install_pkg() {
+  if hash apt-get 2>/dev/null; then
+    sudo -n apt-get update
+    sudo -n DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends ${@}
+    return
+  fi
 
-USER=`whoami`
-sudo -n chsh $USER -s $(which fish)
-echo "exec $(which fish) -l" >> ~/.profile
-echo "exec $(which fish) -l" >> ~/.bashrc
-echo "exec $(which fish) -l" >> ~/.zshrc
+  if hash nix 2>/dev/null; then
+    echo "INSTALL ${@} yourself with nix"
+    return
+  fi
+}
 
-echo "sv_SE.UTF-8 UTF-8" | sudo tee -a /etc/locale.gen
-sudo locale-gen
+function setup_ssh() {
+  configfile=~/.ssh/config
+  if grep -Fxq "# dotfiles installed" ${configfile}; then
+    return
+  fi
 
-cat << EOF > ~/.gitconfig
+  mkdir -p ~/.ssh
+  touch ${configfile}
+  chmod 644 ${configfile}
+  cat << EOF >> ${configfile}
+Include ${HOME}/dotfiles/ssh.config
+# dotfiles installed
+EOF
+}
+
+function setup_git() {
+  configfile=~/.gitconfig
+  if grep -Fxq "# dotfiles installed" ${configfile}; then
+    return
+  fi
+
+  cat << EOF > ${configfile}
 [include]
   path = ${HOME}/dotfiles/git/gitconfig
 [core]
   excludesfile = ${HOME}/dotfiles/git/gitignore_global
+# dotfiles installed
 EOF
 
-mkdir -p ~/.ssh
-cat << EOF > ~/.ssh/config
-Host github.com
-    User git
-Host gitea
-  HostName git.torpet.thomasloven.com
-  User git
-EOF
-chmod 644 ~/.ssh/config
+  setup_ssh
+}
 
-mkdir -p ~/.config/
-ln -s ~/dotfiles/fish ~/.config/fish
-mkdir -p ~/.config/nvim/
-ln -s ~/dotfiles/init.vim ~/.config/nvim/init.vim
+function setup_tmux() {
+  configfile=~/.tmux.conf
+  if grep -Fxq "# dotfiles installed" ${configfile}; then
+    return
+  fi
+
+  install_pkg tmux
+  cat << EOF > ${configfile}
+source ${HOME}/dotfiles/tmux/tmux.conf
+# dotfiles.installed
+EOF
+}
+
+function setup_fish() {
+  install_pkg fish
+
+  USER=`whoami`
+  sudo -n chsh $USER -s $(which fish)
+  # Force fish shell for devcontainers
+  echo "exec $(which fish) -l" >> ~/.bashrc
+  echo "exec $(which fish) -l" >> ~/.zshrc
+
+  mkdir -p ~/.config/
+  ln -s ~/dotfiles/fish ~/.config/fish
+}
+
+function setup_nvim() {
+  install_pkg neovim
+  mkdir -p ~/.config/nvim/
+  ln -s ~/dotfiles/init.vim ~/.config/nvim/init.vim
+
+  # Install NERDtree plugin
+  git clone --single-branch https://github.com/preservim/nerdtree.git ~/.config/nvim/pack/vendor/start/nerdtree
+  git clone --single-branch https://tpope.io/vim/commentary.git ~/.config/nvim/pack/vendor/start/commentary
+  nvim -u NONE -c "helptags ~/.config/nvim/pack/vendor/start/nerdtree/doc" -c q
+  nvim -u NONE -c "helptags ~/.config/nvim/pack/vendor/start/commentary/doc" -c q
+}
+
+function main() {
+
+  install_pkg locales less
+
+  if [[ ${REMOTE_CONTAINERS} || ${DEVCONTAINER} ]]; then
+    echo "sv_SE.UTF-8 UTF-8" | sudo tee -a /etc/locale.gen
+    sudo locale-gen
+  fi
+
+  setup_fish
+  setup_ssh
+  setup_git
+
+  if [[ ${REMOTE_CONTAINERS} || ${DEVCONTAINER} ]]; then
+
+    echo "INSTALLING IN DEVCONTAINER"
+
+    echo "set -x EDITOR code" >> ~/.config/fish/local.fish
+
+  else
+    setup_tmux
+    setup_nvim
+  fi
+
+}
+
+main $@

nixos/flake.lock

@@ -0,0 +1,44 @@
+{
+  "nodes": {
+    "espanso-fix": {
+      "locked": {
+        "lastModified": 1733174540,
+        "narHash": "sha256-Yv72ufzlbccsUgjnDtLfybPS4HJ7v3lN+pjmcH3/l+I=",
+        "owner": "pitkling",
+        "repo": "nixpkgs",
+        "rev": "2c39301457f9b5cb18a042a1f5643b15de551c79",
+        "type": "github"
+      },
+      "original": {
+        "owner": "pitkling",
+        "ref": "espanso-fix-capabilities-export",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1734875076,
+        "narHash": "sha256-Pzyb+YNG5u3zP79zoi8HXYMs15Q5dfjDgwCdUI5B0nY=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "1807c2b91223227ad5599d7067a61665c52d1295",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-24.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "espanso-fix": "espanso-fix",
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

nixos/flake.nix

@@ -0,0 +1,25 @@
+{
+  description = "My nixos config";
+
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
+    espanso-fix.url = "github:pitkling/nixpkgs/espanso-fix-capabilities-export";
+  };
+
+  outputs = { self, nixpkgs, espanso-fix, ... } @ inputs:
+  let
+    inherit (self) outputs;
+    system = "x86_64-linux";
+  in
+  {
+    nixosConfigurations = {
+      macbook = nixpkgs.lib.nixosSystem {
+        specialArgs = { inherit inputs outputs; };
+        modules = [
+          ./nixos/configuration.nix
+          espanso-fix.nixosModules.espanso-capdacoverride
+        ];
+      };
+    };
+  };
+}

nixos/nixos/configuration.nix

@@ -0,0 +1,181 @@
+{ inputs, lib, config, pkgs, ... }:
+
+{
+  imports =
+    [
+      "/etc/nixos/hardware-configuration.nix"
+    ];
+
+  nix = {
+    settings = {
+      experimental-features = [ "nix-command" "flakes" ];
+    };
+  };
+
+  time.timeZone = "Europe/Stockholm";
+
+  i18n = {
+    defaultLocale = "sv_SE.UTF-8";
+
+    extraLocaleSettings = {
+      LC_ADDRESS = "sv_SE.UTF-8";
+      LC_IDENTIFICATION = "sv_SE.UTF-8";
+      LC_MEASUREMENT = "sv_SE.UTF-8";
+      LC_MONETARY = "sv_SE.UTF-8";
+      LC_NAME = "sv_SE.UTF-8";
+      LC_NUMERIC = "sv_SE.UTF-8";
+      LC_PAPER = "sv_SE.UTF-8";
+      LC_TELEPHONE = "sv_SE.UTF-8";
+      LC_TIME = "sv_SE.UTF-8";
+    };
+  };
+
+  users.users = {
+    thomas = {
+      isNormalUser = true;
+      description = "Thomas";
+      extraGroups = [ "networkmanager" "wheel" "docker" ];
+# Also groups "uinput" and "input" for xremap to work with home-manager?
+      packages = with pkgs; [ ];
+      shell = pkgs.fish;
+    };
+  };
+  # Enable automatic login for the user.
+  services.displayManager.autoLogin = {
+    enable = true;
+    user = "thomas";
+  };
+  systemd.services."getty@tty1".enable = false;
+  systemd.services."autovt@tty1".enable = false;
+
+  # Enable the X11 windowing system.
+  services.xserver.enable = true;
+
+  # Enable the GNOME Desktop Environment.
+# xpra, sx, lightdm, gdm
+# xterm, xfce, surf-display, retroarch, plasma5, phosh, pantheon, mate, lxqt, lumina, kodi, gnome, enlightenment, deepin, cinnamon, cde, budgie 
+  # services.xserver.displayManager.lightdm.enable = true;
+  # services.xserver.desktopManager.lumina.enable = true;
+
+  # services.xserver.displayManager.lightdm.enable = true;
+  # services.xserver.desktopManager.budgie.enable = true;
+
+  # services.displayManager.sddm.enable = true;
+  # services.xserver.desktopManager.plasma5.enable = true;
+
+  # Switch aps with alt+tab
+  # services.xserver.displayManager.lightdm.enable = true;
+  # services.xserver.desktopManager.mate.enable = true;
+
+  # Switch aps with alt+tab
+  # services.xserver.displayManager.lightdm.enable = true;
+  # services.xserver.desktopManager.cinnamon.enable = true;
+
+  services.xserver.displayManager.gdm.enable = true;
+  services.xserver.desktopManager.gnome.enable = true;
+  programs.dconf = {
+    enable = true;
+    profiles.user.databases = [
+    {
+      settings = {
+        "org/gnome/desktop/input-sources".xkb-options = [
+          "terminate:ctrl_alt_bksp"
+          "lv3:lalt_switch"
+        ];
+        "org/gnome/desktop/interface".color-scheme = "prefer-dark";
+        "org/gnome/desktop/interface".clock-show-date = true;
+        "org/gnome/desktop/interface".clock-show-weekday = true;
+        "org/gnome/desktop/calendar".show-weekdate = true;
+      };
+    }
+    ];
+  };
+
+  # Remap capslock to esc and ctrl
+  services.interception-tools = 
+  let
+    itools = pkgs.interception-tools;
+    itools-caps = pkgs.interception-tools-plugins.caps2esc;
+  in
+  {
+    enable = true;
+    plugins = [ itools-caps ];
+    udevmonConfig = ''
+      - JOB: "${itools}/bin/intercept -g $DEVNODE | ${itools-caps}/bin/caps2esc -m 1 | ${itools}/bin/uinput -d $DEVNODE"
+        DEVICE:
+          EVENTS:
+           EV_KEY: [KEY_CAPSLOCK, KEY_ESC]
+    '';
+  };
+
+  # Remap right alt to left alt so both can be used for special characters
+  # services.xserver.displayManager.sessionCommands = "sleep 5 && ${pkgs.xorg.xmodmap}/bin/xmodmap -e 'keycode 100 = keycode 65' &";
+
+  services.xserver.xkb = {
+    layout = "se";
+    variant = "mac";
+  };
+  console.keyMap = "sv-latin1";
+
+  # Enable CUPS to print documents.
+  services.printing.enable = true;
+
+  # Enable sound with pipewire.
+  hardware.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+  };
+
+  # Enable touchpad support (enabled default in most desktopManager).
+  # services.xserver.libinput.enable = true;
+
+
+  services.syncthing = {
+    enable = true;
+    user = "thomas";
+    openDefaultPorts = true;
+    dataDir = "/home/thomas";
+  };
+
+  services.espanso = {
+    enable = true;
+    package = pkgs.espanso-wayland;
+  };
+
+
+  # Allow unfree packages
+  nixpkgs.config.allowUnfree = true;
+  virtualisation.docker.enable = true;
+
+  programs = {
+    firefox.enable = true;
+    neovim = {
+      enable = true;
+      defaultEditor = true;
+      vimAlias = true;
+    };
+    fish.enable = true;
+    git.enable = true;
+    tmux.enable = true;
+  };
+
+  environment.systemPackages = with pkgs; [
+    vscode
+    neovim
+    xorg.xmodmap
+    docker-compose
+    kitty
+    obsidian
+    python3Full
+  ];
+
+  # Enable the OpenSSH daemon.
+  services.openssh.enable = true;
+
+  system.stateVersion = "24.11"; # Did you read the comment?
+
+}

nixos/rebuild.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+sudo nixos-rebuild switch --impure --flake ".#"
+# sudo nixos-rebuild boot --impure --flake ".#"

ssh.config

@@ -0,0 +1,8 @@
+Host *
+  AddKeysToAgent yes
+  VisualHostKey yes
+Host github.com
+  User git
+Host gitea
+  HostName git.thomasloven.com
+  User git

test/run_test

@@ -1,9 +1,12 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 cd "$(dirname "$0")/.."
 
-docker build . -t dotfiles -f test/Dockerfile --force-rm
+docker build . -t dotfiles -f test/Dockerfile.devcontainer --force-rm
 
-docker run --rm -it -v $(pwd):/workspaces/test dotfiles zsh
+docker run --rm -it \
+  -v $(pwd):/workspaces/test \
+  -v $(dirname $SSH_AUTH_SOCK):$(dirname $SSH_AUTH_SOCK) -e SSH_AUTH_SOCK=$SSH_AUTH_SOCK\
+  dotfiles zsh
 
-docker rmi dotfiles
+docker rmi dotfiles

tmux/tmux.conf

@@ -0,0 +1,41 @@
+setw -g mode-keys vi
+
+set -g default-terminal tmux-256color
+
+set-option -g base-index 1
+
+set-option -g prefix C-a
+unbind C-b
+bind a send-prefix
+bind-key C-a last-window
+
+unbind %
+bind-key | split-window -h -c "#{pane_current_path}"
+bind-key - split-window -v -c "#{pane_current_path}"
+bind-key / split-window -h -c "#{pane_current_path}"
+
+bind-key c neww -c "#{pane_current_path}"
+
+bind-key h select-pane -L
+bind-key j select-pane -D
+bind-key k select-pane -U
+bind-key l select-pane -R
+
+bind-key k confirm-before -p "Kill window #w? (y/n)" kill-window
+
+set -g mouse on
+
+unbind Space
+bind-key Space next-window
+
+set -sg escape-time 50
+
+
+set -g status-justify centre
+set -g status-bg colour16
+set -g status-left-length 100
+set -g status-fg colour12
+set -g status-left '#[fg=green]#(hostname -s)#[fg=colour12]:#[fg=colour12]#S '
+set -g window-status-format '#[fg=colour12]#I:#W '
+set -g window-status-current-format '#[fg=red]#I:#W#[fg=green]#F #[fg=colour12]'
+

xprofile

@@ -0,0 +1,2 @@
+setxkbmap -option "ctrl:nocaps"
+xcape -e 'Control_L=Escape'