From 4edb8d9e16785fba19f037f3d10d5bb55dba4259 Mon Sep 17 00:00:00 2001 From: elwrcl Date: Thu, 2 Apr 2026 00:23:57 +0300 Subject: [PATCH] fix: bash,new env --- home/default.nix | 28 ++++++-------- home/dots/zsh/.zshrc | 65 ++++++++++++++++++++------------- home/hypr/hyprland/env.nix | 3 +- home/hypr/hyprland/keybinds.nix | 2 +- home/hypr/hyprland/rules.nix | 33 +++++++---------- 5 files changed, 67 insertions(+), 64 deletions(-) diff --git a/home/default.nix b/home/default.nix index 76e3991..ea7417e 100644 --- a/home/default.nix +++ b/home/default.nix @@ -15,23 +15,16 @@ initContent = builtins.readFile ./dots/zsh/.zshrc; }; - programs.alacritty = { + programs.ghostty = { enable = true; settings = { - window = { - padding = { x = 10; y = 10; }; - opacity = 0.8; - blur = true; - }; - font = { - normal = { family = "JetBrainsMono Nerd Font"; style = "Regular"; }; - bold = { family = "JetBrainsMono Nerd Font"; style = "Bold"; }; - italic = { family = "JetBrainsMono Nerd Font"; style = "Italic"; }; - size = 11.0; - }; - terminal.shell = "zsh"; - }; + font-family = "JetBrainsMono Nerd Font"; + font-size = 11; + background-opacity = 0.8; + window-padding-x = 10; + window-padding-y = 10; }; +}; xdg.configFile = { "fastfetch".source = ./dots/fastfetch; @@ -49,7 +42,10 @@ programs.starship.enable = true; programs.fzf.enable = true; - programs.zoxide.enable = true; + programs.zoxide.enable = true; programs.home-manager.enable = true; fonts.fontconfig.enable = true; -} \ No newline at end of file + + services.mako.enable = false; + services.kdeconnect.enable = true; +} diff --git a/home/dots/zsh/.zshrc b/home/dots/zsh/.zshrc index 01422f7..0012b65 100644 --- a/home/dots/zsh/.zshrc +++ b/home/dots/zsh/.zshrc @@ -1,28 +1,31 @@ -# elarsın muhtesem configi 1.04.2026 +# elarsın muhtesem configi eval "$(starship init zsh)" -eval "$(zoxide init zsh)" +eval "$(zoxide init zsh)" +# FZF export FZF_DEFAULT_OPTS='--height 40% --layout=reverse --border' export FZF_DEFAULT_COMMAND='fd --type f --hidden --follow --exclude .git' -# eza alias +# eza alias ls='eza --icons --group-directories-first' alias ll='eza -lah --icons --group-directories-first' alias la='eza -a --icons --group-directories-first' alias lt='eza --tree --level=2 --icons' -alias cd='z' -# allias extra +# zoxide (cd replacement) +alias cd='z' + +# utils alias cat='bat' alias grep='grep --color=auto' alias df='df -h' alias du='du -h' alias free='free -h' -# safety first +# safety alias cp='cp -i' alias mv='mv -i' -alias rm='trash-put' +alias rm='trash-put' # system alias sysinfo='fastfetch' @@ -37,21 +40,22 @@ alias ....='cd ../../..' alias ~='cd ~' alias -- -='cd -' +# extract helper extract() { - if [ -f $1 ] ; then - case $1 in - *.tar.bz2) tar xjf $1 ;; - *.tar.gz) tar xzf $1 ;; - *.bz2) bunzip2 $1 ;; - *.rar) unrar e $1 ;; - *.gz) gunzip $1 ;; - *.tar) tar xf $1 ;; - *.tbz2) tar xjf $1 ;; - *.tgz) tar xzf $1 ;; - *.zip) unzip $1 ;; - *.Z) uncompress $1 ;; - *.7z) 7z x $1 ;; - *) echo "'$1' can't be extracted" ;; + if [ -f "$1" ]; then + case "$1" in + *.tar.bz2) tar xjf "$1" ;; + *.tar.gz) tar xzf "$1" ;; + *.bz2) bunzip2 "$1" ;; + *.rar) unrar e "$1" ;; + *.gz) gunzip "$1" ;; + *.tar) tar xf "$1" ;; + *.tbz2) tar xjf "$1" ;; + *.tgz) tar xzf "$1" ;; + *.zip) unzip "$1" ;; + *.Z) uncompress "$1" ;; + *.7z) 7z x "$1" ;; + *) echo "'$1' can't be extracted" ;; esac else echo "'$1' is not a valid file" @@ -65,20 +69,29 @@ alias gc='git commit -m' alias gp='git push' alias gl='git log --oneline --graph --decorate' -# history settings ... +# nh shortcuts +alias rebuild='git -C ~/copland add -A && git -C ~/copland commit -m "update" && nh os switch' +alias rebuild-dry='nh os switch --dry' + +# history HISTSIZE=10000 SAVEHIST=10000 HISTFILE=~/.zsh_history setopt HIST_IGNORE_DUPS +setopt HIST_IGNORE_SPACE setopt SHARE_HISTORY -# completion ... +# completion autoload -Uz compinit compinit zstyle ':completion:*' menu select +zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}' setopt AUTO_CD -# mesa settings -export MESA_SHADER_CACHE_MAX_SIZE=2G +# mesa (ghostty launcher fix + shader cache) export MESA_GL_VERSION_OVERRIDE=4.6 -export MESA_GLSL_VERSION_OVERRIDE=460 \ No newline at end of file +export MESA_GLSL_VERSION_OVERRIDE=460 +export MESA_SHADER_CACHE_MAX_SIZE=2G +export MESA_SHADER_CACHE_DIR=/tmp/mesa_shader_cache +export PATH="$HOME/.local/bin:$PATH" + diff --git a/home/hypr/hyprland/env.nix b/home/hypr/hyprland/env.nix index ec08184..0a09aff 100644 --- a/home/hypr/hyprland/env.nix +++ b/home/hypr/hyprland/env.nix @@ -11,7 +11,8 @@ "GDK_BACKEND,wayland,x11" "QT_QPA_PLATFORM,wayland;xcb" "ELECTRON_OZONE_PLATFORM_HINT,auto" - "TERMINAL,alacritty" + "TERMINAL,ghostty" + "GDK_DISABLE,gles-api,vulkan" ]; }; } diff --git a/home/hypr/hyprland/keybinds.nix b/home/hypr/hyprland/keybinds.nix index 9d060b2..c5e2bcc 100644 --- a/home/hypr/hyprland/keybinds.nix +++ b/home/hypr/hyprland/keybinds.nix @@ -28,7 +28,7 @@ in { "$mainMod SHIFT, C, exec, ${ipc} plugin:music panel" # music recognition # ── App Launchers ──────────────────────────────────────────────────── - "$mainMod, Return, exec, kitty" + "$mainMod, Return, exec, ghostty" "$mainMod, W, exec, zen" "$mainMod, E, exec, dolphin" "$mainMod, Z, exec, zed" diff --git a/home/hypr/hyprland/rules.nix b/home/hypr/hyprland/rules.nix index 0b1f9f5..f7e8232 100644 --- a/home/hypr/hyprland/rules.nix +++ b/home/hypr/hyprland/rules.nix @@ -3,26 +3,19 @@ { wayland.windowManager.hyprland.settings = { windowrule = [ - "float on, match:title ^(Open File)(.*)$" - "center on, match:title ^(Open File)(.*)$" - "float on, match:title ^(Save As)(.*)$" - "center on, match:title ^(Save As)(.*)$" - "float on, match:title ^(File Upload)(.*)$" - "center on, match:title ^(File Upload)(.*)$" - "float on, match:class ^(pavucontrol)$" - "center on, match:class ^(pavucontrol)$" - "size 45% 45%, match:class ^(pavucontrol)$" - "float on, match:title ^([Pp]icture[-\\s]?[Ii]n[-\\s]?[Pp]icture)(.*)$" - "pin on, match:title ^([Pp]icture[-\\s]?[Ii]n[-\\s]?[Pp]icture)(.*)$" - "keepaspectratio on, match:title ^([Pp]icture[-\\s]?[Ii]n[-\\s]?[Pp]icture)(.*)$" - "immediate on, match:class ^(steam_app).*" - ]; - - layerrule = [ - "noanim, noctalia-shell:regionSelector" - "blur, noctalia-background-.*" - "ignorealpha 0.5, noctalia-background-.*" - "blurpopups, noctalia-background-.*" + "float on, match:title ^(Open File)(.*)$" + "center on, match:title ^(Open File)(.*)$" + "float on, match:title ^(Save As)(.*)$" + "center on, match:title ^(Save As)(.*)$" + "float on, match:title ^(File Upload)(.*)$" + "center on, match:title ^(File Upload)(.*)$" + "float on, match:class ^(pavucontrol)$" + "center on, match:class ^(pavucontrol)$" + "size 45% 45%, match:class ^(pavucontrol)$" + "float on, match:title ^([Pp]icture[-\\s]?[Ii]n[-\\s]?[Pp]icture)(.*)$" + "pin on, match:title ^([Pp]icture[-\\s]?[Ii]n[-\\s]?[Pp]icture)(.*)$" + "keep_aspect_ratio on, match:title ^([Pp]icture[-\\s]?[Ii]n[-\\s]?[Pp]icture)(.*)$" + "immediate on, match:class ^(steam_app).*" ]; }; }