Compare commits

...

2 Commits

Author SHA1 Message Date
m3tam3re 0238155824 +zoxide 2023-04-26 06:43:46 +02:00
m3tam3re 4840a49f58 +mautic 2023-04-24 19:14:11 +02:00
10 changed files with 162 additions and 47 deletions

View File

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

View File

@ -14,46 +14,48 @@ 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"
# Enable mouse mode (tmux 2.1 and above)
set -g mouse on
# split panes using | and -
bind | split-window -h
bind - split-window -v
unbind '"'
unbind %
# split panes using | and -
bind | split-window -h
bind - split-window -v
unbind '"'
unbind %
# change status bar color
bind-key r source-file ~/.tmux.conf \; display-message "Konfiguration neu geladen"
bind-key r source-file ~/.tmux.conf \; display-message "Konfiguration neu geladen"
# status bar theme
set -g status-bg 'colour235'
#set -g message-command-fg 'colour222'
set -g status-justify 'centre'
set -g status-left-length '100'
set -g status 'on'
#set -g pane-active-border-fg 'colour154'
#set -g message-bg 'colour238'
set -g status-right-length '100'
#set -g status-right-attr 'none'
#set -g message-fg 'colour222'
#set -g message-command-bg 'colour238'
#set -g status-attr 'none'
#set -g status-utf8 'on'
#set -g pane-border-fg 'colour238'
#set -g status-left-attr 'none'
#setw -g window-status-fg 'colour121'
#setw -g window-status-attr 'none'
#setw -g window-status-activity-bg 'colour235'
#setw -g window-status-activity-attr 'none'
#setw -g window-status-activity-fg 'colour154'
setw -g window-status-separator ' '
#setw -g window-status-bg 'colour235'
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]'
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-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]'
# status bar theme
set -g status-bg 'colour235'
#set -g message-command-fg 'colour222'
set -g status-justify 'centre'
set -g status-left-length '100'
set -g status 'on'
#set -g pane-active-border-fg 'colour154'
#set -g message-bg 'colour238'
set -g status-right-length '100'
#set -g status-right-attr 'none'
#set -g message-fg 'colour222'
#set -g message-command-bg 'colour238'
#set -g status-attr 'none'
#set -g status-utf8 'on'
#set -g pane-border-fg 'colour238'
#set -g status-left-attr 'none'
#setw -g window-status-fg 'colour121'
#setw -g window-status-attr 'none'
#setw -g window-status-activity-bg 'colour235'
#setw -g window-status-activity-attr 'none'
#setw -g window-status-activity-fg 'colour154'
setw -g window-status-separator ' '
#setw -g window-status-bg 'colour235'
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]'
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-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]'
'';
};
};

View File

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

View File

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

View File

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

View File

@ -0,0 +1,16 @@
{ 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" ];
};
}

View File

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

View File

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

View File

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

85
pkgs/espanso/default.nix Normal file
View File

@ -0,0 +1,85 @@
{ 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.
'';
};
}