diff --git a/.gitignore b/.gitignore
index b314087..d70302d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ hypr/.config/hypr/env.conf
 hypr/.config/hypr/env.sh
 hypr/.config/wpaperd/wallpapers/linked
 *~lock.*#
+lazy-lock.json
diff --git a/.install_skripte/install_basic_pcks.sh b/.install_skripte/install_basic_pcks.sh
index 386e899..ca64fb7 100755
--- a/.install_skripte/install_basic_pcks.sh
+++ b/.install_skripte/install_basic_pcks.sh
@@ -27,6 +27,9 @@ else
 fi
 
 sudo pacman -S --needed \
+    fish \
+    vim \
+    nvim \
 	firefox \
 	nextcloud-client \
 	openssh \
@@ -47,17 +50,9 @@ sudo pacman -S --needed \
 	pipewire-session-manager \
 	qpwgraph \
 	cifs-utils \
-	rbw
+	opencode \
+	rbw \
+	extra/ttf-jetbrains-mono-nerd
 
-
-
-# Setup rbw
-rbw config set email mathias2784@web.de
-rbw register
-
-# Nextcloud
-if [ ! -d "$HOME/nextcloud/local_configs" ]; then
-	echo "Fehler: Benötige $HOME/nextcloud/local_configs" >&2
-	exit 1
-fi
-stow --dir=$HOME/nextcloud/local_configs default
+# fish as standard terminal
+chsh -s /usr/bin/fish
diff --git a/.install_skripte/nextcloud.sh b/.install_skripte/nextcloud.sh
new file mode 100755
index 0000000..0584c01
--- /dev/null
+++ b/.install_skripte/nextcloud.sh
@@ -0,0 +1,23 @@
+
+retry() {
+    local N=$1; shift
+    local t=$2; shift
+    for i in $(seq 1 $N); do
+        "$@" && return 0 || sleep $t
+    done
+    return 1
+}
+
+stow_nextcloud() {
+    # Nextcloud
+    if [ ! -d "$HOME/nextcloud/local_configs" ]; then
+        echo "Fehler: Benötige $HOME/nextcloud/local_configs" >&2
+        exit 1
+    fi
+    stow --dir=$HOME/nextcloud/local_configs --target=$HOME default
+}
+
+nextcloud &
+
+retry 90 10 stow_nextcloud
+
diff --git a/Makefile b/Makefile
index c2e8b01..b4d9162 100644
--- a/Makefile
+++ b/Makefile
@@ -3,14 +3,16 @@
 
 basic:
 	bash .install_skripte/install_basic_pcks.sh
+	stow nvim
+	bash .install_skripte/nextcloud.sh
 hypr: basic
-	stow hypr
 	bash .install_skripte/install_hypr_pcks.sh 
+	stow hypr
 	bash hypr/.config/hypr/scripts/ensure-env.sh
 	bash hypr/.config/hypr/scripts/portal-host-override.sh
 	bash hypr/.config/hypr/scripts/fix_dolphin_file_associations.sh
 kreation: basic
-	stow kreation
 	bash .install_skripte/install_kreation_pcks.sh
+	stow kreation
 bunters-monster: basic hypr kreation
 	.install_skripte/buntes-monster-links.sh 
diff --git a/hypr/.config/hypr/hyprland.conf b/hypr/.config/hypr/hyprland.conf
index c52bfa1..eb6c5f9 100755
--- a/hypr/.config/hypr/hyprland.conf
+++ b/hypr/.config/hypr/hyprland.conf
@@ -411,7 +411,7 @@ windowrule {
 windowrule {
 	name = opacity-kitty-dolphin
 	match:class = .*(kitty|dolphin).*
-	opacity = 0.85 0.55
+	opacity = 0.90 0.80
 }
 
 layerrule = blur on, ignore_alpha 0.30, match:namespace waybar
diff --git a/hypr/.config/kitty/kitty.conf b/hypr/.config/kitty/kitty.conf
index c7594f1..4d4f166 100644
--- a/hypr/.config/kitty/kitty.conf
+++ b/hypr/.config/kitty/kitty.conf
@@ -3,3 +3,10 @@ map ctrl+shift+c copy_to_clipboard
 map ctrl+shift+v paste_from_clipboard
 copy_on_select yes
 
+# Font
+font_family      JetBrainsMono NF
+bold_font        auto
+italic_font      auto
+bold_italic_font auto
+font_size        12.0
+
diff --git a/hypr/.config/waybar/style.css b/hypr/.config/waybar/style.css
index 791dca8..25bf1dc 100755
--- a/hypr/.config/waybar/style.css
+++ b/hypr/.config/waybar/style.css
@@ -2,11 +2,6 @@
    Calm Glass (Hyprland / Waybar) — GTK CSS safe
 -------------------------------------------------- */
 
-# * {
-#     font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif;
-#     font-size: 13px;
-# }
-
 * {
     font-family: "JetBrainsMono Nerd Font", FontAwesome, sans-serif;
     font-size: 13px;
diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua
new file mode 100644
index 0000000..7f0a164
--- /dev/null
+++ b/nvim/.config/nvim/init.lua
@@ -0,0 +1,27 @@
+
+-- Bootstrap lazy.nvim
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+if not vim.loop.fs_stat(lazypath) then
+  vim.fn.system({
+    "git",
+    "clone",
+    "--filter=blob:none",
+    "https://github.com/folke/lazy.nvim.git",
+    "--branch=stable",
+    lazypath,
+  })
+end
+vim.opt.rtp:prepend(lazypath)
+
+
+local opts = {}
+
+require("basic-settings")
+require("lazy").setup("plugins")
+
+
+
+
+
+
+
diff --git a/nvim/.config/nvim/lua/basic-settings.lua b/nvim/.config/nvim/lua/basic-settings.lua
new file mode 100644
index 0000000..1c99267
--- /dev/null
+++ b/nvim/.config/nvim/lua/basic-settings.lua
@@ -0,0 +1,11 @@
+
+-- Basics
+vim.opt.number = true
+vim.opt.relativenumber = true
+vim.opt.tabstop = 4
+vim.opt.shiftwidth = 4
+vim.opt.expandtab = true
+vim.opt.smartindent = true
+vim.g.mapleader = " "
+
+vim.keymap.set("t", "<esc>", [[<C-\><C-n>]], { desc = "Exit terminal mode" })
diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua
new file mode 100644
index 0000000..35d5f70
--- /dev/null
+++ b/nvim/.config/nvim/lua/plugins.lua
@@ -0,0 +1,2 @@
+
+return {}
diff --git a/nvim/.config/nvim/lua/plugins/catppuccin.lua b/nvim/.config/nvim/lua/plugins/catppuccin.lua
new file mode 100644
index 0000000..6c84a92
--- /dev/null
+++ b/nvim/.config/nvim/lua/plugins/catppuccin.lua
@@ -0,0 +1,14 @@
+
+-- catppuccin: color scheme
+return { 
+    "catppuccin/nvim", 
+    lazy = false, 
+    name = "catppuccin", 
+    priority = 1000,
+
+    -- set up
+    config = function()
+        vim.cmd.colorscheme "catppuccin"
+    end
+}
+
diff --git a/nvim/.config/nvim/lua/plugins/lualine.lua b/nvim/.config/nvim/lua/plugins/lualine.lua
new file mode 100644
index 0000000..f683625
--- /dev/null
+++ b/nvim/.config/nvim/lua/plugins/lualine.lua
@@ -0,0 +1,11 @@
+
+return {
+    "nvim-lualine/lualine.nvim",
+    config = function()
+        require('lualine').setup({
+            options = {
+                theme = 'dracula'
+            }
+        })
+    end
+}
diff --git a/nvim/.config/nvim/lua/plugins/neo-tree.lua b/nvim/.config/nvim/lua/plugins/neo-tree.lua
new file mode 100644
index 0000000..466c689
--- /dev/null
+++ b/nvim/.config/nvim/lua/plugins/neo-tree.lua
@@ -0,0 +1,17 @@
+
+-- nvim-neo-tree: Tree file browser
+return {
+    "nvim-neo-tree/neo-tree.nvim",
+    branch = "v3.x",
+    dependencies = {
+        "nvim-lua/plenary.nvim",
+        "MunifTanjim/nui.nvim",
+        "nvim-tree/nvim-web-devicons", -- optional, but recommended
+    },
+    lazy = false, -- neo-tree will lazily load itself
+
+    -- set up
+    config = function()
+        vim.keymap.set('n', '<C-n>', ':Neotree filesystem reveal left<CR>', {})
+    end
+}
diff --git a/nvim/.config/nvim/lua/plugins/telescope.lua b/nvim/.config/nvim/lua/plugins/telescope.lua
new file mode 100644
index 0000000..3527376
--- /dev/null
+++ b/nvim/.config/nvim/lua/plugins/telescope.lua
@@ -0,0 +1,14 @@
+
+-- telescope: fuzzy search
+return { 
+    "nvim-telescope/telescope.nvim", 
+    -- tag = '0.1.5', 
+    dependencies = { "nvim-lua/plenary.nvim" },
+
+    -- set up
+    config = function()
+        local builtin = require("telescope.builtin")
+        vim.keymap.set('n', '<C-p>', builtin.find_files, {})
+        vim.keymap.set('n', '<leader>f', builtin.live_grep, {})
+    end
+}
diff --git a/nvim/.config/nvim/lua/plugins/treesitter.lua b/nvim/.config/nvim/lua/plugins/treesitter.lua
new file mode 100644
index 0000000..78b8048
--- /dev/null
+++ b/nvim/.config/nvim/lua/plugins/treesitter.lua
@@ -0,0 +1,16 @@
+
+-- treesitter: code parser
+return { 
+    "nvim-treesitter/nvim-treesitter", 
+    build = ":TSUpdate",
+
+    -- set up
+    config = function()
+        local config = require("nvim-treesitter.config")
+        config.setup({
+            ensure_installed = {"python", "bash", "lua"},
+            highlight = { enable = true },
+            indent = { enable = true }
+        })
+    end
+}