diff --git a/.gitignore b/.gitignore index 21575d7..e69de29 100644 --- a/.gitignore +++ b/.gitignore @@ -1,41 +0,0 @@ -# Paid wallpapers -/home/wallpaper/wallpaper/16.png -/home/wallpaper/wallpaper/17.png -/home/wallpaper/wallpaper/2020.png -/home/wallpaper/wallpaper/35.png -/home/wallpaper/wallpaper/abyss.png -/home/wallpaper/wallpaper/afterglow.png -/home/wallpaper/wallpaper/air.png -/home/wallpaper/wallpaper/birds.png -/home/wallpaper/wallpaper/cell.png -/home/wallpaper/wallpaper/circles.png -/home/wallpaper/wallpaper/dawn.png -/home/wallpaper/wallpaper/destination.png -/home/wallpaper/wallpaper/dim.png -/home/wallpaper/wallpaper/distance.png -/home/wallpaper/wallpaper/edge.png -/home/wallpaper/wallpaper/empty.png -/home/wallpaper/wallpaper/evening.png -/home/wallpaper/wallpaper/faraway_point.png -/home/wallpaper/wallpaper/framents.png -/home/wallpaper/wallpaper/harbour.png -/home/wallpaper/wallpaper/horizon.png -/home/wallpaper/wallpaper/lull.png -/home/wallpaper/wallpaper/nice.png -/home/wallpaper/wallpaper/night.png -/home/wallpaper/wallpaper/on_the_hill.png -/home/wallpaper/wallpaper/pap6.png -/home/wallpaper/wallpaper/pearls.png -/home/wallpaper/wallpaper/pieces.png -/home/wallpaper/wallpaper/rose.png -/home/wallpaper/wallpaper/same_way.png -/home/wallpaper/wallpaper/specimen.png -/home/wallpaper/wallpaper/stardust.png -/home/wallpaper/wallpaper/stay_here.png -/home/wallpaper/wallpaper/summer.png -/home/wallpaper/wallpaper/undertone.png -/home/wallpaper/wallpaper/weak_blue.png -/home/wallpaper/wallpaper/weak_red.png -/home/wallpaper/wallpaper/works.png -/home/wallpaper/wallpaper/xp.png -/home/wallpaper/wallpaper/zephyr.png diff --git a/README.md b/README.md index 154f682..93da778 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,4 @@ This is my dotfiles repo. It's a work in progress, and I'm still learning how to - [ ] Ricing things - [ ] Peaclock - [ ] Find a tui app for white noises (does that exist ? If not, I'll build my own) -- [ ] Collections of wallpapers - - [ ] Symbolic links for own dotfiles in Nextcloud folder if exist (wallpapers) - [ ] Custom GTK & Qt Theme based on the colorscheme diff --git a/home/dunst/default.nix b/home/dunst/default.nix index 263eee9..da62386 100644 --- a/home/dunst/default.nix +++ b/home/dunst/default.nix @@ -5,8 +5,8 @@ services.dunst = { enable = true; iconTheme = { - name = "Papirus-Dark"; - package = pkgs.papirus-icon-theme; + name = "Adwaita-Dark"; + package = pkgs.gnome.adwaita-icon-theme; }; settings = { global = { @@ -56,7 +56,7 @@ show_indicators = "yes"; shrink = "no"; word_wrap = "yes"; - browser = "/usr/bin/env librewolf -new-tab"; + browser = "${pkgs.qutebrowser}/bin/qutebrowser"; }; fullscreen_delay_everything = { fullscreen = "delay"; }; diff --git a/home/home.nix b/home/home.nix index dc6aa05..ce04ffe 100644 --- a/home/home.nix +++ b/home/home.nix @@ -1,5 +1,25 @@ { config, pkgs, ... }: { + imports = [ + ./hyprland + ./nvim + ./waybar + ./kitty + ./dunst + ./wlogout + ./wofi + ./qutebrowser + ./git + ./shell + ./misc + ./nextcloud + ./scripts + ./neofetch + ./spicetify + ./variables/theme + ./wallpaper + ]; + home.username = "hadi"; home.homeDirectory = "/home/hadi"; @@ -25,7 +45,6 @@ libva wget ripgrep - blanket # Backup vscode @@ -34,24 +53,4 @@ home.stateVersion = "23.11"; programs.home-manager.enable = true; - - imports = [ - ./hyprland - ./nvim - ./waybar - ./kitty - ./dunst - ./wlogout - ./wofi - ./qutebrowser - ./git - ./shell - ./misc - ./nextcloud - ./scripts - ./neofetch - ./spicetify - ./variables/theme - ./wallpaper - ]; } diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index 2d3688c..721fbf3 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -30,7 +30,8 @@ "$menu" = "menu"; "$powermenu" = "${pkgs.wlogout}/bin/wlogout"; - exec-once = [ "hypridle" "hyprpaper"]; + exec-once = + [ "${pkgs.hypridle}/bin/hypridle" "${pkgs.hyprpaper}/bin/hyprpaper" ]; monitor = [ "eDP-2,highres,0x0,1" @@ -39,14 +40,14 @@ ]; bind = [ - "$mod, RETURN, exec, kitty" + "$mod, RETURN, exec, ${pkgs.kitty}/bin/kitty" "$mod, Q, killactive," - "$mod, E, exec, thunar" + "$mod, E, exec, ${pkgs.xfce.thunar}/bin/thunar" "$mod, T, togglefloating," "$mod, F, fullscreen" - "$mod, B, exec, qutebrowser" - "$mod, C, exec, kitty --class floating peaclock" - "$mod, L, exec, hyprlock" + "$mod, B, exec, ${pkgs.qutebrowser}/bin/qutebrowser" + "$mod, C, exec, ${pkgs.kitty}/bin/kitty --class floating peaclock" + "$mod, L, exec, ${pkgs.hyprlock}/bin/hyprlock" "$mod, SPACE, exec, $menu" "$mod, X, exec, $powermenu" "$mod, left, movefocus, l" @@ -64,35 +65,34 @@ bindl = [ ",XF86AudioMute, exec, wpctl set-mute @DEFAULT_SINK@ toggle" - ",switch:Lid Switch, exec, hyprlock" + ",switch:Lid Switch, exec, ${pkgs.hyprlock}/bin/hyprlock" ]; bindle = [ ", XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+" ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-" - ", XF86MonBrightnessUp, exec, brightnessctl set 10%+" - ", XF86MonBrightnessDown, exec, brightnessctl set 10%-" + ", XF86MonBrightnessUp, exec, ${pkgs.brightnessctl}/bin/brightnessctl set 10%+" + ", XF86MonBrightnessDown, exec, ${pkgs.brightnessctl}/bin/brightnessctl set 10%-" ]; env = [ "XCURSOR_SIZE,24" "LIBVA_DRIVER_NAME,nvidia" - "XDG_SESSION_TYPE,wayland" "__GLX_VENDOR_LIBRARY_NAME,nvidia" "WLR_NO_HARDWARE_CURSORS,1" - "QT_QPA_PLATFORMTHEME,qt5ct" - "SWWW_TRANSITION,wipe" + "WLR_DRM_DEVICES,/dev/dri/card0:/dev/dri/card1" + "XDG_SESSION_TYPE,wayland" "XDG_CURRENT_DESKTOP,Hyprland" "XDG_SESSION_TYPE,wayland" "XDG_SESSION_DESKTOP,Hyprland" + "QT_QPA_PLATFORMTHEME,qt5ct" "QT_AUTO_SCREEN_SCALE_FACTOR,1" "QT_QPA_PLATFORM=wayland,xcb" "QT_WAYLAND_DISABLE_WINDOWDECORATION,1" + "QT_STYLE_OVERRIDE,Adwaita-Dark" "T_QPA_PLATFORMTHEME,qt5ct" - "WLR_DRM_DEVICES,/dev/dri/card0:/dev/dri/card1" "GTK_THEME,Adwaita:dark" "GTK2_RC_FILES,/usr/share/themes/Adwaita-dark/gtk-2.0/gtkrc" - "QT_STYLE_OVERRIDE,Adwaita-Dark" ]; general = { diff --git a/home/hyprland/hypridle.nix b/home/hyprland/hypridle.nix index bdc2e5a..c970830 100644 --- a/home/hyprland/hypridle.nix +++ b/home/hyprland/hypridle.nix @@ -1,23 +1,23 @@ -{ pkgs, ... }: { +{ config, pkgs, ... }: { home.packages = with pkgs; [ hypridle ]; xdg.configFile."hypr/hypridle.conf".text = '' general { - ignore_dbus_inhibit = false # whether to ignore dbus-sent idle-inhibit requests (used by e.g. firefox or steam) + ignore_dbus_inhibit = false } # Screenlock listener { - timeout = 600 # in seconds - on-timeout = hyprlock # command to run when timeout has passed - on-resume = notify-send "Welcome back hadi!" # command to run when activity is detected after timeout has fired. + timeout = 600 + on-timeout = ${pkgs.hyprlock}/bin/hyprlock + on-resume = ${pkgs.libnotify}/bin/notify-send "Welcome back ${config.home.username}!" } # Suspend listener { - timeout = 660 # in seconds - on-timeout = systemctl suspend # command to run when timeout has passed - # on-resume = notify-send "Welcome back to your desktop!" # command to run when activity is detected after timeout has fired. + timeout = 660 + on-timeout = systemctl suspend + # on-resume = ${pkgs.libnotify}/bin/notify-send "Welcome back to your desktop!" } ''; } diff --git a/home/hyprland/hyprlock.nix b/home/hyprland/hyprlock.nix index 16b06b8..97cf1b3 100644 --- a/home/hyprland/hyprlock.nix +++ b/home/hyprland/hyprlock.nix @@ -5,14 +5,13 @@ xdg.configFile."hypr/hyprlock.conf".text = '' background { monitor = - path = $HOME/.config/wallpaper/default.png # only png supported for now + path = $HOME/.config/wallpaper/${config.theme.wallpaper} color = rgb(${config.theme.colors.bg}) - # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations blur_size = 4 - blur_passes = 3 # 0 disables blurring + blur_passes = 3 noise = 0.0117 - contrast = 1.3000 # Vibrant!!! + contrast = 1.3000 brightness = 0.8000 vibrancy = 0.2100 vibrancy_darkness = 0.0 diff --git a/home/hyprland/hyprpaper.nix b/home/hyprland/hyprpaper.nix index 237abb8..2a68179 100644 --- a/home/hyprland/hyprpaper.nix +++ b/home/hyprland/hyprpaper.nix @@ -2,7 +2,9 @@ home.packages = with pkgs; [ hyprpaper ]; xdg.configFile."hypr/hyprpaper.conf".text = '' - preload = ~/.config/wallpaper/${config.theme.wallpaper} + preload = ~/.config/wallpaper/${config.theme.wallpaper} wallpaper = ,~/.config/wallpaper/${config.theme.wallpaper} + ipc=true + splash=false ''; } diff --git a/home/shell/zsh.nix b/home/shell/zsh.nix index f4c361e..7af165f 100644 --- a/home/shell/zsh.nix +++ b/home/shell/zsh.nix @@ -9,7 +9,10 @@ syntaxHighlighting.enable = true; historySubstringSearch.enable = true; - initExtraFirst = "neofetch"; + initExtraFirst = '' + bindkey -e + ${pkgs.neofetch}/bin/neofetch + ''; history = { ignoreDups = true; @@ -24,7 +27,6 @@ ''; shellAliases = { - sl = "ls"; vim = "nvim"; v = "nvim"; c = "clear"; @@ -32,9 +34,10 @@ celar = "clear"; e = "exit"; cd = "z"; - ls = "eza --icons=always"; - open = "xdg-open"; - icat = "kitty +kitten icat"; + ls = "${pkgs.eza}/bin/eza --icons=always"; + sl = "ls"; + open = "${pkgs.xdg_utils}/bin/xdg-open"; + icat = "${pkgs.kitty}/bin/kitty +kitten icat"; }; }; } diff --git a/home/spicetify/default.nix b/home/spicetify/default.nix index 2651081..a7430f6 100644 --- a/home/spicetify/default.nix +++ b/home/spicetify/default.nix @@ -21,11 +21,11 @@ in { card = "${config.theme.colors.bg}"; shadow = "000000"; selected-row = "797979"; - button = "31748f"; - button-active = "31748f"; - button-disabled = "555169"; - tab-active = "00FF00"; - misc = "00FF00"; + button = "${config.theme.colors.primary-bg}"; + button-active = "${config.theme.colors.primary-bg}"; + button-disabled = "${config.theme.colors.alt-bg}"; + tab-active = "${config.theme.colors.primary-bg}"; + misc = "${config.theme.colors.alt-fg}"; }; enabledExtensions = with spicePkgs.extensions; [ diff --git a/home/wallpaper/wallpaper.nix b/home/wallpaper/default.nix similarity index 100% rename from home/wallpaper/wallpaper.nix rename to home/wallpaper/default.nix diff --git a/home/wlogout/default.nix b/home/wlogout/default.nix index fbcab85..21653ac 100644 --- a/home/wlogout/default.nix +++ b/home/wlogout/default.nix @@ -1,41 +1,41 @@ -{ config, ... }: { +{ config, pkgs, ... }: { programs.wlogout = { enable = true; layout = [ { label = "lock"; - action = "sleep 1; hyprlock"; + action = "${pkgs.hyprlock}/bin/hyprlock"; text = "Lock"; keybind = "l"; } { label = "hibernate"; - action = "sleep 1; systemctl hibernate"; + action = "systemctl hibernate"; text = "Hibernate"; keybind = "h"; } { label = "logout"; - action = "sleep 1; killall -9 Hyprland sleep 2"; + action = "killall -9 Hyprland sleep 2"; text = "Exit"; keybind = "e"; } { label = "shutdown"; - action = "sleep 1; systemctl poweroff"; + action = "systemctl poweroff"; text = "Shutdown"; keybind = "s"; } { label = "suspend"; - action = "sleep 1; systemctl suspend"; + action = "systemctl suspend"; text = "Suspend"; keybind = "u"; } { label = "reboot"; - action = "sleep 1; systemctl reboot"; + action = "systemctl reboot"; text = "Reboot"; keybind = "r"; }