From 22bb9b2217f221ee9d153f4dd46004ca481b02ed Mon Sep 17 00:00:00 2001 From: Antoine Phan Date: Sat, 21 Sep 2024 23:37:38 -0400 Subject: [PATCH] More updates I guess, not going to use etckeeper unless really needs it --- Xorg/etc/X11/xorg.conf | 5 + Xorg/etc/X11/xorg.conf.d/40-libinput.conf | 53 ++++ greetd/etc/greetd/config.toml | 14 + hypr/.config/hypr/hyprland.conf | 7 +- i3/.config/i3/config | 4 +- picom/.config/picom/picom.conf | 336 ++++++++++++++++++++++ xinit/.xinitrc | 19 +- zsh/.zshrc | 53 +--- 8 files changed, 438 insertions(+), 53 deletions(-) create mode 100644 Xorg/etc/X11/xorg.conf create mode 100644 Xorg/etc/X11/xorg.conf.d/40-libinput.conf create mode 100644 greetd/etc/greetd/config.toml create mode 100644 picom/.config/picom/picom.conf diff --git a/Xorg/etc/X11/xorg.conf b/Xorg/etc/X11/xorg.conf new file mode 100644 index 0000000..f5450cd --- /dev/null +++ b/Xorg/etc/X11/xorg.conf @@ -0,0 +1,5 @@ +Section "Device" + Identifier "Screen0" + Driver "intel" + BusID "PCI:0:2:0" +EndSection diff --git a/Xorg/etc/X11/xorg.conf.d/40-libinput.conf b/Xorg/etc/X11/xorg.conf.d/40-libinput.conf new file mode 100644 index 0000000..09b9fe4 --- /dev/null +++ b/Xorg/etc/X11/xorg.conf.d/40-libinput.conf @@ -0,0 +1,53 @@ +# Match on all types of devices but joysticks +# +# If you want to configure your devices, do not copy this file. +# Instead, use a config snippet that contains something like this: +# +# Section "InputClass" +# Identifier "something or other" +# MatchDriver "libinput" +# +# MatchIsTouchpad "on" +# ... other Match directives ... +# Option "someoption" "value" +# EndSection +# +# This applies the option any libinput device also matched by the other +# directives. See the xorg.conf(5) man page for more info on +# matching devices. + +Section "InputClass" + Identifier "libinput pointer catchall" + MatchIsPointer "on" + MatchDevicePath "/dev/input/event*" + Driver "libinput" +EndSection + +Section "InputClass" + Identifier "libinput keyboard catchall" + MatchIsKeyboard "on" + MatchDevicePath "/dev/input/event*" + Driver "libinput" +EndSection + +Section "InputClass" + Identifier "libinput touchpad catchall" + MatchIsTouchpad "on" + MatchDevicePath "/dev/input/event*" + Driver "libinput" + Option "NaturalScrolling" "on" +EndSection + +Section "InputClass" + Identifier "libinput touchscreen catchall" + MatchIsTouchscreen "on" + MatchDevicePath "/dev/input/event*" + Driver "libinput" +EndSection + +Section "InputClass" + Identifier "libinput tablet catchall" + MatchIsTablet "on" + MatchDevicePath "/dev/input/event*" + Driver "libinput" +EndSection diff --git a/greetd/etc/greetd/config.toml b/greetd/etc/greetd/config.toml new file mode 100644 index 0000000..e8fd149 --- /dev/null +++ b/greetd/etc/greetd/config.toml @@ -0,0 +1,14 @@ +[terminal] +# The VT to run the greeter on. Can be "next", "current" or a number +# designating the VT. +vt = 1 + +# The default session, also known as the greeter. +[default_session] + +command = "tuigreet --cmd /usr/bin/zsh" + +# The user to run the command as. The privileges this user must have depends +# on the greeter. A graphical greeter may for example require the user to be +# in the `video` group. +user = "antoine" diff --git a/hypr/.config/hypr/hyprland.conf b/hypr/.config/hypr/hyprland.conf index 2541929..d110659 100644 --- a/hypr/.config/hypr/hyprland.conf +++ b/hypr/.config/hypr/hyprland.conf @@ -3,10 +3,13 @@ monitor=eDP-1,1920x1080@60,0x0,1 # --- Second monitor via HDMI-A --- # Automatic/To the right -monitor=,1920x1080@165,auto,1 +# monitor=,1920x1080@165,auto,1 + +# 60 Hz +# monitor=,1920x1080@60,auto,1 # Second monitor on the left -# monitor=,1920x1080@165, -1920x0, 1 +monitor=,1920x1080@165, -1920x0, 1 # monitor = , highres, 0x-1080, 1 diff --git a/i3/.config/i3/config b/i3/.config/i3/config index 8c82f87..24e8ef7 100644 --- a/i3/.config/i3/config +++ b/i3/.config/i3/config @@ -6,10 +6,12 @@ set $mod Mod4 # transparency exec --no-startup-id picom -b +exec autotiling & # --shadow --shadow-radius=60 --shadow-opacity=0.2 --fade-in-step=0.8 & # --inactive-opacity=0.9 + # Font for window titles -font pango:Fira Code 10 +font pango:FiraCode Nerd Font 10 # Keymap exec setxkbmap -layout us -variant altgr-intl diff --git a/picom/.config/picom/picom.conf b/picom/.config/picom/picom.conf new file mode 100644 index 0000000..b4f80b6 --- /dev/null +++ b/picom/.config/picom/picom.conf @@ -0,0 +1,336 @@ +# SHADOW + +# shadow = false +shadow = false; +shadow-radius = 50; +shadow-opacity = 0.3 + +# in pixel +shadow-offset-x = -7; +shadow-offset-y = -7; + +# Shadow RGB (0.0 - 1.0, default: 0) +# shadow-red = 0 +# shadow-green = 0 +# shadow-blue = 0 + +# Shadow color: default #000000 +# shadow-color = "#000000" + +# Specify a list of conditions of windows that should have no shadow. +# +# examples: +# shadow-exclude = "n:e:Notification"; +# +# shadow-exclude = [] +shadow-exclude = [ + "name = 'Notification'", + "class_g = 'Conky'", + "class_g ?= 'Notify-osd'", + "class_g = 'Cairo-clock'", + "_GTK_FRAME_EXTENTS@:c" +]; + +# clip-shadow-above = [] +# shadow-exclude-reg = "" +# xinerama-shadow-crop = false + +# FADING + +# Fade windows in/out when opening/closing and when opacity changes, +# unless no-fading-openclose is used. +# fading = false +fading = true; + +# Opacity change between steps while fading in. (0.01 - 1.0, defaults to 0.028) +# fade-in-step = 0.028 +fade-in-step = 0.5; + +# Opacity change between steps while fading out. (0.01 - 1.0, defaults to 0.03) +# fade-out-step = 0.03 +fade-out-step = 0.1; + +# The time between steps in fade step, in milliseconds. (> 0, defaults to 10) +fade-delta = 5 + +# Specify a list of conditions of windows that should not be faded. +# fade-exclude = [] + +# Do not fade on window open/close. +no-fading-openclose = false + +# Do not fade destroyed ARGB windows with WM frame. Workaround of bugs in Openbox, Fluxbox, etc. +no-fading-destroyed-argb = false + +# TRANSPARENCY AND OPACITY + +# Opacity of inactive windows. (0.1 - 1.0, defaults to 1.0) +inactive-opacity = 0.96; + +# Opacity of window titlebars and borders. (0.1 - 1.0, disabled by default) +frame-opacity = 0.1; + +# Let inactive opacity set by -i override the '_NET_WM_WINDOW_OPACITY' values of windows. +inactive-opacity-override = false; + +# Default opacity for active windows. (0.0 - 1.0, defaults to 1.0) +active-opacity = 1.0 + +# Dim inactive windows. (0.0 - 1.0, defaults to 0.0) +inactive-dim = 0.12 + +# Specify a list of conditions of windows that should never be considered focused. +# focus-exclude = [] +focus-exclude = [ "class_g = 'Cairo-clock'" ]; + +# Use fixed inactive dim value, instead of adjusting according to window opacity. +# inactive-dim-fixed = 1.0 + +# Specify a list of opacity rules, in the format `PERCENT:PATTERN`, +# like `50:name *= "Firefox"`. picom-trans is recommended over this. +# Note we don't make any guarantee about possible conflicts with other +# programs that set '_NET_WM_WINDOW_OPACITY' on frame or client windows. +# example: +# opacity-rule = [ "80:class_g = 'URxvt'" ]; +# +# opacity-rule = [] + + +# Corners # + +# Sets the radius of rounded window corners. When > 0, the compositor will +# round the corners of windows. Does not interact well with +# `transparent-clipping`. +corner-radius = 18 + +# Exclude conditions for rounded corners. +rounded-corners-exclude = [ + "window_type = 'dock'", + "window_type = 'desktop'" +]; + + +# BACKGROUND - BLURRING + +# blur-size = 12 +# +# blur-deviation = false +# +# blur-strength = 6 + +# Blur background of semi-transparent / ARGB windows. +# Bad in performance, with driver-dependent behavior. +# The name of the switch may change without prior notifications. +# +# blur-background = false + +# Blur background of windows when the window frame is not opaque. +# Implies: +# blur-background +# Bad in performance, with driver-dependent behavior. The name may change. +# +# blur-background-frame = false + + +# Use fixed blur strength rather than adjusting according to window opacity. +# blur-background-fixed = false + + +# Specify the blur convolution kernel, with the following format: +# example: +# blur-kern = "5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1"; +# +# blur-kern = "" +blur-kern = "3x3box"; + + +# Exclude conditions for background blur. +# blur-background-exclude = [] +blur-background-exclude = [ + "window_type = 'dock'", + "window_type = 'desktop'", + "_GTK_FRAME_EXTENTS@:c" +]; + +################################# +# General Settings # +################################# + +# Enable remote control via D-Bus. See the man page for more details. +# dbus = true + +# Daemonize process. Fork to background after initialization. Causes issues with certain (badly-written) drivers. +# daemon = false + +# Specify the backend to use: `xrender`, `glx`, or `xr_glx_hybrid`. +backend = "glx" +# Enable/disable VSync. +# vsync = false +vsync = true; + +# dbus = false +mark-wmwin-focused = true; + +# Mark override-redirect windows that doesn't have a child window with 'WM_STATE' focused. +# mark-ovredir-focused = false +mark-ovredir-focused = true; + +# Try to detect windows with rounded corners and don't consider them +# shaped windows. The accuracy is not very high, unfortunately. +# +# detect-rounded-corners = false +detect-rounded-corners = true; + +# Detect '_NET_WM_WINDOW_OPACITY' on client windows, useful for window managers +# not passing '_NET_WM_WINDOW_OPACITY' of client windows to frame windows. +# +# detect-client-opacity = false +detect-client-opacity = true; + +# Use EWMH '_NET_ACTIVE_WINDOW' to determine currently focused window, +# rather than listening to 'FocusIn'/'FocusOut' event. Might have more accuracy, +# provided that the WM supports it. +# +# use-ewmh-active-win = false + +# unredir-if-possible = false +# unredir-if-possible-delay = 0 +# unredir-if-possible-exclude = [] +detect-transient = true; +# detect-client-leader = false +# resize-damage = 1 +# invert-color-include = [] + +# GLX backend: Avoid using stencil buffer, useful if you don't have a stencil buffer. +# Might cause incorrect opacity when rendering transparent content (but never +# practically happened) and may not work with blur-background. +# My tests show a 15% performance boost. Recommended. +# +glx-no-stencil = true; + +# GLX backend: Avoid rebinding pixmap on window damage. +# Probably could improve performance on rapid window content changes, +# but is known to break things on some drivers (LLVMpipe, xf86-video-intel, etc.). +# Recommended if it works. +# +glx-no-rebind-pixmap = true + +# Disable the use of damage information. +# This cause the whole screen to be redrawn every time, instead of the part of the screen +# has actually changed. Potentially degrades the performance, but might fix some artifacts. +# The opposing option is use-damage +# +# no-use-damage = false +use-damage = false; + +# Use X Sync fence to sync clients' draw calls, to make sure all draw +# calls are finished before picom starts drawing. Needed on nvidia-drivers +# with GLX backend for some users. +# +# xrender-sync-fence = false + +# GLX backend: Use specified GLSL fragment shader for rendering window +# contents. Read the man page for a detailed explanation of the interface. +# +# window-shader-fg = "default" + +# Use rules to set per-window shaders. Syntax is SHADER_PATH:PATTERN, similar +# to opacity-rule. SHADER_PATH can be "default". This overrides window-shader-fg. +# +# window-shader-fg-rule = [ +# "my_shader.frag:window_type != 'dock'" +# ] + +# Force all windows to be painted with blending. Useful if you +# have a glx-fshader-win that could turn opaque pixels transparent. +# +# force-win-blend = false + +# Do not use EWMH to detect fullscreen windows. +# Reverts to checking if a window is fullscreen based only on its size and coordinates. +# +# no-ewmh-fullscreen = false + +# Dimming bright windows so their brightness doesn't exceed this set value. +# Brightness of a window is estimated by averaging all pixels in the window, +# so this could comes with a performance hit. +# Setting this to 1.0 disables this behaviour. Requires --use-damage to be disabled. (default: 1.0) +# +# max-brightness = 1.0 + +# Make transparent windows clip other windows like non-transparent windows do, +# instead of blending on top of them. +# +transparent-clipping = false + +# Specify a list of conditions of windows that should never have transparent +# clipping applied. Useful for screenshot tools, where you need to be able to +# see through transparent parts of the window. +# +# transparent-clipping-exclude = [] + +# Set the log level. Possible values are: +# "trace", "debug", "info", "warn", "error" +# in increasing level of importance. Case doesn't matter. +# If using the "TRACE" log level, it's better to log into a file +# using *--log-file*, since it can generate a huge stream of logs. +# +# log-level = "debug" +log-level = "warn"; + +# Set the log file. +# If *--log-file* is never specified, logs will be written to stderr. +# Otherwise, logs will to written to the given file, though some of the early +# logs might still be written to the stderr. +# When setting this option from the config file, it is recommended to use an absolute path. +# +# log-file = "/path/to/your/log/file" + +# Show all X errors (for debugging) +# show-all-xerrors = false + +# Write process ID to a file. +# write-pid-path = "/path/to/your/log/file" + +# Window type settings +# +# 'WINDOW_TYPE' is one of the 15 window types defined in EWMH standard: +# "unknown", "desktop", "dock", "toolbar", "menu", "utility", +# "splash", "dialog", "normal", "dropdown_menu", "popup_menu", +# "tooltip", "notification", "combo", and "dnd". +# +# Following per window-type options are available: :: +# +# fade, shadow::: +# Controls window-type-specific shadow and fade settings. +# +# opacity::: +# Controls default opacity of the window type. +# +# focus::: +# Controls whether the window of this type is to be always considered focused. +# (By default, all window types except "normal" and "dialog" has this on.) +# +# full-shadow::: +# Controls whether shadow is drawn under the parts of the window that you +# normally won't be able to see. Useful when the window has parts of it +# transparent, and you want shadows in those areas. +# +# clip-shadow-above::: +# Controls whether shadows that would have been drawn above the window should +# be clipped. Useful for dock windows that should have no shadow painted on top. +# +# redir-ignore::: +# Controls whether this type of windows should cause screen to become +# redirected again after been unredirected. If you have unredir-if-possible +# set, and doesn't want certain window to cause unnecessary screen redirection, +# you can set this to `true`. +# +wintypes: +{ + tooltip = { fade = true; shadow = true; opacity = 0.75; focus = true; full-shadow = false; }; + dock = { shadow = false; clip-shadow-above = true; } + dnd = { shadow = false; } + popup_menu = { opacity = 0.8; } + dropdown_menu = { opacity = 0.8; } +}; diff --git a/xinit/.xinitrc b/xinit/.xinitrc index 4112f86..eaea2b7 100644 --- a/xinit/.xinitrc +++ b/xinit/.xinitrc @@ -5,9 +5,9 @@ usermodmap=$HOME/.Xmodmap sysresources=/etc/X11/xinit/.Xresources sysmodmap=/etc/X11/xinit/.Xmodmap -#xrandr --setprovideroutputsource modesetting NVIDIA-0 -#xrandr --auto -#xrandr --dpi 96 +# xrandr --setprovideroutputsource modesetting NVIDIA-0 +xrandr --auto +xrandr --dpi 96 # merge in defaults and keymaps @@ -35,11 +35,10 @@ fi # unset f #fi -# exec numlockx & -# exec ibus-daemon -rxR & -# export GTK_THEME=adw-gtk3-dark:dark +exec numlockx & +exec ibus-daemon -rxR & +export GTK_THEME=adw-gtk3-dark:dark -# exec i3 -c /home/antoine/.config/i3/config -exec i3 -# exec autorandr --change -# exec autotiling & +exec i3 -c /home/antoine/.config/i3/config +exec autorandr --change +exec autotiling & diff --git a/zsh/.zshrc b/zsh/.zshrc index 3bea19b..aa6aa1c 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -39,30 +39,20 @@ ENABLE_CORRECTION="false" # Uncomment the following line to display red dots whilst waiting for completion. # You can also set it to another string to have that shown instead of the default red dots. # e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f" -# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765) -COMPLETION_WAITING_DOTS="true" +COMPLETION_WAITING_DOTS="%F{yellow}....hmm..." -# Uncomment the following line if you want to disable marking untracked files -# under VCS as dirty. This makes repository status check for large repositories -# much, much faster. # DISABLE_UNTRACKED_FILES_DIRTY="true" -# Uncomment the following line if you want to change the command execution time -# stamp shown in the history command output. # You can set one of the optional three formats: # "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" -# or set a custom format using the strftime function format specifications, # see 'man strftime' for details. -# HIST_STAMPS="mm/dd/yyyy" +HIST_STAMPS="yy-mm-dd" -# Would you like to use another custom folder than $ZSH/custom? # ZSH_CUSTOM=/path/to/new-custom-folder -# Which plugins would you like to load? # Standard plugins can be found in $ZSH/plugins/ # Custom plugins may be added to $ZSH_CUSTOM/plugins/ # Example format: plugins=(rails git textmate ruby lighthouse) -# Add wisely, as too many plugins slow down shell startup. plugins=( git autojump @@ -77,43 +67,27 @@ source $ZSH/oh-my-zsh.sh # export MANPATH="/usr/local/man:$MANPATH" -# Preferred editor for local and remote sessions -# if [[ -n $SSH_CONNECTION ]]; then -# export EDITOR='vim' -# else -# export EDITOR='mvim' -# fi - # Compilation flags -# export ARCHFLAGS="-arch x86_64" - -# Set personal aliases, overriding those provided by oh-my-zsh libs, -# plugins, and themes. Aliases can be placed here, though oh-my-zsh -# users are encouraged to define aliases within the ZSH_CUSTOM folder. -# For a full list of active aliases, run `alias`. +export ARCHFLAGS="-arch x86_64" [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh export LC_ALL=en_CA.UTF-8 -if [ -z $DISPLAY ] && [ $(tty) = /dev/tty1 ] -then + +# Starting a session from the TTY +# if [ -z $DISPLAY ] && [ $(tty) = /dev/tty1 ] +#then # Autostart Hyprland - export GTK_THEME=adw-gtk3-dark:dark - exec Hyprland +# export GTK_THEME=adw-gtk3-dark:dark +# exec Hyprland # elif [ -z $DISPLAY ] && [ $(tty) = /dev/tty2 ] # then # Autostart X at login for tty2, using i3 WM # export GTK_THEME=adw-gtk3-dark:dark # exec startx -fi - -## Auto start Wayland at login, using Sway on Wayland tty2 -# Start i3 WM on login, opt in using dGPU (NVIDIA) -#if [ -z "$DISPLAY" ] && [ "${XDG_VTNR}" -eq 2 ]; then -# echo "Starting i3 WM on tty2 and enable NVIDIA GPU by default" -# exec startx -# export __NV_PRIME_RENDER_OFFLOAD=1 __GLX_VENDOR_LIBRARY_NAME=nvidia #fi +# In case I need to enable NVIDIA from start +# export __NV_PRIME_RENDER_OFFLOAD=1 __GLX_VENDOR_LIBRARY_NAME=nvidia export EDITOR=nvim @@ -135,7 +109,6 @@ alias fallinlight="feh --bg-fill --randomize /home/antoine/Pictures/Fallin\'\ Li alias micvol="wpctl set-volume @DEFAULT_SOURCE@" alias enable-nvidia='export __NV_PRIME_RENDER_OFFLOAD=1 __GLX_VENDOR_LIBRARY_NAME=nvidia' -# alias weather='inxi -wxx --weather-unit m' alias weather="curl https://wttr.in" alias cal='cal -m' alias please='sudo' @@ -162,8 +135,8 @@ export PATH="$BUN_INSTALL/bin:$PATH" eval "$(zoxide init --cmd cd zsh)" - -if [ -e /home/antoine/.nix-profile/etc/profile.d/nix.sh ]; then . /home/antoine/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer +# Added by Nix installer: +# if [ -e /home/antoine/.nix-profile/etc/profile.d/nix.sh ]; then . /home/antoine/.nix-profile/etc/profile.d/nix.sh; fi export NVM_DIR="$HOME/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm