Please forgive me

.config/btop/btop.conf

@@ -1,4 +1,4 @@
-#? Config file for btop v. 1.2.13
+#? Config file for btop v. 1.3.2
 
 #* Name of a btop++/bpytop/bashtop formatted ".theme" file, "Default" and "TTY" for builtin themes.
 #* Themes should be placed in "../share/btop/themes" relative to binary or "$HOME/.config/btop/themes"
@@ -37,6 +37,9 @@ graph_symbol = "braille"
 # Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty".
 graph_symbol_cpu = "default"
 
+# Graph symbol to use for graphs in gpu box, "default", "braille", "block" or "tty".
+graph_symbol_gpu = "default"
+
 # Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty".
 graph_symbol_mem = "default"
 
@@ -46,7 +49,7 @@ graph_symbol_net = "default"
 # Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty".
 graph_symbol_proc = "default"
 
-#* Manually set which boxes to show. Available values are "cpu mem net proc", separate values with whitespace.
+#* Manually set which boxes to show. Available values are "cpu mem net proc" and "gpu0" through "gpu5", separate values with whitespace.
 shown_boxes = "cpu mem net proc"
 
 #* Update time in milliseconds, recommended 2000 ms or above for better sample times for graphs.
@@ -86,6 +89,9 @@ proc_left = False
 #* (Linux) Filter processes tied to the Linux kernel(similar behavior to htop).
 proc_filter_kernel = False
 
+#* In tree-view, always accumulate child process resources in the parent process.
+proc_aggregate = False
+
 #* Sets the CPU stat shown in upper half of the CPU graph, "total" is always available.
 #* Select from a list of detected attributes from the options menu.
 cpu_graph_upper = "total"
@@ -94,6 +100,9 @@ cpu_graph_upper = "total"
 #* Select from a list of detected attributes from the options menu.
 cpu_graph_lower = "total"
 
+#* If gpu info should be shown in the cpu box. Available values = "Auto", "On" and "Off".
+show_gpu_info = "Auto"
+
 #* Toggles if the lower CPU graph should be inverted.
 cpu_invert_lower = True
 
@@ -207,6 +216,33 @@ show_battery = True
 #* Which battery to use if multiple are present. "Auto" for auto detection.
 selected_battery = "Auto"
 
+#* Show power stats of battery next to charge indicator.
+show_battery_watts = True
+
 #* Set loglevel for "~/.config/btop/btop.log" levels are: "ERROR" "WARNING" "INFO" "DEBUG".
 #* The level set includes all lower levels, i.e. "DEBUG" will show all logging info.
-log_level = "WARNING"
+log_level = "WARNING"
+
+#* Measure PCIe throughput on NVIDIA cards, may impact performance on certain cards.
+nvml_measure_pcie_speeds = True
+
+#* Horizontally mirror the GPU graph.
+gpu_mirror_graph = True
+
+#* Custom gpu0 model name, empty string to disable.
+custom_gpu_name0 = ""
+
+#* Custom gpu1 model name, empty string to disable.
+custom_gpu_name1 = ""
+
+#* Custom gpu2 model name, empty string to disable.
+custom_gpu_name2 = ""
+
+#* Custom gpu3 model name, empty string to disable.
+custom_gpu_name3 = ""
+
+#* Custom gpu4 model name, empty string to disable.
+custom_gpu_name4 = ""
+
+#* Custom gpu5 model name, empty string to disable.
+custom_gpu_name5 = ""

.config/nvim/lazy-lock.json

@@ -1,46 +1,46 @@
 {
-  "LazyVim": { "branch": "main", "commit": "25abbf546d564dc484cf903804661ba12de45507" },
-  "SchemaStore.nvim": { "branch": "main", "commit": "fb58187b76d8e086f08686b872b50f52eac57818" },
-  "blink-cmp-copilot": { "branch": "main", "commit": "439cff78780c033aa23cf061d7315314b347e3c1" },
-  "blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" },
+  "LazyVim": { "branch": "main", "commit": "fab399c90d10b5000dd19489a40d856fe3312edc" },
+  "SchemaStore.nvim": { "branch": "main", "commit": "667eaa5da8f66f1dd97c905a12dd1eb544a2d259" },
+  "blink-copilot": { "branch": "main", "commit": "5d35fd07fcc148be20442da1bdd2407e03263d7d" },
+  "blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" },
   "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
-  "catppuccin": { "branch": "main", "commit": "30fa4d122d9b22ad8b2e0ab1b533c8c26c4dde86" },
+  "catppuccin": { "branch": "main", "commit": "af58927c55c9f3272c940ff02b3cee94a1249f26" },
   "cmake-tools.nvim": { "branch": "master", "commit": "88e07c6bff838a5bda2f461e9c1122b79ff0829f" },
-  "conform.nvim": { "branch": "master", "commit": "b4aab989db276993ea5dcb78872be494ce546521" },
-  "copilot.lua": { "branch": "master", "commit": "81d289a8ce5d4ee1dea9b1c8ee4ac376b2e27a5f" },
+  "conform.nvim": { "branch": "master", "commit": "fbcb4fa7f34bfea9be702ffff481a8e336ebf6ed" },
+  "copilot.lua": { "branch": "master", "commit": "92e08cd472653beaece28ad9c8508a851a613358" },
   "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
-  "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
+  "flash.nvim": { "branch": "main", "commit": "2febce67ff9cf7638d2569d17c41af02c38401eb" },
   "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
-  "gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" },
-  "grug-far.nvim": { "branch": "main", "commit": "c5b629399c0f2e436c00df381e44852a13b7313a" },
+  "gitsigns.nvim": { "branch": "main", "commit": "1ee5c1fd068c81f9dd06483e639c2aa4587dc197" },
+  "grug-far.nvim": { "branch": "main", "commit": "3e72397465f774b01aa38e4fe8e6eecf23d766d9" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
-  "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
-  "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
-  "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
-  "mini.ai": { "branch": "main", "commit": "45a26d032d8703f280c69c2ed9fb4e1bfc8f24f9" },
-  "mini.icons": { "branch": "main", "commit": "f9a177c11daa7829389b7b6eaaec8b8a5c47052d" },
-  "mini.pairs": { "branch": "main", "commit": "6e1cc569130f25b2c6fa16d8b21b31ddb1420a4a" },
-  "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" },
+  "lazydev.nvim": { "branch": "main", "commit": "e28ce52fc7ff79fcb76f0e79ee6fb6182fca90b9" },
+  "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "6bdb14f230de0904229ec367b410fb817e59b072" },
+  "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" },
+  "mini.ai": { "branch": "main", "commit": "11c57180bc9084089206e211ac7aa598bedc9673" },
+  "mini.icons": { "branch": "main", "commit": "284798619aed9f4c1ac1b9417b9a5e3b4b85ef3a" },
+  "mini.pairs": { "branch": "main", "commit": "b9aada8c0e59f2b938e98fbf4eae0799eba96ad9" },
+  "noice.nvim": { "branch": "main", "commit": "38c702be0d8fea81527ee6a73e1e834e72481193" },
   "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
-  "nvim-jdtls": { "branch": "master", "commit": "3b9df08323d832f2980b8425ea6812debc8082b7" },
-  "nvim-lint": { "branch": "master", "commit": "f126af5345c7472e9a0cdbe1d1a29209be72c4c4" },
-  "nvim-lspconfig": { "branch": "master", "commit": "c8b90ae5cbe21d547b342b05c9266dcb8ca0de8f" },
-  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
-  "persistence.nvim": { "branch": "main", "commit": "166a79a55bfa7a4db3e26fc031b4d92af71d0b51" },
+  "nvim-jdtls": { "branch": "master", "commit": "380ac148f989e1291aac002dc959ecc68c5243d0" },
+  "nvim-lint": { "branch": "master", "commit": "9da1fb942dd0668d5182f9c8dee801b9c190e2bb" },
+  "nvim-lspconfig": { "branch": "master", "commit": "ac98db2f9f06a56498ec890a96928774eae412c3" },
+  "nvim-treesitter": { "branch": "main", "commit": "63fac0a576bc78a4790cbcce24646cca860bc8c1" },
+  "nvim-treesitter-textobjects": { "branch": "main", "commit": "1b2d85d3de6114c4bcea89ffb2cd1ce9e3a19931" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" },
+  "persistence.nvim": { "branch": "main", "commit": "51eef57272742b773468949f6bd0503ec3f83874" },
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
-  "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
+  "snacks.nvim": { "branch": "main", "commit": "454ba02d69347c0735044f159b95d2495fc79a73" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
   "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
-  "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
-  "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" },
-  "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
-  "ts-comments.nvim": { "branch": "main", "commit": "1bd9d0ba1d8b336c3db50692ffd0955fe1bb9f0c" },
-  "venv-selector.nvim": { "branch": "regexp", "commit": "d2326e7433fdeb10f7d0d1237c18b91b353f9f8b" },
+  "todo-comments.nvim": { "branch": "main", "commit": "19d461ddd543e938eb22505fb03fa878800270b6" },
+  "tokyonight.nvim": { "branch": "main", "commit": "d14614cbfc63b6037bfccd48bb982d2ad2003352" },
+  "trouble.nvim": { "branch": "main", "commit": "c098362fe603d3922095e7db595961e020bdf2d0" },
+  "ts-comments.nvim": { "branch": "main", "commit": "217ab9cc137fceb6659b53790bd25e608219abe1" },
+  "venv-selector.nvim": { "branch": "main", "commit": "7fff64b5b1455207b9a9fd2ae8697cf9ac0b2a2d" },
   "vim-dadbod": { "branch": "master", "commit": "e95afed23712f969f83b4857a24cf9d59114c2e6" },
   "vim-dadbod-completion": { "branch": "master", "commit": "a8dac0b3cf6132c80dc9b18bef36d4cf7a9e1fe6" },
-  "vim-dadbod-ui": { "branch": "master", "commit": "e8b53c0f3aa6e6127ac2a2d2071d9aade6c6e373" },
-  "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
+  "vim-dadbod-ui": { "branch": "master", "commit": "5a83ee1fdafcdedb03222bb46f7cfd70646025ee" },
+  "which-key.nvim": { "branch": "main", "commit": "b4177e3eaf15fe5eb8357ebac2286d488be1ed00" }
 }

.config/nvim/lazyvim.json

@@ -17,7 +17,7 @@
   ],
   "install_version": 8,
   "news": {
-    "NEWS.md": "10960"
+    "NEWS.md": "11866"
   },
   "version": 8
 }

.config/ssh/vps

@@ -1,17 +1,17 @@
 Host vps-2
-    HostName vps-2.simonis.lol
+    HostName 100.110.93.101
     User root
     IdentityFile ~/.ssh/keys/prv
     StrictHostKeyChecking no
   
 Host vps-3
-    HostName vps-3.simonis.lol
+    HostName 100.87.243.105
     User root
     IdentityFile ~/.ssh/keys/prv
     StrictHostKeyChecking no
   
 Host vps-4
-    HostName vps-4.simonis.lol
+    HostName 100.118.175.51
     User root
     IdentityFile ~/.ssh/keys/prv
     StrictHostKeyChecking no
@@ -22,14 +22,8 @@ Host vps-5
     IdentityFile ~/.ssh/keys/prv
     StrictHostKeyChecking no
 
-Host vps-6
-    HostName vps-6.simonis.lol
-    User root
-    IdentityFile ~/.ssh/keys/prv
-    StrictHostKeyChecking no
-
 Host vps-7
-    HostName vps-7.simonis.lol
+    HostName 100.105.18.52
     User root
     IdentityFile ~/.ssh/keys/prv
     StrictHostKeyChecking no

.gitignore_global

@@ -1 +0,0 @@
-.aliases

.gitmodules

@@ -13,6 +13,3 @@
 [submodule ".config/tmux/plugins/tmux"]
 	path = .config/tmux/plugins/tmux
 	url = https://github.com/catppuccin/tmux
-[submodule "tools/diralias"]
-	path = tools/diralias
-	url = https://git.simonis.lol/projects/diralias.git

.stow-local-ignore

@@ -3,9 +3,6 @@
 .gitmodules
 .zshenv.template
 README.md
-.gitconfig.d
 alias.d
 scripts
 gitconfig.d
-ssh-gen
-tools

.zshrc

@@ -86,7 +86,8 @@ HIST_STAMPS="dd.mm.yyyy"
 # Custom plugins may be added to $ZSH_CUSTOM/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(zsh-autosuggestions aliases alias-finder bun composer debian sudo tmux ssh nvm autoenv)
+export PATH="$PATH:/home/linuxbrew/.linuxbrew/bin"
+plugins=(zsh-autosuggestions aliases alias-finder bun composer debian sudo tmux ssh nvm autoenv qrcode thefuck)
 
 source $ZSH/oh-my-zsh.sh
 
@@ -150,3 +151,7 @@ eval "$(zoxide init zsh)"
 
 eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
 source '/home/linuxbrew/.linuxbrew/opt/autoenv/activate.sh'
+
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion

README.md

@@ -1,18 +1,66 @@
-# My motherfucking dotfiles
+# Dotfiles
+
+My personal collection of configuration files (dotfiles) for a consistent and productive development environment on Debian-based Linux systems.
+
+This setup is managed using `stow` for symlinking and includes configurations for Zsh, Tmux, Neovim, and more.
+
+## Prerequisites
+
+Before you begin, ensure you have the following installed:
+*   `git`: For cloning the repository.
+*   `curl`: Used by the installation script to fetch dependencies.
+*   A Debian-based Linux distribution (e.g., Ubuntu, Debian) is assumed for the installation script (`apt`).
 
 ## Installation
-```bash
-# Clone the Repository
-git clone https://git.simonis.lol/csimonis/dotfiles.git ~/dotfiles
 
-cd ~/dotfiles
+The installation is automated via a single script.
 
-# Installs system dependencies and does some other stuff
-./install
-# Creates Symlinks and installs zsh themes and plugins
-./setup
-```
+1.  **Clone the repository:**
 
-## Contributing
+    ```bash
+    git clone --recursive https://git.simonis.lol/csimonis/dotfiles.git ~/.dotfiles
+    ```
+    *Note: Using `--recursive` is important as it will clone all the necessary git submodules for plugins (like for zsh and tmux).*
 
-### If you want to contribute for whatever fucking reasion go fuck yourself
+2.  **Run the installation script:**
+
+    ```bash
+    cd ~/.dotfiles
+    ./scripts/install
+    ```
+
+The `install` script will:
+-   Update system packages.
+-   Install essential command-line tools like `zsh`, `stow`, `tmux`, `eza`, `bat`, and `btop`.
+-   Install [Oh My Zsh](https://ohmyzsh.com/).
+-   Initialize the git submodules.
+-   Create a local `.zshenv` file for environment variables.
+-   Set up the git configuration.
+-   Use `stow` to create symlinks for all the configurations in your home directory.
+
+## What's Included?
+
+This repository configures the following tools:
+
+-   **Shell:** Zsh, configured via `.zshrc`, with [Oh My Zsh](https://ohmyzsh.com/).
+    -   **Prompt:** [Powerlevel10k](https://github.com/romkatv/powerlevel10k) theme.
+    -   **Plugins:** `zsh-autosuggestions`, `zsh-syntax-highlighting`.
+-   **Terminal Multiplexer:** [Tmux](https://github.com/tmux/tmux/wiki), with plugins managed by [TPM](https://github.com/tmux-plugins/tpm).
+-   **Editor:** [Neovim](https://neovim.io/) with a [LazyVim](https://www.lazyvim.org/) based setup. Plugins are managed via `lazy.nvim`.
+-   **Git:** Global git configuration and ignores.
+-   **Other Tools:** Configuration for `atuin`, `btop`, `neofetch`, and more.
+
+## Structure
+
+-   **`stow`:** The configurations are structured to be symlinked by [GNU Stow](https://www.gnu.org/software/stow/). The `stow .` command in the `setup` script handles the symlinking of all packages in the root of this repository.
+-   **Submodules:** Git submodules are used to manage third-party plugins for tools like Zsh and Tmux to keep them self-contained and version-controlled.
+-   **`scripts/`:** Contains scripts for installation, setup, and post-merge git hooks.
+
+## Post-Installation
+
+-   **Tmux Plugins:** Start `tmux` and press `prefix + I` (that's a capital I) to fetch the plugins defined in `.tmux.conf`.
+-   **Neovim Plugins:** The first time you open `nvim`, [Lazy.nvim](https://github.com/folke/lazy.nvim) will automatically install all the configured plugins.
+
+## License
+
+This project is licensed under the MIT License.

atuin-key.txt

@@ -0,0 +1 @@
+fick deine mutter jan

dnsmasq.conf

@@ -0,0 +1,12 @@
+# Public
+server=1.1.1.1
+server=8.8.8.8
+
+# Neusta
+server=/intern.neusta.de/172.31.64.4
+server=/intern.neusta.de/172.31.64.5
+server=/neusta.de/172.31.64.4
+server=/neusta.de/172.31.64.5
+
+listen-address=127.0.0.1
+bind-interfaces

gitconfig.d/base.gitconfig

@@ -4,7 +4,6 @@
 	autoSetupRemote = true
 [core]
 	autocrlf = false
-	excludesfile = ~/.gitignore_global
 [pull]
 	rebase = true
 [alias]

gitconfig.d/var/example.gitconfig

@@ -2,13 +2,5 @@
 	email = user@mail
 	name = John Doe
 	signingkey = 1234
-[credential]
-	helper = store
-[push]
-	autoSetupRemote = true
-[core]
-	autocrlf = true
-[pull]
-	rebase = true
 [commit]
 	gpgsign = true

scripts/install

@@ -29,6 +29,10 @@ $APT_CMD install -yqq \
     zoxide \
     atuin
 
+/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+
+brew install nvim thefuck tmux tmuxinator 
+
 if [ ! -d "$HOME/.oh-my-zsh" ]; then
   echo
   echo "[+] Installing Oh My Zsh..."
@@ -44,6 +48,6 @@ if [ -f "./.git/hooks/post-merge" ]; then
   rm "./.git/hooks/post-merge"
 fi
 
-ln -s ./scripts/post-merge .git/hooks/post-merge
+ln -s ../../scripts/post-merge .git/hooks/post-merge
 
 ./scripts/setup