From 02fa1a9b396833cdeed8f413fedce186db479e3c Mon Sep 17 00:00:00 2001 From: MoritzBoehme Date: Sun, 5 Sep 2021 17:02:11 +0200 Subject: [PATCH] changed structure --- config/bspwm/bspwmrc | 3 +- config/git/config | 5 -- config/gtk-3.0/settings.ini | 15 ---- config/kitty/dracula.conf | 59 --------------- config/kitty/kitty.conf | 16 ---- config/packagelist.txt | 48 ------------ config/rofi/config.rasi | 6 -- config/rofi/dracula.rasi | 122 ------------------------------ config/starship.toml | 3 - config/yadm/bootstrap | 11 --- config/yadm/config | 3 - config/zathura/zathurarc | 57 -------------- config/zsh/.zshrc | 36 --------- configuration.nix | 101 ------------------------- home.nix | 143 ------------------------------------ 15 files changed, 1 insertion(+), 627 deletions(-) delete mode 100644 config/git/config delete mode 100644 config/gtk-3.0/settings.ini delete mode 100755 config/kitty/dracula.conf delete mode 100755 config/kitty/kitty.conf delete mode 100644 config/packagelist.txt delete mode 100755 config/rofi/config.rasi delete mode 100755 config/rofi/dracula.rasi delete mode 100644 config/starship.toml delete mode 100755 config/yadm/bootstrap delete mode 100644 config/yadm/config delete mode 100644 config/zathura/zathurarc delete mode 100755 config/zsh/.zshrc delete mode 100644 configuration.nix delete mode 100644 home.nix diff --git a/config/bspwm/bspwmrc b/config/bspwm/bspwmrc index 1feff05..50bd58f 100755 --- a/config/bspwm/bspwmrc +++ b/config/bspwm/bspwmrc @@ -32,5 +32,4 @@ bspc rule -a Emacs state=tiled wmname LG3D # AUTOSTART # -feh --bg-fill ~/Pictures/Wallpapers/dracula.png -[[ ! $(pidof -x cloud-drive-daemon) ]] && synology-drive & +[[ ! $(pidof -x sxhkd) ]] && sxhkd & diff --git a/config/git/config b/config/git/config deleted file mode 100644 index d395dd7..0000000 --- a/config/git/config +++ /dev/null @@ -1,5 +0,0 @@ -[user] - email = mail@moritzboeh.me - name = Moritz -[core] - editor = vim diff --git a/config/gtk-3.0/settings.ini b/config/gtk-3.0/settings.ini deleted file mode 100644 index ebd8b36..0000000 --- a/config/gtk-3.0/settings.ini +++ /dev/null @@ -1,15 +0,0 @@ -[Settings] -gtk-theme-name=dracula -gtk-icon-theme-name=dracula-icons -gtk-font-name=Cantarell 11 -gtk-cursor-theme-name=Adwaita -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/config/kitty/dracula.conf b/config/kitty/dracula.conf deleted file mode 100755 index bcf5a1e..0000000 --- a/config/kitty/dracula.conf +++ /dev/null @@ -1,59 +0,0 @@ -# https://draculatheme.com/kitty -# -# Installation instructions: -# -# cp dracula.conf ~/.config/kitty/ -# echo "include dracula.conf" >> ~/.config/kitty/kitty.conf -# -# Then reload kitty for the config to take affect. -# Alternatively copy paste below directly into kitty.conf - -foreground #f8f8f2 -background #282a36 -#background #000000 -selection_foreground #44475a -selection_background #f8f8f2 - -url_color #ffb86c - -# black -color0 #21222c -color8 #6272a4 - -# red -color1 #ff5555 -color9 #ff6e6e - -# green -color2 #50fa7b -color10 #69ff94 - -# yellow -color3 #f1fa8c -color11 #ffffa5 - -# blue -color4 #bd93f9 -color12 #d6acff - -# magenta -color5 #ff79c6 -color13 #ff92df - -# cyan -color6 #8be9fd -color14 #a4ffff - -# white -color7 #f8f8f2 -color15 #ffffff - -# Cursor colors -cursor #6272a4 -cursor_text_color background - -# Tab bar colors -active_tab_foreground #44475a -active_tab_background #f8f8f2 -inactive_tab_foreground #282a36 -inactive_tab_background #6272a4 diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf deleted file mode 100755 index c0c6c1c..0000000 --- a/config/kitty/kitty.conf +++ /dev/null @@ -1,16 +0,0 @@ -font_family FiraCode Nerd Font - -font_size 10 - -window_padding_width 3 - -adjust_line_height 105% - -cursor_shape underline - -scrollback_lines 10000 - -editor vim -close_on_child_death no - -include ~/.config/kitty/dracula.conf diff --git a/config/packagelist.txt b/config/packagelist.txt deleted file mode 100644 index ff13c99..0000000 --- a/config/packagelist.txt +++ /dev/null @@ -1,48 +0,0 @@ -anki -aspell-de -aspell-en -bat -bpytop -bspwm -cbonsai -cmake -dracula-gtk-theme -dunst -emacs -fd -filelight -firefox -flameshot -grub -jq -kitty -man-db -mtr -neofetch -nerd-fonts-fira-code -nerd-fonts-noto-sans-regular-complete -opennic-up -pavucontrol -picom-jonaburg-git -playerctl -polybar -ranger -rofi -rofi-calc -shellcheck -signal-desktop -spotify -starship -synology-drive -texlive-bibtexextra -texlive-fontsextra -texlive-formatsextra -texlive-science -ufw -vim -wmname -xorg-init -yadm -yay -zsh-autosuggestions -zhs-syntax-highlighting diff --git a/config/rofi/config.rasi b/config/rofi/config.rasi deleted file mode 100755 index 8aa9606..0000000 --- a/config/rofi/config.rasi +++ /dev/null @@ -1,6 +0,0 @@ -configuration { - modi: "window,drun,ssh,combi"; - font: "FiraCode Nerd Font 14444"; - combi-modi: "window,drun,ssh"; - theme: "~/.config/rofi/dracula.rasi"; -} diff --git a/config/rofi/dracula.rasi b/config/rofi/dracula.rasi deleted file mode 100755 index 5eec02c..0000000 --- a/config/rofi/dracula.rasi +++ /dev/null @@ -1,122 +0,0 @@ -/*Dracula theme based on the Purple official rofi theme*/ - -* { - font: "Jetbrains Mono 12"; - foreground: #f8f8f2; - background-color: #282a36; - active-background: #6272a4; - urgent-background: #ff5555; - selected-background: @active-background; - selected-urgent-background: @urgent-background; - selected-active-background: @active-background; - separatorcolor: @active-background; - bordercolor: @active-background; -} - -#window { - background-color: @background; - border: 1; - border-radius: 0; - border-color: @bordercolor; - padding: 5; -} -#mainbox { - border: 0; - padding: 0; -} -#message { - border: 1px dash 0px 0px ; - border-color: @separatorcolor; - padding: 1px ; -} -#textbox { - text-color: @foreground; -} -#listview { - fixed-height: 0; - border: 2px dash 0px 0px ; - border-color: @bordercolor; - spacing: 2px ; - scrollbar: false; - padding: 2px 0px 0px ; -} -#element { - border: 0; - padding: 1px ; -} -#element.normal.normal { - background-color: @background; - text-color: @foreground; -} -#element.normal.urgent { - background-color: @urgent-background; - text-color: @urgent-foreground; -} -#element.normal.active { - background-color: @active-background; - text-color: @foreground; -} -#element.selected.normal { - background-color: @selected-background; - text-color: @foreground; -} -#element.selected.urgent { - background-color: @selected-urgent-background; - text-color: @foreground; -} -#element.selected.active { - background-color: @selected-active-background; - text-color: @foreground; -} -#element.alternate.normal { - background-color: @background; - text-color: @foreground; -} -#element.alternate.urgent { - background-color: @urgent-background; - text-color: @foreground; -} -#element.alternate.active { - background-color: @active-background; - text-color: @foreground; -} -#scrollbar { - width: 2px ; - border: 0; - handle-width: 8px ; - padding: 0; -} -#sidebar { - border: 2px dash 0px 0px ; - border-color: @separatorcolor; -} -#button.selected { - background-color: @selected-background; - text-color: @foreground; -} -#inputbar { - spacing: 0; - text-color: @foreground; - padding: 1px ; -} -#case-indicator { - spacing: 0; - text-color: @foreground; -} -#entry { - spacing: 0; - text-color: @foreground; -} -#prompt { - spacing: 0; - text-color: @foreground; -} -#inputbar { - children: [ prompt,textbox-prompt-colon,entry,case-indicator ]; -} -#textbox-prompt-colon { - expand: false; - str: ":"; - margin: 0px 0.3em 0em 0em ; - text-color: @foreground; -} diff --git a/config/starship.toml b/config/starship.toml deleted file mode 100644 index 6a31abf..0000000 --- a/config/starship.toml +++ /dev/null @@ -1,3 +0,0 @@ -[character] -success_symbol = "[ ](bold green)" -error_symbol = "[ ](bold red)" diff --git a/config/yadm/bootstrap b/config/yadm/bootstrap deleted file mode 100755 index 1d68377..0000000 --- a/config/yadm/bootstrap +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -# Because Git submodule commands cannot operate without a work tree, they must -# be run from within $HOME (assuming this is the root of your dotfiles) -cd "$HOME" - -echo "Init submodules" -yadm submodule update --recursive --init - -echo "Updating the yadm repo origin URL" -yadm remote set-url origin "git@github.com:MoritzBoehme/dotfiles.git" diff --git a/config/yadm/config b/config/yadm/config deleted file mode 100644 index 425ef3e..0000000 --- a/config/yadm/config +++ /dev/null @@ -1,3 +0,0 @@ -[user] - email = mail@moritzboeh.me - name = Moritz Böhme diff --git a/config/zathura/zathurarc b/config/zathura/zathurarc deleted file mode 100644 index 1d04687..0000000 --- a/config/zathura/zathurarc +++ /dev/null @@ -1,57 +0,0 @@ -set window-title-basename "true" -set selection-clipboard "clipboard" - -# Dracula color theme for Zathura -# Swaps Foreground for Background to get a light version if the user prefers - -# -# Dracula color theme -# - -set notification-error-bg "#ff5555" # Red -set notification-error-fg "#f8f8f2" # Foreground -set notification-warning-bg "#ffb86c" # Orange -set notification-warning-fg "#44475a" # Selection -set notification-bg "#282a36" # Background -set notification-fg "#f8f8f2" # Foreground - -set completion-bg "#282a36" # Background -set completion-fg "#6272a4" # Comment -set completion-group-bg "#282a36" # Background -set completion-group-fg "#6272a4" # Comment -set completion-highlight-bg "#44475a" # Selection -set completion-highlight-fg "#f8f8f2" # Foreground - -set index-bg "#282a36" # Background -set index-fg "#f8f8f2" # Foreground -set index-active-bg "#44475a" # Current Line -set index-active-fg "#f8f8f2" # Foreground - -set inputbar-bg "#282a36" # Background -set inputbar-fg "#f8f8f2" # Foreground -set statusbar-bg "#282a36" # Background -set statusbar-fg "#f8f8f2" # Foreground - -set highlight-color "#ffb86c" # Orange -set highlight-active-color "#ff79c6" # Pink - -set default-bg "#282a36" # Background -set default-fg "#f8f8f2" # Foreground - -set render-loading true -set render-loading-fg "#282a36" # Background -set render-loading-bg "#f8f8f2" # Foreground - -# -# Recolor mode settings -# - -set recolor-lightcolor "#282a36" # Background -set recolor-darkcolor "#f8f8f2" # Foreground - -# -# Startup options -# -set adjust-open width -set recolor true -set synctex true diff --git a/config/zsh/.zshrc b/config/zsh/.zshrc deleted file mode 100755 index b352ec1..0000000 --- a/config/zsh/.zshrc +++ /dev/null @@ -1,36 +0,0 @@ -# Use powerline -USE_POWERLINE="true" -SAVEHIST=1000 -HISTFILE=$XDG_CONFIG_HOME/zsh/.zsh_history - -# if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then -# cbonsai -lp -t 0.005 -m "Welcome back" -# sleep 2 -# startx &>/dev/null -# fi - -if [ -d "$HOME/bin" ]; then - export PATH="$HOME/bin:$PATH" - chmod u+x $HOME/bin/* -fi - -export EMACSDIR="$XDG_CONFIG_HOME/emacs" -if [ -d "$XDG_CONFIG_HOME/emacs/bin" ]; then - export PATH="$XDG_CONFIG_HOME/emacs/bin:$PATH" -fi - -autoload -Uz compinit -compinit - -source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh -source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh - -source /usr/share/doc/pkgfile/command-not-found.zsh - -alias ls='exa -lh' -alias cat='bat' -alias diff='diff --color=auto' -alias grep='grep --color=auto' -alias ip='ip -color=auto' - -eval "$(LC_ALL="en_US.UTF-8" starship init zsh)" diff --git a/configuration.nix b/configuration.nix deleted file mode 100644 index 9df7d55..0000000 --- a/configuration.nix +++ /dev/null @@ -1,101 +0,0 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). - -{ config, pkgs, ... }: - -{ - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ]; - - # BOOT - boot = { - loader = { - grub = { - enable = true; - version = 2; - device = "nodev"; - efiSupport = true; - }; - efi.canTouchEfiVariables = true; - }; - }; - - # NETWORKING - networking = { - hostName = "nixos"; - networkmanager.enable = true; - - useDHCP = false; - interfaces.enp0s3.useDHCP = true; - }; - - # LOCALS - i18n.defaultLocale = "en_US.UTF-8"; - console = { - font = "Lat2-Terminus16"; - keyMap = "de"; - }; - time.timeZone = "Europe/Berlin"; - - # SERVICES - services = { - xserver = { - enable = true; - layout = "de"; - - displayManager = { - defaultSession = "none+bspwm"; - - autoLogin = { - enable = true; - user = "moritz"; - }; - lightdm = { - enable = true; - }; - }; - - windowManager.bspwm.enable = true; - }; - printing.enable = true; - }; - # HOMEMANAGER - - # Enable sound. - sound.enable = true; - hardware.pulseaudio.enable = true; - - # USERS - users.users.moritz = { - shell = pkgs.zsh; - isNormalUser = true; - home = "/home/moritz"; - extraGroups = [ "wheel" "networkmanager" "video" ]; # Enable ‘sudo’ for the user. - }; - - fonts.fonts = with pkgs; [ - (nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" ];}) - ]; - - # PACKAGES - environment.systemPackages = with pkgs; [ - vim - wget - firefox - st - git - ]; - - # This value determines the NixOS release from which the default - # settings for stateful data, like file locations and database versions - # on your system were taken. It‘s perfectly fine and recommended to leave - # this value at the release version of the first install of this system. - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "21.05"; # Did you read the comment? - -} - diff --git a/home.nix b/home.nix deleted file mode 100644 index 18af957..0000000 --- a/home.nix +++ /dev/null @@ -1,143 +0,0 @@ -{ config, pkgs, ... }: - -{ - # Let Home Manager install and manage itself. - programs.home-manager.enable = true; - - # Home Manager needs a bit of information about you and the - # paths it should manage. - home.username = "moritz"; - home.homeDirectory = "/home/moritz"; - - programs.git = { - enable = true; - userName = "MoritzBoehme"; - userEmail = "mr.x@moritzboeh.me"; - }; - - # Zathura - programs.zathura = { - enable = true; - options = { - recolor = true; - completion-bg = "#282a36"; - completion-fg = "#ff79c6"; - default-bg = "#44475a"; - default-fg = "#bd93f9"; - inputbar-bg = "#282a36"; - inputbar-fg = "#8be9fd"; - statusbar-bg = "#282a36"; - statusbar-fg = "#bd93f9"; - font = "Jetbrains Mono 9"; - recolor-lightcolor = "#282a36"; - recolor-darkcolor = "#f8f8f2"; - }; - }; - - # Zsh - programs.zsh = { - enable = true; - - shellGlobalAliases = { - ls = "exa -lh"; - cat = "bat"; - }; - - plugins = [ - { - name = "zsh-autosuggestions"; - src = pkgs.fetchFromGitHub { - owner = "zsh-users"; - repo = "zsh-autosuggestions"; - rev = "v0.4.0"; - sha256 = "0z6i9wjjklb4lvr7zjhbphibsyx51psv50gm07mbb0kj9058j6kc"; - }; - } - { - name = "zsh-syntax-highlighting"; - src = pkgs.fetchFromGitHub { - owner = "zsh-users"; - repo = "zsh-syntax-highlighting"; - rev = "0e1bb14452e3fc66dcc81531212e1061e02c1a61"; - sha256 = "09ncmyqlk9a3h470z0wgbkrznb5zyc9dj96011wm89rdxc1irxk2"; - }; - } - ]; - }; - - # Kitty - programs.kitty = { - enable = true; - settings = { - scrollback_lines = 10000; - enable_audio_bell = false; - cursor_shape = "underline"; - }; - extraConfig = builtins.readFile .config/kitty/dracula.conf; - font = { - name = "FiraCode Nerd Font"; - size = 10; - }; - }; - - programs.exa.enable = true; - programs.bat.enable = true; - - programs.starship = { - enable = true; - enableZshIntegration = true; - }; - - services.polybar = { - enable = true; - script = '' - # Terminate already running bar instances - killall -q polybar - - # Wait until the processes have been shut down - while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done - while ! pgrep -x bspwm >/dev/null; do sleep 1; done - - # Launch Polybar - for m in $(polybar --list-monitors | cut -d":" -f1); do - MONITOR=$m polybar --reload bottom & - done - ''; - config = { - "bar/bottom" = { - monitor = "\${env:MONITOR}"; - bottom = true; - fixed-center = true; - width = "100%"; - height = 25; - background = "\${color.background-alt}"; - foreground = "\${color.foreground}"; - line-size = 3; - border-size = 0; - padding-left = 1; - padding-right = 1; - module-margin-left = 3; - module-margin-right = 3; - font-0 = "NotoSans Nerd Font:size=11;0"; - modules-left = "cpu memory wlan eth battery"; - modules-center = "bspwm"; - modules-right = "pulseaudio date powermenu"; - tray-position = "right"; - tray-background = "\${color.background-alt}"; - tray-padding = 2; - wm-restack = "bspwm"; - cursor-click = "pointer"; - }; - }; - }; - - # This value determines the Home Manager release that your - # configuration is compatible with. This helps avoid breakage - # when a new Home Manager release introduces backwards - # incompatible changes. - # - # 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 = "21.05"; -}