use capslock as esc

not needed anymore. Switched from Arch

.config/alacritty/alacritty.toml

@@ -1,8 +1,15 @@
+ipc_socket = false
+live_config_reload = false
+
+[cursor]
+unfocused_hollow = false
 [cursor.style]
 shape = "Beam"
 
-[selection]
-save_to_clipboard = false
+[mouse]
+hide_when_typing = true
 
 [window]
-opacity = 0.9
+opacity = 0.7
+decorations = "None" 
+blur = true

.config/git/config

@@ -15,6 +15,11 @@
   log = delta
   reflog = delta
   show = delta
+  blame = delta
+
+[delta]
+  side-by-side = true
+  dark = true
 
 [interactive]
   diffFilter = delta --color-only

.config/hypr/hyprland.conf

@@ -7,7 +7,7 @@ input {
   kb_layout = us
   kb_variant =
   kb_model =
-  kb_options = compose:ralt
+  kb_options = compose:ralt,caps:escape
   kb_rules =
 
   numlock_by_default = true
@@ -73,7 +73,7 @@ dwindle {
 }
 
 master {
-  new_is_master = true
+  new_status=master
 }
 
 gestures {
@@ -86,7 +86,7 @@ binds {
 }
 
 device {
-  name = zly-zelotes-game-mouse 
+  name = moji-1k-nrf-receiver 
   sensitivity = -1
 }
 

.config/lazygit/config.yml

@@ -0,0 +1,6 @@
+gui:
+  nerdFontsVersion: "3"
+git:
+  paging:
+    colorArg: always
+    pager: delta --dark --paging=never --line-numbers --hyperlinks --hyperlinks-file-link-format="lazygit-edit://{path}:{line}"

.config/metapkg/PKGBUILD

@@ -1,74 +0,0 @@
-# Run: makepkg -s
-pkgname=metapkg
-pkgver=1.0
-pkgrel=1
-pkgdesc="Meta package for installing all my packages. Does not include AUR packages or hardware specific packages"
-arch=('any')
-url="https://git.kapelle.org/niklas/dotfiles-remastered"
-
-depends=(
-    # Desktop apps
-    alacritty
-    code
-    firefox
-    imv
-    mpv
-    pavucontrol
-    thunar
-    thunderbird
-
-    # DE
-    greetd-tuigreet
-    hyprland
-    hyprpaper
-    libnotify
-    pipewire-alsa
-    pipewire-jack
-    pipewire-pulse
-    wireplumber
-    gvfs
-    playerctl
-    xdg-desktop-portal-hyprland
-    wl-clipboard
-
-    # CLI
-    bat
-    duf
-    entr
-    exa
-    fzf
-    git-delta
-    htop
-    jq
-    neovim
-    pkgfile
-    pulsemixer
-    rsync
-    sl
-    trash-cli
-    zsh-autosuggestions
-    zsh-completions
-    zsh-syntax-highlighting
-    zsh-theme-powerlevel10k
-
-
-    # system
-    sudo
-    zip
-    unzip
-    arch-wiki-docs
-    docker
-    flatpak
-    gamemode
-    git
-    networkmanager
-    ntfs-3g
-    ttf-hack
-    ttf-hack-nerd
-    ttf-dejavu
-    xdg-user-dirs
-)
-
-optdepends=()
-
-

.config/metapkg/README.md

@@ -1,61 +0,0 @@
-# AUR packages
-
-- code-features
-- code-marketplace
-- swaync
-- rofi-lbonn-wayland-git
-- waybar-hyperland-git
-- oh-my-zsh-git
-- yay
-- game-devices-udev
-
-# Fresh install 
-
-- pacman S git sudo neovim
-- useradd -m -G wheel -s /bin/bash niklas
-- passwd niklas
-- EDITOR=nvim visudo /etc/sudoers
-- git clone --bare https://git.kapelle.org/niklas/dotfiles-remastered.git ~/.local/share/dotfiles-remastered
-- git --git-dir=$HOME/.local/share/dotfiles-remastered --work-tree=$HOME checkout
-- cd .config/metapkg
-- makepkg -si
-- systemctl enable greetd
-
-`/etc/greetd/config.toml`
-```toml
-[terminal]
-# The VT to run the greeter on. Can be "next", "current" or a number
-# designating the VT.
-vt = 1
-
-# The default session, also known as the greeter.
-[default_session]
-
-# `agreety` is the bundled agetty/login-lookalike. You can replace `/bin/sh`
-# with whatever you want started, such as `sway`.
-command = "tuigreet --time --user-menu -r"
-
-# The user to run the command as. The privileges this user must have depends
-# on the greeter. A graphical greeter may for example require the user to be
-# in the `video` group.
-user = "greeter"
-
-[initial_session]
-command = "Hyprland"
-user = "niklas"
-
-```
-
-- git clone https://aur.archlinux.org/yay.git
-- cd yay 
-- makepkg -si
-
-- install aur packages
-- change shell of user chsh -s /bin/zsh
-- Install chaedrc git clone https://github.com/NvChad/NvChad ~/.config/nvim --depth 1 && nvim
-- Link nvchad config ln -sf ../../../chadtc.lua chadrc.lua in ~/.config/nvim/lua/custom/chadrc.lua
-
-Firefox plugins:
-- ublock
-- bitwarden
-

.config/metapkg/pkg/metapkg/.PKGINFO

@@ -1,59 +0,0 @@
-# Generated by makepkg 6.0.2
-# using fakeroot version 1.32.1
-pkgname = metapkg
-pkgbase = metapkg
-pkgver = 1.0-1
-pkgdesc = Meta package for installing all my packages. Does not include AUR packages or hardware specific packages
-url = https://git.kapelle.org/niklas/dotfiles-remastered
-builddate = 1691505281
-packager = Unknown Packager
-size = 0
-arch = any
-depend = alacritty
-depend = code
-depend = firefox
-depend = gimp
-depend = imv
-depend = mpv
-depend = pavucontrol
-depend = thunar
-depend = thunderbird
-depend = greetd-tuigreet
-depend = hyprland
-depend = hyprpaper
-depend = libnotify
-depend = pipewire-alsa
-depend = pipewire-jack
-depend = pipewire-pulse
-depend = gvfs
-depend = playerctl
-depend = xdg-desktop-portal-hyprland
-depend = bat
-depend = duf
-depend = entr
-depend = exa
-depend = fzf
-depend = git-delta
-depend = htop
-depend = jq
-depend = neovim
-depend = pkgfile
-depend = pulsemixer
-depend = rsync
-depend = sl
-depend = trash-cli
-depend = zsh-autosuggestions
-depend = zsh-completions
-depend = zsh-syntax-highlighting
-depend = zsh-theme-powerlevel10k
-depend = zip
-depend = unzip
-depend = arch-wiki-docs
-depend = docker
-depend = flatpak
-depend = gamemode
-depend = git
-depend = networkmanager
-depend = ntfs-3g
-depend = ttf-hack
-depend = ttf-hack-nerd

.config/oh-my-posh/config.toml

@@ -0,0 +1,146 @@
+#:schema https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json
+
+version = 2
+final_space = true
+disable_notice = true
+
+[palette]
+status_success = "#43f716"
+status_failure = "#f72916"
+white = "#FFFFFF"
+path = "green"
+git_tooltip = "red"
+go_tooltip = "green"
+node_tooltip = "green"
+docker = "blue"
+kube = "yellow"
+
+[[blocks]]
+alignment = "left"
+type = "prompt"
+
+  # SSH
+  [[blocks.segments]]
+  type = "session"
+  template = "{{ if .SSHSession}}󰢹 {{ end }}"
+
+  # Path
+  [[blocks.segments]]
+  type = "path"
+  background = "p:path"
+  foreground = "p:white"
+  style = "diamond"
+  leading_diamond = ""
+  trailing_diamond = ""
+  template = " {{ .Path }} "
+  [blocks.segments.properties]
+    style = "full"
+    home_icon = "~"
+
+[[blocks]]
+alignment = "right"
+type = "prompt"
+
+  # Docker context
+  [[blocks.segments]]
+  type = "docker"
+  style = "diamond"
+  foreground = "p:white"
+  background = "p:docker"
+  leading_diamond = ""
+  trailing_diamond = ""
+  template = " {{ .Context }}"
+
+  # kubectl context
+  [[blocks.segments]]
+  type = "kubectl"
+  style = "diamond"
+  foreground = "p:white"
+  background = "p:kube"
+  leading_diamond = ""
+  trailing_diamond = ""
+  template = "󱃾 {{.Context}}{{if .Namespace}} :: {{.Namespace}}{{end}} "
+ 
+[[blocks]]
+alignment = "left"
+type = "prompt"
+newline = true
+
+  # Newline prompt
+  [[blocks.segments]]
+  type = "status"
+  style = "plain"
+  foreground = "p:status_success"
+  foreground_templates = [
+    "{{ if .Error }}p:status_failure{{ end }}",
+    "{{ if not .Error}}p:status_success{{ end }}"
+  ]
+  template = "❯"
+  [blocks.segments.properties]
+  always_enabled = true
+
+  
+[transient_prompt]
+foreground = "p:status_success"
+template = "❯ "
+
+# Git
+[[tooltips]]
+type = "git"
+tips = [ "git", "g" ]
+style = "diamond"
+foreground = "p:white"
+background = "p:git_tooltip"
+leading_diamond = ""
+trailing_diamond = ""
+template = "{{ url .HEAD .UpstreamURL }}{{ if .UpstreamIcon }} {{.UpstreamIcon}} {{ end }}{{ if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Staging.Changed }}  {{ .Staging.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Working.Changed }}  {{ .Working.String }}{{ end }}"
+  [tooltips.properties]
+  fetch_status = true
+  fetch_upstream_icon = true
+  branch_icon = " "
+  branch_identical_icon = " "
+  branch_ahead_icon = "󰳡 "
+  branch_behind_icon = "󰳛 "
+  branch_gone_icon = " "
+  [tooltips.properties.upstream_icons]
+  "git.kapelle.org" = " "
+
+# Go
+[[tooltips]]
+type = "go"
+tips = [ "go" ]
+style = "diamond"
+foreground = "p:white"
+background = "p:go_tooltip"
+leading_diamond = ""
+trailing_diamond = ""
+template = " {{ .Major }}.{{ .Minor }}"
+[tooltips.properties]
+cache_version = true
+
+# Rust
+[[tooltips]]
+type = "rust"
+tips = [ "rustc", "cargo", "rustup" ]
+style = "diamond"
+foreground = "p:white"
+background = "p:go_tooltip"
+leading_diamond = ""
+trailing_diamond = ""
+template = " {{ .Full }}"
+[tooltips.properties]
+cache_version = true
+
+# Node
+[[tooltips]]
+type = "node"
+tips = [ "node", "npm" ]
+style = "diamond"
+foreground = "p:white"
+background = "p:node_tooltip"
+leading_diamond = ""
+trailing_diamond = ""
+template = "󰎙 {{ .Full }}"
+[tooltips.properties]
+cache_version = true
+

.config/rofi/powermenu.sh

@@ -2,7 +2,7 @@
 
 ROFI_CONFIG_DIR="$XDG_CONFIG_HOME/rofi/"
 
-UPTIME="`uptime -p | sed -e 's/up //g'`"
+UPTIME="$(uptime | awk -F'( |,|:)+' '{print $6,$7",",$8,"hours,",$9,"minutes."}')"
 
 SHUTDOWN=""
 RESTART=""
@@ -37,8 +37,8 @@ case ${selection} in
       fi
     ;;
   $WINDOWS)
-      # TODO 
-      # grub-set-default 
+      boot-windows
+      systemctl reboot
     ;;
 esac
 

.local/bin/macho

@@ -1 +0,0 @@
-../share/scripts/macho.sh

.local/share/scripts/save-screenshot.sh

@@ -1,20 +0,0 @@
-#!/usr/bin/env sh
-
-# Make a screenshots and save it in ~/pictures/screenshots
-
-set -e
-
-SCRIPT=$(readlink -f "$0")
-SCRIPTPATH=$(dirname "$SCRIPT")
-
-SCREENSHOT_DIR="$HOME/pictures/screenshots"
-
-screenshotFile=$($SCRIPTPATH/take-screenshot.sh)
-
-mkdir -p "$SCREENSHOT_DIR"
-
-mv "$screenshotFile" "$SCREENSHOT_DIR"
-rm -rf "$(dirname $screenshotFile)"
-
-printf "%s\n" "$SCREENSHOT_DIR/$(basename $screenshotFile)"
-

.local/share/scripts/select-bg.sh

@@ -1,10 +0,0 @@
-#!/usr/bin/env sh
-# required packages:
-# - sxiv
-
-SELECT=$(sxiv -N "floatme" -t -o ~/pictures/wallpapers )
-SCRIPT=$(readlink -f "$0")
-SCRIPTPATH=$(dirname "$SCRIPT")
-
-$SCRIPTPATH/set-bg.sh "$SELECT"
-

.local/share/scripts/set-bg.sh

@@ -1,18 +0,0 @@
-#!/usr/bin/env sh
-
-set -e
-
-SCRIPT=$(readlink -f "$0")
-SCRIPTPATH=$(dirname "$SCRIPT")
-
-[ -z "$1" ] && exit 0
-
-LAST_BG_LOCATION="$XDG_CACHE_HOME/last-bg"
-
-#echo "$(realpath $1)" > $LAST_BG_LOCATION
-ln -sf $1 $LAST_BG_LOCATION
-
-swww img $1
-
-$SCRIPTPATH/wal.sh "$1"
-

.local/share/scripts/take-screenshot.sh

@@ -1,16 +0,0 @@
-#!/usr/bin/env sh
-
-# Make a selection of the screen and take a screenshot. Save it to tmp and print its path.
-
-set -e
-
-TMPDIR=$(mktemp -d)
-
-GRIM_DEFAULT_DIR="$TMPDIR" grim -g "$(slurp)"
-
-filename="$(date +"%d-%m-%y-%H-%M-%Z").png"
-
-mv $TMPDIR/* "$TMPDIR/$filename"
-
-printf "%s\n" "$TMPDIR/$filename"
-

.local/share/scripts/wal.sh

@@ -1,15 +0,0 @@
-#!/usr/bin/env sh
-
-set -e
-
-IMAGE="$1"
-
-if [ -z $IMAGE ]; then
-  echo "Provide a image"
-  exit 1
-fi
-
-wal -i "$IMAGE" -n 
-
-killall -SIGUSR2 waybar
-

.profile

@@ -20,7 +20,6 @@ export XDG_PICTURES_DIR="$HOME/pictures"
 
 export GOPATH="$XDG_DATA_HOME/go"
 export VSCODE_EXTENSIONS="$XDG_DATA_HOME/vscode/extensions"
-export WINEPREFIX="$XDG_DATA_HOME/wine"
 export RUSTUP_HOME="$XDG_DATA_HOME/rustup"
 #export CARGO_INSTALL_ROOT="$XDG_DATA_HOME/cargo"
 export CARGO_HOME="$XDG_DATA_HOME/cargo"
@@ -31,7 +30,6 @@ export AUDACITY_PATH="$XDG_DATA_HOME/audacity"
 export CUDA_CACHE_PATH="$XDG_CACHE_HOME/nv"
 export DOCKER_CONFIG="$XDG_CONFIG_HOME/docker"
 export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc
-export CUDA_CACHE_PATH="$XDG_CACHE_HOME"/nv
 #export GNUPGHOME="$XDG_DATA_HOME"/gnupg
 export GRADLE_USER_HOME="$XDG_DATA_HOME"/gradle
 export NUGET_PACKAGES="$XDG_CACHE_HOME"/NuGetPackages

.zshrc

@@ -17,27 +17,31 @@ export PATH=$HOME/.local/bin:$XDG_DATA_HOME/npm_global/bin:$XDG_DATA_HOME/cargo/
 # NIXOS specific stuff
 source /etc/zshrc
 
-# P10K stuff
-if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
-  source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
-fi
-[[ ! -f ~/.cache/p10k.zsh ]] || source ~/.cache/p10k.zsh
-
 # wal subshell for terminal colors
 if test -f $XDG_CACHE_HOME/wal/sequences; then
  (cat $XDG_CACHE_HOME/wal/sequences &)
 fi
 
+# Start oh-my-posh 
+eval "$(oh-my-posh init zsh --config $XDG_CONFIG_HOME/oh-my-posh/config.toml)"
+
 # Variables
 export MANPAGER="bat -l man -p"
 
 # ZSH percent fix
 export PROMPT_EOL_MARK=""
+HISTFILE="$XDG_CACHE_HOME/zsh_history"
+HISTSIZE=10000
+SAVEHIST=10000
+setopt APPEND_HISTORY
 
 # FZF 
 export FZF_DEFAULT_COMMAND="fd --type file --color=always"
 export FZF_DEFAULT_OPTS="--ansi"
 
+# FZF history
+source <(fzf --zsh)
+
 # Aliases
 alias vim="nvim"
 alias please='sudo '
@@ -61,4 +65,5 @@ alias df="duf"
 alias du="dust"
 alias nom="npm"
 alias code="codium"
+alias lg="lazygit"