Improve configs

fixes, replace exa with eza, update home-manager version
This commit is contained in:
Tobias Reisinger 2023-09-10 21:41:00 +02:00
parent de0663730c
commit ccb5e6660e
Signed by: serguzim
GPG key ID: 13AD60C237A28DFE
13 changed files with 80 additions and 89 deletions

View file

@ -35,3 +35,4 @@ fi
#fi
printf "\n\n\n\n=== DONE ============================================================\n"
read -r

View file

@ -30,7 +30,7 @@ alias du='du -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-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 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'

View file

@ -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"
for profile in "$HOME/.config/environment.d/"*; do
for profile in "$XDG_CONFIG_HOME/environment.d/"*; do
# shellcheck disable=1090
test -r "$profile" && . "$profile"
done

View file

@ -11,5 +11,5 @@ export PATH="$HOME/.local/bin:$HOME/.bin:$PATH"
export PATH="$GOPATH/bin:$HOME/.cargo/bin:$PATH"
# add tool paths
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"

View file

@ -7,7 +7,7 @@
direnv # tool to load custom environments
docker-credential-helpers
dogdns # dns client
exa # ls-alternative
eza # ls-alternative
faas-cli # cli for openfaas
fzf # fuzzy finder
git # git
@ -20,14 +20,12 @@
lsof # who uses that drive/directory
openssh # ssh client and server
pass # password-store
playerctl # control media players
p7zip # tool to extract 7z archives
rclone # tool for remote storages
restic # backup tool
ripgrep # grep-alternative
rmtrash # rm wrapper to use trash
shellcheck # tool for shell-syntax
(spotifyd.override { withMpris = true; }) # spotify-daemon
tokei # project-language statistics
trash-cli # trash utils
unzip # unzip
@ -46,7 +44,7 @@
# 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";
home.stateVersion = "23.05";
# Let Home Manager install and manage itself.
programs.home-manager.enable = true;

View file

@ -1,28 +1,30 @@
{ config, pkgs, ... }:
{
# Packages that should be installed to the user profile.
home.packages = with pkgs; [
#alacritty # terminal emulator
bemenu # tool to display menus
ckb-next # corsair hardware control
dunst # notification-daemon
feh # image viewer and wallpaper-tool
flameshot # screenshot tool
gspell # spell highlighting for gtk applications
helvum # Pipewire GUI
j4-dmenu-desktop # collects .desktop files for a menu
keepassxc # password manager
libsForQt5.kdeconnect-kde # tool to connect a phone to the computer
pavucontrol # Pulseaudio GUI
#python310Packages.adblock # pylib for adblocking in qutebrowser
#python310Packages.pynacl # pylib for qutebrowser-keepassxc support
#(qutebrowser.override { enableWideVine = true; }) # vim-like browser
solaar # Logitech tool
#vagrant # tool for automated virtual machines
#virtualbox # tool for virtual machines
xfce.thunar # file manager
xfce.tumbler # thumbnail tool
xorg.xsetroot # tool to set x background stuff
];
imports = [
./fonts.nix
];
# Packages that should be installed to the user profile.
home.packages = with pkgs; [
#alacritty # terminal emulator
bemenu # tool to display menus
dunst # notification-daemon
feh # image viewer and wallpaper-tool
firefox # browser
flameshot # screenshot tool
gspell # spell highlighting for gtk applications
j4-dmenu-desktop # collects .desktop files for a menu
keepassxc # password manager
libsForQt5.kdeconnect-kde # tool to connect a phone to the computer
pavucontrol # Pulseaudio GUI
#python310Packages.adblock # pylib for adblocking in qutebrowser
#python310Packages.pynacl # pylib for qutebrowser-keepassxc support
#(qutebrowser.override { enableWideVine = true; }) # vim-like browser
(ungoogled-chromium.override { enableWideVine = true; }) # browser
#vagrant # tool for automated virtual machines
#virtualbox # tool for virtual machines
xfce.thunar # file manager
xfce.tumbler # thumbnail tool
];
}

View file

@ -1,16 +1,15 @@
{ config, pkgs, ... }:
{
# Packages that should be installed to the user profile.
home.packages = with pkgs; [
nodejs # needed for lsp
fzf # fuzzy finder
#neovim # alternative to vim
];
# Packages that should be installed to the user profile.
home.packages = with pkgs; [
nodejs # needed for lsp
fzf # fuzzy finder
];
programs.neovim = {
enable = true;
extraLuaConfig = ''
programs.neovim = {
enable = true;
extraLuaConfig = ''
require("set")
require("remap")
require("plugins")
@ -20,6 +19,6 @@ local status, ts_install = pcall(require, "nvim-treesitter.install")
if(status) then
ts_install.compilers = { "${pkgs.gcc}/bin/gcc" }
end
'';
};
'';
};
}

View file

@ -1,17 +1,22 @@
{ config, pkgs, ... }:
{
home.username = "serguzim";
home.homeDirectory = "/home/serguzim";
home.username = "serguzim";
home.homeDirectory = "/home/serguzim";
imports = [
./common.nix
./graphical.nix
./nvim.nix
./wayland.nix
];
imports = [
./common.nix
./audio.nix
./graphical.nix
./nvim.nix
./wayland.nix
];
home.packages = with pkgs; [
rustdesk # remote desktop tool
];
home.packages = with pkgs; [
ckb-next # corsair hardware control
#rustdesk # remote desktop tool # disabled for nightly from aur
solaar # Logitech tool
syncthing # file syncing tool
#flatpak
];
}

View file

@ -8,5 +8,8 @@
slurp # needed for screenshots
swww # wallpaper daemon
wl-clipboard # clipboard manager (tools)
#xdg-desktop-portal
#xdg-desktop-portal-hyprland
#xdg-desktop-portal-gtk
];
}

View file

@ -12,5 +12,6 @@
unclutter-xfixes # hides the cursor
xclip # clipboard CLI for X
xcompmgr # compositor for X
xorg.xsetroot # tool to set x background stuff
];
}

View file

@ -28,7 +28,7 @@ windowrulev2 = monitor $mon2, class:(steam), title:^(Friends List)
windowrulev2 = float, class:(xdg-desktop-portal-gtk)
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 = move 5 5, class:(thunderbird), title:^$

View file

@ -31,14 +31,21 @@ general {
layout = dwindle
}
misc {
disable_hyprland_logo = true
}
decoration {
# See https://wiki.hyprland.org/Configuring/Variables/ for more
rounding = 3
blur = yes
blur_size = 3
blur_passes = 1
blur_new_optimizations = true
blur {
enabled = true
size = 3
passes = 1
new_optimizations = true
}
}
animations {

View file

@ -5,7 +5,7 @@
"spacing": 6,
"mode": "dock",
"modules-left": [
"wlr/workspaces"
"hyprland/workspaces"
],
"modules-center": [
],
@ -19,40 +19,14 @@
"clock",
"tray"
],
"wlr/workspaces": {
"hyprland/workspaces": {
"on-click": "activate",
"all-outputs": true,
"sort-by-number": true,
"persistent_workspaces": {
"01": [],
"02": [],
"03": [],
"04": [],
"05": [],
"06": [],
"07": [],
"08": [],
"09": [],
"10": []
"*": 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": {
"max-length": 128
},
@ -86,6 +60,7 @@
},
"custom/weather": {
"exec": "~/.config/waybar/custom/weather",
"on-click": "xdg-open 'https://www.wetter.com/deutschland/oranienburg/DE0007983.html'",
"return-type": "json",
"format": "{}",
"tooltip": true,