home/features/cli/default.nix

@@ -7,15 +7,10 @@
     ./starship.nix
     ./tmux.nix
   ];
-  programs.zoxide = {
+  programs.autojump = {
     enable = true;
     enableFishIntegration = true;
   };
-  programs.fzf = {
-    enable = true;
-    enableFishIntegration = true;
-    tmux.enableShellIntegration = true;
-  };
   home.packages = with pkgs; [
     bc
     busybox
@@ -26,7 +21,6 @@
     htop
     httpie
     jq
-    neovim
     procs
     progress
     ripgrep

home/features/cli/tmux.nix

@@ -14,48 +14,46 @@ in {
       shortcut = "a";
       keyMode = "vi";
       clock24 = true;
-      plugins = with pkgs.tmuxPlugins; [ sensible yank ];
       extraConfig = ''
+        # Enable mouse mode (tmux 2.1 and above)
+        set -g mouse on
 
-        set-option -sa terminal-overrides ",xterm*:Tc"             
+        # split panes using | and -
-           # Enable mouse mode (tmux 2.1 and above)
+        bind | split-window -h
-           set -g mouse on
+        bind - split-window -v
+        unbind '"'
+        unbind %
 
-           # split panes using | and -
+        # change status bar color
-           bind | split-window -h
+        bind-key r source-file ~/.tmux.conf \; display-message "Konfiguration neu geladen"
-           bind - split-window -v
-           unbind '"'
-           unbind %
 
-           bind-key r source-file ~/.tmux.conf \; display-message "Konfiguration neu geladen"
+        # status bar theme
-
+        set -g status-bg 'colour235'
-           # status bar theme
+        #set -g message-command-fg 'colour222'
-           set -g status-bg 'colour235'
+        set -g status-justify 'centre'
-           #set -g message-command-fg 'colour222'
+        set -g status-left-length '100'
-           set -g status-justify 'centre'
+        set -g status 'on'
-           set -g status-left-length '100'
+        #set -g pane-active-border-fg 'colour154'
-           set -g status 'on'
+        #set -g message-bg 'colour238'
-           #set -g pane-active-border-fg 'colour154'
+        set -g status-right-length '100'
-           #set -g message-bg 'colour238'
+        #set -g status-right-attr 'none'
-           set -g status-right-length '100'
+        #set -g message-fg 'colour222'
-           #set -g status-right-attr 'none'
+        #set -g message-command-bg 'colour238'
-           #set -g message-fg 'colour222'
+        #set -g status-attr 'none'
-           #set -g message-command-bg 'colour238'
+        #set -g status-utf8 'on'
-           #set -g status-attr 'none'
+        #set -g pane-border-fg 'colour238'
-           #set -g status-utf8 'on'
+        #set -g status-left-attr 'none'
-           #set -g pane-border-fg 'colour238'
+        #setw -g window-status-fg 'colour121'
-           #set -g status-left-attr 'none'
+        #setw -g window-status-attr 'none'
-           #setw -g window-status-fg 'colour121'
+        #setw -g window-status-activity-bg 'colour235'
-           #setw -g window-status-attr 'none'
+        #setw -g window-status-activity-attr 'none'
-           #setw -g window-status-activity-bg 'colour235'
+        #setw -g window-status-activity-fg 'colour154'
-           #setw -g window-status-activity-attr 'none'
+        setw -g window-status-separator ' '
-           #setw -g window-status-activity-fg 'colour154'
+        #setw -g window-status-bg 'colour235'
-           setw -g window-status-separator ' '
+        set -g status-left '#[fg=colour232,bg=colour154] #S #[fg=colour154,bg=colour238,nobold,nounderscore,noitalics]#[fg=colour222,bg=colour238] #W #[fg=colour238,bg=colour235,nobold,nounderscore,noitalics]#[fg=colour121,bg=colour235] #(whoami)  #(uptime  | cut -d " " -f 1,2,3) #[fg=colour235,bg=colour235,nobold,nounderscore,noitalics]'
-           #setw -g window-status-bg 'colour235'
+        set -g status-right '#[fg=colour235,bg=colour235,nobold,nounderscore,noitalics]#[fg=colour121,bg=colour235] %r  %a  %Y #[fg=colour238,bg=colour235,nobold,nounderscore,noitalics]#[fg=colour222,bg=colour238] #H #[fg=colour154,bg=colour238,nobold,nounderscore,noitalics]#[fg=colour232,bg=colour154] #(rainbarf --battery --remaining --no-rgb) '
-           set -g status-left '#[fg=colour232,bg=colour154] #S #[fg=colour154,bg=colour238,nobold,nounderscore,noitalics]#[fg=colour222,bg=colour238] #W #[fg=colour238,bg=colour235,nobold,nounderscore,noitalics]#[fg=colour121,bg=colour235] #(whoami)  #(uptime  | cut -d " " -f 1,2,3) #[fg=colour235,bg=colour235,nobold,nounderscore,noitalics]'
+        setw -g window-status-format '#[fg=colour235,bg=colour235,nobold,nounderscore,noitalics]#[default] #I  #W #[fg=colour235,bg=colour235,nobold,nounderscore,noitalics]'
-           set -g status-right '#[fg=colour235,bg=colour235,nobold,nounderscore,noitalics]#[fg=colour121,bg=colour235] %r  %a  %Y #[fg=colour238,bg=colour235,nobold,nounderscore,noitalics]#[fg=colour222,bg=colour238] #H #[fg=colour154,bg=colour238,nobold,nounderscore,noitalics]#[fg=colour232,bg=colour154] #(rainbarf --battery --remaining --no-rgb) '
+        setw -g window-status-current-format '#[fg=colour235,bg=colour238,nobold,nounderscore,noitalics]#[fg=colour222,bg=colour238] #I  #W  #F #[fg=colour238,bg=colour235,nobold,nounderscore,noitalics]'
-           setw -g window-status-format '#[fg=colour235,bg=colour235,nobold,nounderscore,noitalics]#[default] #I  #W #[fg=colour235,bg=colour235,nobold,nounderscore,noitalics]'
-           setw -g window-status-current-format '#[fg=colour235,bg=colour238,nobold,nounderscore,noitalics]#[fg=colour222,bg=colour238] #I  #W  #F #[fg=colour238,bg=colour235,nobold,nounderscore,noitalics]'
       '';
     };
   };

home/features/desktop/default.nix

@@ -3,7 +3,6 @@
   imports = [
     ./crypto.nix
     ./design.nix
-    #./espanso.nix
     ./extrafonts.nix
     ./media.nix
     ./office.nix
@@ -11,6 +10,7 @@
     ./syncthing.nix
     ./waybar.nix
     ./wofi.nix
+    #    ./wofi-pass.nix
   ];
 
   xdg.mimeApps = {
@@ -57,6 +57,7 @@
     fuzzel
     gnome.file-roller
     gnome.nautilus
+    gnome.nautilus
     gnome.seahorse
     gnome.sushi
     gnome.vinagre

home/features/desktop/espanso.nix

@@ -1,9 +1,3 @@
-{ pkgs, outputs, ...}:
-let
-  espanso = outputs.packages.x86_64-linux.espanso;
-in
 {
-  home.packages = [
+  #services.espanso.enable = true;
-    espanso
-  ];
 }

hosts/lkk-nix-1/services/containers/default.nix

@@ -4,7 +4,6 @@
     ./briefkasten.nix
     ./little-link.nix
     ./matomo.nix
-    ./mautic.nix
     ./nextcloud.nix
     ./nginx.nix
     ./wordpress.nix

hosts/lkk-nix-1/services/containers/mautic.nix

@@ -1,16 +0,0 @@
-{ config, outputs, ... }: {
-  virtualisation.oci-containers.containers."mautic" = {
-    image = "docker.io/mautic/mautic:v4-apache";
-    environment = {
-      MAUTIC_DB_HOST = "mysql";
-      MAUTIC_DB_USER = "mautic";
-      MAUTIC_DB_PASSWORD = "mautic";
-      MAUTIC_DB_DBNAME = "mautic";
-      PHP_MEMORY_LIMIT="2048M";
-      MAUTIC_RUN_CRON_JOBS="true";
-    };
-    ports = [ "3008:80" ];
-    volumes = [ "mautic_data:/var/www/html" ];
-    extraOptions = [ "--add-host=mysql:10.88.0.1" "--ip=10.88.0.23" ];
-  };
-}

hosts/lkk-nix-1/services/default.nix

@@ -1,5 +1,6 @@
 {
   imports = [
+    ./adguard.nix
     ./container.nix
     ./gitea.nix
     ./invidious.nix

hosts/lkk-nix-1/services/traefik.nix

@@ -70,7 +70,7 @@
             [{ url = "http://localhost:3006/"; }];
           wireguard.loadBalancer.servers =
             [{ url = "http://localhost:3007/"; }];
-          mautic.loadBalancer.servers = [{ url = "http://localhost:3008/"; }];
+          adguard.loadBalancer.servers = [{ url = "http://localhost:3008/"; }];
           briefkasten.loadBalancer.servers =
             [{ url = "http://localhost:3009/"; }];
           littlelink-lanakk.loadBalancer.servers =
@@ -201,13 +201,14 @@
             middlewares = "auth";
             entrypoints = "websecure";
           };
-          mautic = {
+          adguard = {
-            rule = "Host(`ma.lanakk.com`)";
+            rule = "Host(`ab.lanakk.com`)";
             tls = {
               certResolver = "godaddy";
-              domains = "ma.lanakk.com";
+              domains = "ab.lanakk.com";
             };
-            service = "mautic";
+            service = "adguard";
+            middlewares = "auth";
             entrypoints = "websecure";
           };
           briefkasten = {

pkgs/default.nix

@@ -1,6 +1,4 @@
 { pkgs ? import <nixpkgs> { } }: {
 
   wofi-pass = pkgs.callPackage ./wofi-pass { };
-  espanso = pkgs.callPackage ./espanso { };
-  
 }

pkgs/espanso/default.nix

@@ -1,85 +0,0 @@
-{ lib
-, fetchFromGitHub
-, rustPlatform
-, cargo-make
-, pkg-config
-, extra-cmake-modules
-, dbus
-, libX11
-, libXi
-, libXtst
-, libnotify
-, libxkbcommon
-, openssl
-, xclip
-, xdotool
-, setxkbmap
-, wl-clipboard
-, wxGTK32
-, makeWrapper
-, stdenv
-, waylandSupport ? true,
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "espanso";
-  version = "2.1.8";
-
-  src = fetchFromGitHub {
-    owner = "espanso";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "06wzrjdvssixgd9rnrv4cscbfiyvp5pjpnrih48r0ral3pj2hdg5";
-  };
-
-  cargoSha256 = "sha256-U2ccF7DM16TtX3Kc4w4iNV4WsswHJ0FpO3+sWCL1Li8=";
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-    pkg-config
-    makeWrapper
-    cargo-make
-    wxGTK32
-  ];
-
-  NO_X11 = "true";
-
-  buildInputs = [
-    libXi
-    libXtst
-    openssl
-  ] ++ lib.optionals stdenv.isLinux [
-    dbus
-    libnotify
-    libX11
-    libxkbcommon
-    xclip
-    xdotool
-    wxGTK32
-    wl-clipboard
-  ];
-
-  # Some tests require networking
-  doCheck = false;
-
-  preBuild = lib.optionalString waylandSupport ''
-    export NO_X11=true
-  '';
-
-  postInstall = ''
-    wrapProgram $out/bin/espanso \
-      --prefix PATH : ${lib.makeBinPath [ libnotify xclip wl-clipboard setxkbmap ]}
-  '';
-
-  meta = with lib; {
-    description = "Cross-platform Text Expander written in Rust";
-    homepage = "https://espanso.org";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ kimat thehedgeh0g ];
-    platforms = platforms.unix;
-
-    longDescription = ''
-      Espanso detects when you type a keyword and replaces it while you're typing.
-    '';
-  };
-}