Improve configs
fixes, replace exa with eza, update home-manager version
This commit is contained in:
parent
de0663730c
commit
ccb5e6660e
13 changed files with 80 additions and 89 deletions
|
@ -35,3 +35,4 @@ fi
|
||||||
#fi
|
#fi
|
||||||
|
|
||||||
printf "\n\n\n\n=== DONE ============================================================\n"
|
printf "\n\n\n\n=== DONE ============================================================\n"
|
||||||
|
read -r
|
||||||
|
|
|
@ -30,7 +30,7 @@ alias du='du -h'
|
||||||
|
|
||||||
alias free='free -h'
|
alias free='free -h'
|
||||||
|
|
||||||
alias git-apply-clip='clip -out | base64 -d | git apply -'
|
alias git-apply-clip='wl-paste | base64 -d | git apply -'
|
||||||
alias grep='grep --color=auto'
|
alias grep='grep --color=auto'
|
||||||
alias grep-highlight='grep -e "^" -e'
|
alias grep-highlight='grep -e "^" -e'
|
||||||
|
|
||||||
|
@ -76,7 +76,7 @@ alias xdebug='XDEBUG_CONFIG="remote_host=127.0.0.1 remote_port=9003"'
|
||||||
|
|
||||||
[ -x "$(command -v bat)" ] && alias cat='bat -pp'
|
[ -x "$(command -v bat)" ] && alias cat='bat -pp'
|
||||||
|
|
||||||
[ -x "$(command -v exa)" ] && alias ls='exa -lhF --git --icons --color=always --color-scale --time-style=long-iso --group-directories-first'
|
[ -x "$(command -v eza)" ] && alias ls='eza -lhF --git --icons --color=always --color-scale --time-style=long-iso --group-directories-first'
|
||||||
|
|
||||||
[ -x "$(command -v moar)" ] && alias less='moar'
|
[ -x "$(command -v moar)" ] && alias less='moar'
|
||||||
|
|
||||||
|
|
|
@ -45,7 +45,7 @@ export TIME_STYLE="long-iso"
|
||||||
export VIMINIT="if has('nvim') | source $XDG_CONFIG_HOME/nvim/init.lua | else | source $XDG_CONFIG_HOME/vim/vimrc | endif"
|
export VIMINIT="if has('nvim') | source $XDG_CONFIG_HOME/nvim/init.lua | else | source $XDG_CONFIG_HOME/vim/vimrc | endif"
|
||||||
|
|
||||||
|
|
||||||
for profile in "$HOME/.config/environment.d/"*; do
|
for profile in "$XDG_CONFIG_HOME/environment.d/"*; do
|
||||||
# shellcheck disable=1090
|
# shellcheck disable=1090
|
||||||
test -r "$profile" && . "$profile"
|
test -r "$profile" && . "$profile"
|
||||||
done
|
done
|
||||||
|
|
|
@ -11,5 +11,5 @@ export PATH="$HOME/.local/bin:$HOME/.bin:$PATH"
|
||||||
export PATH="$GOPATH/bin:$HOME/.cargo/bin:$PATH"
|
export PATH="$GOPATH/bin:$HOME/.cargo/bin:$PATH"
|
||||||
# add tool paths
|
# add tool paths
|
||||||
export PATH="$HOME/.local/share/JetBrains/Toolbox/scripts:$PATH"
|
export PATH="$HOME/.local/share/JetBrains/Toolbox/scripts:$PATH"
|
||||||
|
# add nix paths
|
||||||
|
export PATH="/home/serguzim/.nix-profile/bin:/nix/var/nix/profiles/default/bin:$PATH"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
direnv # tool to load custom environments
|
direnv # tool to load custom environments
|
||||||
docker-credential-helpers
|
docker-credential-helpers
|
||||||
dogdns # dns client
|
dogdns # dns client
|
||||||
exa # ls-alternative
|
eza # ls-alternative
|
||||||
faas-cli # cli for openfaas
|
faas-cli # cli for openfaas
|
||||||
fzf # fuzzy finder
|
fzf # fuzzy finder
|
||||||
git # git
|
git # git
|
||||||
|
@ -20,14 +20,12 @@
|
||||||
lsof # who uses that drive/directory
|
lsof # who uses that drive/directory
|
||||||
openssh # ssh client and server
|
openssh # ssh client and server
|
||||||
pass # password-store
|
pass # password-store
|
||||||
playerctl # control media players
|
|
||||||
p7zip # tool to extract 7z archives
|
p7zip # tool to extract 7z archives
|
||||||
rclone # tool for remote storages
|
rclone # tool for remote storages
|
||||||
restic # backup tool
|
restic # backup tool
|
||||||
ripgrep # grep-alternative
|
ripgrep # grep-alternative
|
||||||
rmtrash # rm wrapper to use trash
|
rmtrash # rm wrapper to use trash
|
||||||
shellcheck # tool for shell-syntax
|
shellcheck # tool for shell-syntax
|
||||||
(spotifyd.override { withMpris = true; }) # spotify-daemon
|
|
||||||
tokei # project-language statistics
|
tokei # project-language statistics
|
||||||
trash-cli # trash utils
|
trash-cli # trash utils
|
||||||
unzip # unzip
|
unzip # unzip
|
||||||
|
@ -46,7 +44,7 @@
|
||||||
# You can update Home Manager without changing this value. See
|
# You can update Home Manager without changing this value. See
|
||||||
# the Home Manager release notes for a list of state version
|
# the Home Manager release notes for a list of state version
|
||||||
# changes in each release.
|
# changes in each release.
|
||||||
home.stateVersion = "22.11";
|
home.stateVersion = "23.05";
|
||||||
|
|
||||||
# Let Home Manager install and manage itself.
|
# Let Home Manager install and manage itself.
|
||||||
programs.home-manager.enable = true;
|
programs.home-manager.enable = true;
|
||||||
|
|
|
@ -1,16 +1,19 @@
|
||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
|
imports = [
|
||||||
|
./fonts.nix
|
||||||
|
];
|
||||||
|
|
||||||
# Packages that should be installed to the user profile.
|
# Packages that should be installed to the user profile.
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
#alacritty # terminal emulator
|
#alacritty # terminal emulator
|
||||||
bemenu # tool to display menus
|
bemenu # tool to display menus
|
||||||
ckb-next # corsair hardware control
|
|
||||||
dunst # notification-daemon
|
dunst # notification-daemon
|
||||||
feh # image viewer and wallpaper-tool
|
feh # image viewer and wallpaper-tool
|
||||||
|
firefox # browser
|
||||||
flameshot # screenshot tool
|
flameshot # screenshot tool
|
||||||
gspell # spell highlighting for gtk applications
|
gspell # spell highlighting for gtk applications
|
||||||
helvum # Pipewire GUI
|
|
||||||
j4-dmenu-desktop # collects .desktop files for a menu
|
j4-dmenu-desktop # collects .desktop files for a menu
|
||||||
keepassxc # password manager
|
keepassxc # password manager
|
||||||
libsForQt5.kdeconnect-kde # tool to connect a phone to the computer
|
libsForQt5.kdeconnect-kde # tool to connect a phone to the computer
|
||||||
|
@ -18,11 +21,10 @@
|
||||||
#python310Packages.adblock # pylib for adblocking in qutebrowser
|
#python310Packages.adblock # pylib for adblocking in qutebrowser
|
||||||
#python310Packages.pynacl # pylib for qutebrowser-keepassxc support
|
#python310Packages.pynacl # pylib for qutebrowser-keepassxc support
|
||||||
#(qutebrowser.override { enableWideVine = true; }) # vim-like browser
|
#(qutebrowser.override { enableWideVine = true; }) # vim-like browser
|
||||||
solaar # Logitech tool
|
(ungoogled-chromium.override { enableWideVine = true; }) # browser
|
||||||
#vagrant # tool for automated virtual machines
|
#vagrant # tool for automated virtual machines
|
||||||
#virtualbox # tool for virtual machines
|
#virtualbox # tool for virtual machines
|
||||||
xfce.thunar # file manager
|
xfce.thunar # file manager
|
||||||
xfce.tumbler # thumbnail tool
|
xfce.tumbler # thumbnail tool
|
||||||
xorg.xsetroot # tool to set x background stuff
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,11 +1,10 @@
|
||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
# Packages that should be installed to the user profile.
|
# Packages that should be installed to the user profile.
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
nodejs # needed for lsp
|
nodejs # needed for lsp
|
||||||
fzf # fuzzy finder
|
fzf # fuzzy finder
|
||||||
#neovim # alternative to vim
|
|
||||||
];
|
];
|
||||||
|
|
||||||
programs.neovim = {
|
programs.neovim = {
|
||||||
|
|
|
@ -6,12 +6,17 @@
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
./common.nix
|
./common.nix
|
||||||
|
./audio.nix
|
||||||
./graphical.nix
|
./graphical.nix
|
||||||
./nvim.nix
|
./nvim.nix
|
||||||
./wayland.nix
|
./wayland.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
rustdesk # remote desktop tool
|
ckb-next # corsair hardware control
|
||||||
|
#rustdesk # remote desktop tool # disabled for nightly from aur
|
||||||
|
solaar # Logitech tool
|
||||||
|
syncthing # file syncing tool
|
||||||
|
#flatpak
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,5 +8,8 @@
|
||||||
slurp # needed for screenshots
|
slurp # needed for screenshots
|
||||||
swww # wallpaper daemon
|
swww # wallpaper daemon
|
||||||
wl-clipboard # clipboard manager (tools)
|
wl-clipboard # clipboard manager (tools)
|
||||||
|
#xdg-desktop-portal
|
||||||
|
#xdg-desktop-portal-hyprland
|
||||||
|
#xdg-desktop-portal-gtk
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,5 +12,6 @@
|
||||||
unclutter-xfixes # hides the cursor
|
unclutter-xfixes # hides the cursor
|
||||||
xclip # clipboard CLI for X
|
xclip # clipboard CLI for X
|
||||||
xcompmgr # compositor for X
|
xcompmgr # compositor for X
|
||||||
|
xorg.xsetroot # tool to set x background stuff
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,7 +28,7 @@ windowrulev2 = monitor $mon2, class:(steam), title:^(Friends List)
|
||||||
windowrulev2 = float, class:(xdg-desktop-portal-gtk)
|
windowrulev2 = float, class:(xdg-desktop-portal-gtk)
|
||||||
|
|
||||||
windowrulev2 = monitor $mon2, class:(thunderbird), title:^$ # where monitor silent rule?
|
windowrulev2 = monitor $mon2, class:(thunderbird), title:^$ # where monitor silent rule?
|
||||||
windowrulev2 = nofocus, class:(thunderbird), title:^$
|
windowrulev2 = noinitialfocus, class:(thunderbird), title:^$
|
||||||
windowrulev2 = float, class:(thunderbird), title:^$
|
windowrulev2 = float, class:(thunderbird), title:^$
|
||||||
windowrulev2 = move 5 5, class:(thunderbird), title:^$
|
windowrulev2 = move 5 5, class:(thunderbird), title:^$
|
||||||
|
|
||||||
|
|
|
@ -31,14 +31,21 @@ general {
|
||||||
layout = dwindle
|
layout = dwindle
|
||||||
}
|
}
|
||||||
|
|
||||||
|
misc {
|
||||||
|
disable_hyprland_logo = true
|
||||||
|
}
|
||||||
|
|
||||||
decoration {
|
decoration {
|
||||||
# See https://wiki.hyprland.org/Configuring/Variables/ for more
|
# See https://wiki.hyprland.org/Configuring/Variables/ for more
|
||||||
|
|
||||||
rounding = 3
|
rounding = 3
|
||||||
blur = yes
|
|
||||||
blur_size = 3
|
blur {
|
||||||
blur_passes = 1
|
enabled = true
|
||||||
blur_new_optimizations = true
|
size = 3
|
||||||
|
passes = 1
|
||||||
|
new_optimizations = true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
animations {
|
animations {
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
"spacing": 6,
|
"spacing": 6,
|
||||||
"mode": "dock",
|
"mode": "dock",
|
||||||
"modules-left": [
|
"modules-left": [
|
||||||
"wlr/workspaces"
|
"hyprland/workspaces"
|
||||||
],
|
],
|
||||||
"modules-center": [
|
"modules-center": [
|
||||||
],
|
],
|
||||||
|
@ -19,38 +19,12 @@
|
||||||
"clock",
|
"clock",
|
||||||
"tray"
|
"tray"
|
||||||
],
|
],
|
||||||
"wlr/workspaces": {
|
"hyprland/workspaces": {
|
||||||
"on-click": "activate",
|
"on-click": "activate",
|
||||||
"all-outputs": true,
|
"all-outputs": true,
|
||||||
"sort-by-number": true,
|
"sort-by-number": true,
|
||||||
"persistent_workspaces": {
|
"persistent_workspaces": {
|
||||||
"01": [],
|
"*": 10
|
||||||
"02": [],
|
|
||||||
"03": [],
|
|
||||||
"04": [],
|
|
||||||
"05": [],
|
|
||||||
"06": [],
|
|
||||||
"07": [],
|
|
||||||
"08": [],
|
|
||||||
"09": [],
|
|
||||||
"10": []
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"sway/workspaces": {
|
|
||||||
"disable-scroll": true,
|
|
||||||
"all-outputs": true,
|
|
||||||
"format": "{name}",
|
|
||||||
"persistent_workspaces": {
|
|
||||||
"01": [],
|
|
||||||
"02": [],
|
|
||||||
"03": [],
|
|
||||||
"04": [],
|
|
||||||
"05": [],
|
|
||||||
"06": [],
|
|
||||||
"07": [],
|
|
||||||
"08": [],
|
|
||||||
"09": [],
|
|
||||||
"10": []
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"hyprland/window": {
|
"hyprland/window": {
|
||||||
|
@ -86,6 +60,7 @@
|
||||||
},
|
},
|
||||||
"custom/weather": {
|
"custom/weather": {
|
||||||
"exec": "~/.config/waybar/custom/weather",
|
"exec": "~/.config/waybar/custom/weather",
|
||||||
|
"on-click": "xdg-open 'https://www.wetter.com/deutschland/oranienburg/DE0007983.html'",
|
||||||
"return-type": "json",
|
"return-type": "json",
|
||||||
"format": "{}",
|
"format": "{}",
|
||||||
"tooltip": true,
|
"tooltip": true,
|
||||||
|
|
Loading…
Reference in a new issue