.bin/autoinstall

@@ -29,9 +29,6 @@ _autoinstall_base () {
 		"https://raw.githubusercontent.com/qw3rtman/git-fire/master/git-fire" \
 		"$HOME/.local/bin/git-fire"
 
-	hm_config="$HOME/.config/nixpkgs"
-	ln -sf "$hm_config/$(cat /proc/sys/kernel/hostname)-$(whoami).nix" "$hm_config/home.nix"
-
 	return 0
 }
 

.bin/start-audio

@@ -48,8 +48,8 @@ start_audio_pipewire () {
     pw-link 'default-sink:monitor_FL' 'alsa_output.pci-0000_00_1f.3.analog-stereo:playback_FL'
     pw-link 'default-sink:monitor_FR' 'alsa_output.pci-0000_00_1f.3.analog-stereo:playback_FR'
 
-	#pw-link 'output.UMC_Amp:capture_MONO' 'default-sink:playback_FL'
+	pw-link 'output.UMC_Amp:capture_MONO' 'default-sink:playback_FL'
-	#pw-link 'output.UMC_Amp:capture_MONO' 'default-sink:playback_FR'
+	pw-link 'output.UMC_Amp:capture_MONO' 'default-sink:playback_FR'
 }
 
 

.config/aliasrc

@@ -7,7 +7,7 @@ alias :wq='exit'
 alias aliases='$EDITOR ~/.config/aliasrc && . ~/.config/aliasrc'
 alias aliases.local='$EDITOR ~/.config/aliasrc.local && . ~/.config/aliasrc'
 # shellcheck disable=2154
-alias arch-deps2deps='set -a; source PKGBUILD; set +a; paru -S --asdeps --noconfirm $depends && paru -Ui --rebuild'
+alias arch-deps2deps='set -a; source PKGBUILD; set +a; sudo pacman -S --asdeps --noconfirm $depends && makepkg -fsi --noconfirm'
 alias artisan='./artisan'
 
 alias bspwm-default='echo "default" > /tmp/bspwm_mode; bspc wm -r'
@@ -41,7 +41,7 @@ alias keepass-unlock='(pkill keepassxc; pass keepass | head -n 1 | keepassxc --p
 
 alias less='less -FS -x4'
 alias ls='ls -lFh --color=auto'
-alias lsblk='lsblk -o +LABEL,FSTYPE'
+alias lsblk='lsblk -o +PARTLABEL,LABEL,FSTYPE,UUID'
 
 alias make='make -j5'
 alias mkdir='mkdir -pv'
@@ -50,7 +50,6 @@ alias mv='mv -iv'
 alias nixos-rebuild-tinker='sudo nixos-rebuild switch -p tinkering --no-build-nix'
 
 alias pacman-autoremove='sudo pacman -Rns $(pacman -Qtdq)'
-alias pacman-autoremove-opts='sudo pacman -Rns $(pacman -Qttdq)'
 alias ps-grep='ps aux | grep -v grep | grep'
 
 alias qutebrowser-kiosk='qutebrowser -B $XDG_DATA_HOME/qutebrowser-kiosk -C $XDG_CONFIG_HOME/qutebrowser/config-kiosk.py'

.config/environment

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 set -a
-. "/etc/profile"
 . "$HOME/.config/user-dirs.dirs"
 . "$XDG_CONFIG_HOME/locale.conf"
 set +a
@@ -23,6 +22,8 @@ export BEMENU_OPTS="--tb '#6272a4'\
  --scf '#ff79c6'\
  --list 25 --ignorecase -p ''"
 
+export CM_LAUNCHER='rofi'
+
 export DOCKER_BUILDKIT=1
 export DRONE_SERVER='https://ci.serguzim.me'
 
@@ -36,7 +37,7 @@ export HOSTNAME="$_hostname"
 
 export KUBECONFIG="$HOME/.kube/config"
 
-#export LOCALE_ARCHIVE="/usr/lib/locale/locale-archive"
+export LOCALE_ARCHIVE="/usr/lib/locale/locale-archive"
 
 export MAILCAPS="$XDG_CONFIG_HOME/mailcap/mailcaprc"
 _makeflags=$(grep -c ^processor /proc/cpuinfo)
@@ -81,9 +82,13 @@ export ZSH="$ZDOTDIR/oh-my-zsh"
 [ -x "$(command -v moar)" ] && export MANPAGER="moar"
 [ -x "$(command -v moar)" ] && export PAGER="moar"
 
-[ -x "$(command -v home-manager)" ] \
+if [ -x "$(command -v home-manager)" ] && [ -x "$(command -v nix)" ]
-	&& [ -x "$(command -v nix)" ] \
+then
-	&& [ -f "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh" ] \
+	[ -f "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh" ] \
-	&& . "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh"
+		&& . "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh"
+
+	[ -d "$HOME/.nix-profile/share" ] \
+		&& export XDG_DATA_DIRS="$HOME/.nix-profile/share:$XDG_DATA_DIRS"
+fi
 
 [ -f "$HOME/.config/environment.local" ] && . "$HOME/.config/environment.local"

.config/nixpkgs/common.nix

@@ -1,48 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  # Packages that should be installed to the user profile.
-  home.packages = with pkgs; [
-    bat # cat-alternative
-    direnv # tool to load custom environments
-    docker-credential-helpers
-    exa # ls-alternative
-    faas-cli # cli for openfaas
-    git # git
-    gitflow # tool for git workflow
-    git-lfs # git support for large files
-    jq # tool for JSON
-    moar # moar is less
-    nix-direnv # allow better nix and direnv integration
-    openssh # ssh client and server
-    pass # password-store
-    playerctl # control media players
-    rclone # tool for remote storages
-    restic # backup tool
-    ripgrep # grep-alternative
-    trash-cli # rm wrapper to use trash-bin
-    shellcheck # tool for shell-syntax
-    spotifyd # spotify-daemon
-    tokei # project-language statistics
-    unzip # unzip
-    vimHugeX # vim with clipboard support
-    yq # tool for YAML
-    yt-dlp # tool to download videos from the internet
-    zip # zip
-  ];
-
-  # This value determines the Home Manager release that your
-  # configuration is compatible with. This helps avoid breakage
-  # when a new Home Manager release introduces backwards
-  # incompatible changes.
-  #
-  # You can update Home Manager without changing this value. See
-  # the Home Manager release notes for a list of state version
-  # changes in each release.
-  home.stateVersion = "22.11";
-
-  # Let Home Manager install and manage itself.
-  programs.home-manager.enable = true;
-
-  targets.genericLinux.enable = true;
-}

.config/nixpkgs/graphical.nix

@@ -1,26 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  # Packages that should be installed to the user profile.
-  home.packages = with pkgs; [
-    #alacritty # terminal emulator
-    bc # calculator (bsp-layout dependency)
-    bemenu # tool to display menus
-    bsp-layout # automatic layouts for bpswm
-    ckb-next # corsair hardware control
-    conky # shows stuff on the wallpaper
-    dunst # notification-daemon
-    feh # image viewer and wallpaper-tool
-    flameshot # screenshot tool
-    helvum # Pipewire GUI
-    j4-dmenu-desktop # collects .desktop files for a menu
-    parcellite # clipboard-manager
-    pavucontrol # Pulseaudio GUI
-    polybar # desktop bar
-    solaar # Logitech tool
-    sxhkd # hotkey daemon
-    #vagrant # tool for automated virtual machines
-    #virtualbox # tool for virtual machines
-    xclip # clipboard CLI for X
-  ];
-}

.config/nixpkgs/home.nix

@@ -1 +0,0 @@
-/home/tobias/.config/nixpkgs/portalo-tobias.nix

.config/zsh/.zshrc

@@ -123,5 +123,4 @@ source source-remote-file \
 	"https://raw.githubusercontent.com/dracula/zsh-syntax-highlighting/master/zsh-syntax-highlighting.sh" \
 	"dracula-syntax-highlighting"
 
-[ -x "$(command -v direnv)" ] && eval "$(direnv hook zsh)"
 [ -x "$(command -v starship)" ] && eval "$(starship init zsh)"

.local/share/qutebrowser/userscripts/qute-keepassxc

@@ -96,7 +96,7 @@ def parse_args():
                         help='GPG key to encrypt KeepassXC auth key with')
     parser.add_argument('--insecure', action='store_true',
                         help="Do not encrypt auth key")
-    parser.add_argument('--dmenu-invocation', '-d', default='bemenu',
+    parser.add_argument('--dmenu-invocation', '-d', default='rofi -dmenu',
                         help='Invocation used to execute a dmenu-provider')
     parser.add_argument('--only-username', action='store_true',
                         help='Only insert username')

.profile

@@ -1 +1,2 @@
+. "/etc/profile"
 . "$HOME/.config/environment"

.xprofile

@@ -8,8 +8,6 @@ setxkbmap de
 setxkbmap -option caps:none
 setxkbmap -option compose:menu
 
-xrdb "$HOME/.Xresources"
-
 _autostart()
 {
 	### wait for audio

.zprofile

@@ -1,3 +1,4 @@
+. /etc/profile
 . "$HOME/.config/environment"
 . "$HOME/.config/aliasrc"
 
@@ -8,6 +9,6 @@ then
     gpgconf --launch gpg-agent >/dev/null
 fi
 
-if [ -z "${DISPLAY}" ] && [ "${XDG_VTNR}" -le 3 ]; then
+if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then
     exec $AUTOSTART_DISPLAY
 fi