From fcc3ad1ddd63759ec294e046c4b62999956ca5d8 Mon Sep 17 00:00:00 2001 From: Marco van Dijk Date: Mon, 19 Jul 2021 21:38:48 +0200 Subject: [PATCH] Cleanup Files Expanded Readme --- .Xdefaults | 3 -- .bash_profile | 5 -- .bashrc | 46 ++++------------- .config/i3/config | 6 +-- .config/sway/config | 4 -- .gitconfig | 3 -- .gtkrc-2.0 | 18 ------- .xinitrc | 19 +------ README.md | 119 ++++++++++++++++++++++++++++++++++++++++---- 9 files changed, 121 insertions(+), 102 deletions(-) delete mode 100644 .gitconfig delete mode 100644 .gtkrc-2.0 diff --git a/.Xdefaults b/.Xdefaults index ac46e40..58247de 100644 --- a/.Xdefaults +++ b/.Xdefaults @@ -44,9 +44,6 @@ *.color7: #a9b1d6 *.color15: #c0caf5 -*.color16: #ff9e64 -*.color17: #db4b4b - ! xterm.vt100.faceName: Terminus:style=Regular:size=10 ! xterm.vt100.faceNameDoublesize: Cyberbit:style=Regular:size=10 diff --git a/.bash_profile b/.bash_profile index f9fdee4..8b6f9ca 100644 --- a/.bash_profile +++ b/.bash_profile @@ -4,11 +4,6 @@ [[ -f ~/.bashrc ]] && . ~/.bashrc -if [ -n "$DESKTOP_SESSION" ];then - eval $(gnome-keyring-daemon --start) - export SSH_AUTH_SOCK -fi - # Autostart xorg (and thus i3) when logging in # Keep commented out if you want to use GDM # or any other display manager to login diff --git a/.bashrc b/.bashrc index 414d11b..d95cc0d 100644 --- a/.bashrc +++ b/.bashrc @@ -1,17 +1,14 @@ -# -# ~/.bashrc -# - +# Or emacs? export EDITOR=vim +# Append folders containing executeables to your path here export PATH=/home/$USER/bin:/home/marco/Documents/ddvtech/repo:$PATH - +# Number of lines or commands that are stored in memory in a history list while your bash session is ongoing +export HISTSIZE=10000 +# how many lines we can remember across sessions export HISTFILESIZE=10000 export HISTCONTROL=erasedups -export HISTSIZE=10000 export HISTIGNORE='ls:bg:fg:history:du:exit:make' -# Set clear command to clear and display system info -alias clear='clear && neofetch | lolcat' if [ -e /usr/share/terminfo/s/st-256color ]; then export TERM='st-256color' @@ -19,37 +16,11 @@ else export TERM='st' fi -if [ "$TERM" = "linux" ]; then -# echo -en "\e]P0232323" #black - echo -en "\e]P82B2B2B" #darkgrey -# echo -en "\e]P1D75F5F" #darkred -# echo -en "\e]P9E33636" #red -# echo -en "\e]P287AF5F" #darkgreen -# echo -en "\e]PA98E34D" #green -# echo -en "\e]P3D7AF87" #brown -# echo -en "\e]PBFFD75F" #yellow -# echo -en "\e]P48787AF" #darkblue -# echo -en "\e]PC7373C9" #blue -# echo -en "\e]P5BD53A5" #darkmagenta -# echo -en "\e]PDD633B2" #magenta -# echo -en "\e]P65FAFAF" #darkcyan -# echo -en "\e]PE44C9C9" #cyan -# echo -en "\e]P7E5E5E5" #lightgrey -# echo -en "\e]PFFFFFFF" #white - clear #for background artifacting -fi - - -# # If not running interactively, don't do anything -# [[ $- != *i* ]] && return - -#alias ssh='TERM=xterm ssh' alias ls='ls --color=auto' -#prompt() { -# PS1="$(powerline-rs --shell bash --cwd-max-dir-size=6 $?)" -#} -#PROMPT_COMMAND=prompt +alias clear='clear && neofetch | lolcat' +alias wisdom='fortune | cowsay | lolcat' +# Statusline plugin for vim, bash and others powerline-daemon -q POWERLINE_BASH_CONTINUATION=1 POWERLINE_BASH_SELECT=1 @@ -65,5 +36,6 @@ man() { LESS_TERMCAP_us=$'\E[04;38;5;146m' \ man "$@" } + # CD to work directory #cd ~/Documents/ddvtech/ diff --git a/.config/i3/config b/.config/i3/config index 8ed1d29..cb44dd6 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -12,7 +12,7 @@ set $right l # Default Terminal - set $term urxvt + set $term st-256color # Autofocus on hover, also when switching workspaces focus_follows_mouse yes @@ -246,10 +246,6 @@ # See https://github.com/nwg-piotr/autotiling exec --no-startup-id autotiling & -# Gnome Keyring - exec --no-startup-id eval $(gnome-keyring-daemon --start) - exec --no-startup-id export SSH_AUTH_SOCK - # start initial programs exec --no-startup-id firefox & exec --no-startup-id code & diff --git a/.config/sway/config b/.config/sway/config index 5803191..cd90190 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -276,10 +276,6 @@ # Arch update notifications exec kalu -# Gnome Keyring - exec eval $(gnome-keyring-daemon --start) - exec export SSH_AUTH_SOCK - # Clipboard manager exec wl-paste -t text --watch clipman store diff --git a/.gitconfig b/.gitconfig deleted file mode 100644 index 3231503..0000000 --- a/.gitconfig +++ /dev/null @@ -1,3 +0,0 @@ -[user] - email = marco@dijk.tech - name = Marco van Dijk diff --git a/.gtkrc-2.0 b/.gtkrc-2.0 deleted file mode 100644 index 483fa48..0000000 --- a/.gtkrc-2.0 +++ /dev/null @@ -1,18 +0,0 @@ -# DO NOT EDIT! This file will be overwritten by LXAppearance. -# Any customization should be done in ~/.gtkrc-2.0.mine instead. - -include "/home/marco/.gtkrc-2.0.mine" -gtk-theme-name="UltimateBlack-0.1" -gtk-icon-theme-name="Blueberry-Numix-2021" -gtk-font-name="Cantarell 11" -gtk-cursor-theme-name="volantes_cursors" -gtk-cursor-theme-size=0 -gtk-toolbar-style=GTK_TOOLBAR_BOTH -gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR -gtk-button-images=1 -gtk-menu-images=1 -gtk-enable-event-sounds=1 -gtk-enable-input-feedback-sounds=1 -gtk-xft-antialias=1 -gtk-xft-hinting=1 -gtk-xft-hintstyle="hintfull" diff --git a/.xinitrc b/.xinitrc index 2c7c1f6..0c84882 100644 --- a/.xinitrc +++ b/.xinitrc @@ -8,9 +8,6 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then unset f fi -eval $(/usr/bin/gnome-keyring-daemon --start) -export SSH_AUTH_SOCK - export SSH_ASKPASS=/usr/lib/ssh/x11-ssh-askpass export PATH=$HOME/bin:$PATH export DE=generic @@ -19,18 +16,12 @@ export XDG_CONFIG_HOME=$HOME/.config export XDG_CURRENT_DESKTOP=X-Generic export QT_QPA_PLATFORMTHEME=qt5ct #This is needed for skinning KDE applications -#export GTK_IM_MODULE=ibus -#export QT_IM_MODULE=ibus -#export XMODIFIERS="@im=ibus" - #xlogin unsets the dbus address if it is the system bus, let's re-set it... export DBUS_SESSION_BUS_ADDRESS=unix:path=$XDG_RUNTIME_DIR/bus #Set directories used by gnomish tools (particularly, blueberry-tray!) xdg-user-dirs-update -#enable MouseKeys, because of... I don't remember. -setxkbmap -option keypad:pointerkeys # Remap caps lock to escape setxkbmap -option caps:escape @@ -41,7 +32,7 @@ xset -dpms # display wallpaper during loading # feh --bg-fill /home/marco/Images/wallpaper.jpg -xsetroot -solid "#1a1b26" +xsetroot -solid "#16161e" #Recover volumes alsactl init @@ -49,9 +40,6 @@ alsactl init #Set altgr international keyboard map setxkbmap -variant altgr-intl -#Tweak keyboard settings, remove capslock key, replace with fancy menu key -xmodmap ~/.Xmodmap - xrdb ~/.Xresources #Turn on numlock @@ -70,11 +58,8 @@ modprobe thinkpad_acpi #Open SSH keychain, load into systemd user environment eval $(keychain --systemd -q --eval) -# set as freesync compatible -xrandr --output eDP --set "vrr_capable" 1 - #start thing for transparency #picom --config /home/marco/.config/picom/picom.conf & -picom --config /home/marco/.config/picom/picom.conf -b --experimental-backends & +#picom --config /home/marco/.config/picom/picom.conf -b --experimental-backends & #Start i3 exec i3 diff --git a/README.md b/README.md index cee6405..0231529 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,114 @@ -# dotFiles -Minimal Dark theme for sway including mouse config, GTK theme, kanshi example config, waybar config and custom launcher and power menu using rofi +# Tokyo Night Linux theme -Theme is based on https://github.com/enkia/tokyo-night-vscode-theme and created by modifying https://github.com/rtlewis88/rtl88-Themes/tree/material-black-COLORS +This collection is aimed to make your Linux environment look like the vscode Tokyo Night theme. This is currently still a WIP, as most of the configuration is based off of modifying existing themes. -If certain colours aren't to your liking, you can `` grep -rl "old_string" . | xargs sed -i 's/old_string/new_string/g' `` to replace specific colour values +Although replacing your icon theme or cursor is not required, this theme goes well with the Numix icon theme goes well with this theme. -Recommended Icon scheme: https://github.com/numixproject/numix-icon-theme +The GTK theme was made by modifying the Material Black theme + +The discord theme was made by modifying the Nocturnal theme + +## Dependencies + +Theming +- lxappearance: Can be used to apply the GTK theme +- gnome-tweaks: Can be used to apply the GTK theme +- spicetify-cli: Used to apply the Spotify theme +- betterdiscord: Used to apply the Discord theme +- betterdiscord-ctk: Used to install betterdiscord + +Optional Utils +- st: The terminal we are using in our configs. Requirespatches to get it good. urxvt can be used as an alternative and is themed using the config files. +- powerline: Status bar for Bash. For example, it shows you what Git repo you are in +- gvim: Contains vim with clipboard support and more +- vim-airline: Status bar for vim +- neofetch: Very important for screenshots +- lolcat, cowsay, wisdom-mod: very important stuff +- nm-applet: manage your (wireless) connections and has a tray icon +- kalu-kde: Notifies you about Arch news or updates and has a tray icon +- logiops: Used to trigger keyboard combinations using gestures +- blueman: bluetooth tray icon +- gdm-tools-git: If using GDM to login to a user (and select between multiple window managers), use this to set the theme + +When using I3 as window manager +- clipit: Clipboard manager +- picom: If you want transparency +- polybar: Status bar +- polybar-themes: Is included in the repo, but should be installed separately as well to get all their dependencies. +- autotiling: Automatically sets in which direction a window will split based on if the parent container is wider or taller +- rofi: Used as a program launcher and power menu +- arandr: Used to manually set monitor properties +- maim: screen capture +- xclip: X selection to clipboard +- bynanz: record screen to gif + +When using Sway as window manager +- autotiling: Automatically sets in which direction a window will split based on if the parent container is wider or taller +- kanshi: Used to automatically set monitor properties +- rofi: Used as a program launcher and power menu +- clipman: Clipboard manager +- Waybar: Status bar +- mako: Used for notifications +- slurp: wayland selection to clipboard +- grim: screenshot utility for wayland +- wf-recorder: record screen to video + +## File overview and Configuration +### File Index +- .config + - BetterDiscord: Contains theme files for Discord + - gtk-3.0: Sets some theme settings + - i3: Example i3 config with auto starting applications, borders and gaps settings, etc + - kanshi: Example config for using Kanshi to set your wayland monitors + - Picom: Example config for enabling transparency when using I3. Not updated to match the theme at this moment + - Polybar: Theme and config for the status bar when using I3 with modules n shit enabled + - Spicetify: Contains theme for modifying Spotify + - Sway: Example sway config with auto starting applications, borders and gaps settings, etc + - Polybar: Theme and config for the status bar when using Sway + - Wofi: Actually contains an example config and theme for Rofi and Wofi, although we are using Rofi in the configs + +- /etc/logid.conf: Optional example configuration for the Logitech MX Master mouse, using gestures to call certain key combinations set in the I3/Sway config +- /usr/share/themes/UltimateBlack-0.1: GTK theme. Will be updated and renamed in the near future. +- .bash_profile: Optional example config. Runs when you login (including via SSH). contains commented code to autostart xorg (and I3) +- .bashrc: Optional example config. Runs whenever a new terminal is opened. Example config with ST and Powerline +- .vimrc: Optional example vim config +- .Xdefaults: Optional example config. Edit terminal colours and urxvt settings when using Sway as window manager +- .xinitrc: Optional example config. Runs on X server startup and starts I3 +- .Xresources: Optional example config. Edit terminal colours and urxvt settings when using I3 as window manager +### Configuration +- GTK theme: If certain colours aren't to your liking, you can `` grep -rl "old_string" . | xargs sed -i 's/old_string/new_string/g' `` to replace specific colour codes quickly. If you go this route you might want to do this to the source, since the original theme has more different colours. +- Spotify: Manually edit ./config/spicetify/Themes/Base/color.ini +- Discord: There is an online editor to edit all the themes +- Polybar comes bundled with various modules. Check out their for more info. Also check out the readme of polybar-themes if you are using I3. +- Picom can be turned on to enable transparency for I3 + +## Installation +### Copying files +All the files go into your home directory, except for: +- /etc/logid.conf +- /usr/share/themes/UltimateBlack-0.1 + +If using polybar-themes, install it from the original source first to get all their dependencies and fonts. Then you can overwrite their files with the included ones. + +The BetterDiscord files should be copied over after running ``betterdiscordctl install`` +### Apply Theme +- GTK: Run lxappearance and/or gnome-tweaks and select the included theme +- Spotify: + - Run ``spicetify`` once to generate a config file + - Run ``spicetify backup apply enable-devtool`` to backup the default theme + - Run ``spicetify config current_theme Base`` to set the current theme to the one we provide + - Run ``spicetify apply`` and restart spotify +- Discord: After running ``betterdiscordctl install`` go into the newly added Better Discord entry in the settings menu. +- GDM: Run ``gnomeconf2gdm`` (from gdm-tools-git) after applying the GTK theme to set the colour scheme of the login screen +### Notes +- Certain GTK programs, like Gimp and Firefox, might have to be set to follow the system theme from their settings +- A modified version of console-solarized-git is coming in order to modify the Linux shell colours to match our theme. + +## Screenshots + +### I3 with Polybar + + +### Sway with Waybar -Theme can be installed using lxappearance and/or gnome-tweaks -![code](https://user-images.githubusercontent.com/9502378/125764128-5e321f60-e452-4bbe-be1f-3d915c6d1b01.png) -![explorer](https://user-images.githubusercontent.com/9502378/125764131-4e612ebb-5fda-42d7-853a-79c089b19c92.png) -![launcher](https://user-images.githubusercontent.com/9502378/125764135-26c7a1d6-4405-4aee-882a-a9b0ce911b70.png) -![terminals](https://user-images.githubusercontent.com/9502378/125764138-bcd81fc3-7cc2-4a29-a1ac-1d66dab3458f.png)