From e06327a1880cd3e941fc7a2d63524a9d4c5fc7bd Mon Sep 17 00:00:00 2001 From: Max Richter Date: Mon, 25 Oct 2021 17:44:21 +0000 Subject: [PATCH] feat: add i3 config --- configs/.bashrc | 5 - configs/.zshrc | 1 + configs/i3.conf | 218 +++++++++++++++++++++++++++++++++ configs/i3status.conf | 53 ++++++++ configs/init.lua | 64 ++-------- configs/lua/install-packer.lua | 7 ++ configs/lua/install-paq.lua | 7 -- configs/lua/plugins.lua | 57 +++++++++ install.sh | 0 9 files changed, 344 insertions(+), 68 deletions(-) create mode 100644 configs/i3.conf create mode 100644 configs/i3status.conf create mode 100644 configs/lua/install-packer.lua delete mode 100644 configs/lua/install-paq.lua create mode 100644 configs/lua/plugins.lua mode change 100644 => 100755 install.sh diff --git a/configs/.bashrc b/configs/.bashrc index 44c31e2..815c248 100644 --- a/configs/.bashrc +++ b/configs/.bashrc @@ -112,9 +112,4 @@ if ! shopt -oq posix; then fi fi -export NVM_DIR="$HOME/.nvm" -[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm -[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion - -[[ -s "/home/jim/.gvm/scripts/gvm" ]] && source "/home/jim/.gvm/scripts/gvm" [ -z $DISPLAY ] && export DISPLAY=127.0.0.1:0.0 diff --git a/configs/.zshrc b/configs/.zshrc index c05e0c4..2cb1c87 100644 --- a/configs/.zshrc +++ b/configs/.zshrc @@ -34,6 +34,7 @@ source $HOME/.dotfiles/configs/zsh/aliases.sh ## LOADING PROGRAMS export PATH="$PATH:$HOME/bin" +export PATH="$PATH:/usr/sbin" ## Setup VIM export EDITOR="nvim" diff --git a/configs/i3.conf b/configs/i3.conf new file mode 100644 index 0000000..aef4272 --- /dev/null +++ b/configs/i3.conf @@ -0,0 +1,218 @@ +# This file has been auto-generated by i3-config-wizard(1). +# It will not be overwritten, so edit it as you like. +# +# Should you change your keyboard layout some time, delete +# this file and re-run i3-config-wizard(1). +# + +# i3 config file (v4) +# +# Please see https://i3wm.org/docs/userguide.html for a complete reference! + +set $mod Mod4 + +# Font for window titles. Will also be used by the bar unless a different font +# is used in the bar {} block below. +font pango:System San Francisco Display 10 + +# This font is widely installed, provides lots of unicode glyphs, right-to-left +# text rendering and scalability on retina/hidpi displays (thanks to pango). +#font pango:DejaVu Sans Mono 8 + +# The combination of xss-lock, nm-applet and pactl is a popular choice, so +# they are included here as an example. Modify as you see fit. + +# xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the +# screen before suspend. Use loginctl lock-session to lock your screen. +exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork + +# NetworkManager is the most popular way to manage wireless networks on Linux, +# and nm-applet is a desktop environment-independent system tray GUI for it. +exec --no-startup-id nm-applet + +# Use pactl to adjust volume in PulseAudio. +set $refresh_i3status killall -SIGUSR1 i3status +bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status +bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status +bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status +bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status + +# Use Mouse+$mod to drag floating windows to their wanted position +floating_modifier $mod + +# start a terminal +bindsym $mod+Return exec i3-sensible-terminal + +# kill focused window +bindsym $mod+Shift+q kill + +# start dmenu (a program launcher) +# bindcode $mod+40 exec "rofi -modi drun,run -show drun" +# There also is i3-dmenu-desktop which only displays applications shipping a +# .desktop file. It is a wrapper around dmenu, so you need that installed. +# bindcode $mod+40 exec --no-startup-id i3-dmenu-desktop + +# change focus +bindsym $mod+j focus left +bindsym $mod+k focus down +bindsym $mod+l focus up +bindsym $mod+semicolon focus right + +# alternatively, you can use the cursor keys: +bindsym $mod+Left focus left +bindsym $mod+Down focus down +bindsym $mod+Up focus up +bindsym $mod+Right focus right + +# move focused window +bindsym $mod+Shift+j move left +bindsym $mod+Shift+k move down +bindsym $mod+Shift+l move up +bindsym $mod+Shift+semicolon move right + +# alternatively, you can use the cursor keys: +bindsym $mod+Shift+Left move left +bindsym $mod+Shift+Down move down +bindsym $mod+Shift+Up move up +bindsym $mod+Shift+Right move right + +# split in horizontal orientation +bindsym $mod+h split h + +# split in vertical orientation +bindsym $mod+v split v + +# enter fullscreen mode for the focused container +bindsym $mod+f fullscreen toggle + +# change container layout (stacked, tabbed, toggle split) +bindsym $mod+s layout stacking +bindsym $mod+w layout tabbed +#bindsym $mod+e layout toggle split + +# toggle tiling / floating +bindsym $mod+Shift+space floating toggle + +# change focus between tiling / floating windows +bindsym $mod+space focus mode_toggle + +# focus the parent container +bindsym $mod+a focus parent + +# focus the child container +#bindsym $mod+d focus child + +# Define names for default workspaces for which we configure key bindings later on. +# We use variables to avoid repeating the names in multiple places. +set $ws1 "1:  Terminal" +set $ws2 "2:  FireFox" +set $ws3 "3" +set $ws4 "4" +set $ws5 "5" +set $ws6 "6" +set $ws7 "7" +set $ws8 "8" +set $ws9 "9" +set $ws10 "10" + +# switch to workspace +bindsym $mod+1 workspace number $ws1 +bindsym $mod+2 workspace number $ws2 +bindsym $mod+3 workspace number $ws3 +bindsym $mod+4 workspace number $ws4 +bindsym $mod+5 workspace number $ws5 +bindsym $mod+6 workspace number $ws6 +bindsym $mod+7 workspace number $ws7 +bindsym $mod+8 workspace number $ws8 +bindsym $mod+9 workspace number $ws9 +bindsym $mod+0 workspace number $ws10 + +# move focused container to workspace +bindsym $mod+Shift+1 move container to workspace number $ws1 +bindsym $mod+Shift+2 move container to workspace number $ws2 +bindsym $mod+Shift+3 move container to workspace number $ws3 +bindsym $mod+Shift+4 move container to workspace number $ws4 +bindsym $mod+Shift+5 move container to workspace number $ws5 +bindsym $mod+Shift+6 move container to workspace number $ws6 +bindsym $mod+Shift+7 move container to workspace number $ws7 +bindsym $mod+Shift+8 move container to workspace number $ws8 +bindsym $mod+Shift+9 move container to workspace number $ws9 +bindsym $mod+Shift+0 move container to workspace number $ws10 + +# reload the configuration file +bindsym $mod+Shift+c reload +# restart i3 inplace (preserves your layout/session, can be used to upgrade i3) +bindsym $mod+Shift+r restart +# exit i3 (logs you out of your X session) +bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'" + +# resize window (you can also use the mouse for that) +mode "resize" { + # These bindings trigger as soon as you enter the resize mode + + # Pressing left will shrink the window’s width. + # Pressing right will grow the window’s width. + # Pressing up will shrink the window’s height. + # Pressing down will grow the window’s height. + bindsym j resize shrink width 10 px or 10 ppt + bindsym k resize grow height 10 px or 10 ppt + bindsym l resize shrink height 10 px or 10 ppt + bindsym semicolon resize grow width 10 px or 10 ppt + + # same bindings, but for the arrow keys + bindsym Left resize shrink width 10 px or 10 ppt + bindsym Down resize grow height 10 px or 10 ppt + bindsym Up resize shrink height 10 px or 10 ppt + bindsym Right resize grow width 10 px or 10 ppt + + # back to normal: Enter or Escape or $mod+r + bindsym Return mode "default" + bindsym Escape mode "default" + bindsym $mod+r mode "default" +} + +set $bg-color #2f343f +set $inactive-bg-color #2f343f +set $text-color #f3f4f5 +set $inactive-text-color #676E7D +set $urgent-bg-color #E53935 + + +bindsym $mod+r mode "resize" + +# Start i3bar to display a workspace bar (plus the system information i3status +# finds out, if available) +# bar +bar { + status_command i3status + strip_workspace_numbers yes + colors { + background $bg-color + separator #757575 + # border background text + focused_workspace $bg-color $bg-color $text-color + inactive_workspace $inactive-bg-color $inactive-bg-color $inactive-text-color + urgent_workspace $urgent-bg-color $urgent-bg-color $text-color + } +} + +#bindsym $mod+d exec rofi -show run -lines 3 -hide-scrollbar 1 -opacity "50" -width 30 -theme Arc-Dark -font "System San Francisco Display 10" + +bindsym $mod+d exec dmenu_run + +bindsym $mod+Tab exec rofi -show window -lines 5 -opacity "50" -width 30 -theme Arc-Dark -font "System San Francisco Display 10" + +# Always set the keymap to de +exec_always "setxkbmap de" + +# Bind window+l to lock the screen +bindsym $mod+e exec nautilus + +exec_always feh --bg-scale /home/users/user/.customize/wallpapers/fakurian-design.jpg + +# window colors +# border background text indicator +client.focused $bg-color $bg-color $text-color #00ff00 +client.unfocused $inactive-bg-color $inactive-bg-color $inactive-text-color #00ff00 +client.focused_inactive $inactive-bg-color $inactive-bg-color $inactive-text-color #00ff00 +client.urgent $urgent-bg-color $urgent-bg-color $text-color #00ff00 diff --git a/configs/i3status.conf b/configs/i3status.conf new file mode 100644 index 0000000..bc92d61 --- /dev/null +++ b/configs/i3status.conf @@ -0,0 +1,53 @@ +# i3status configuration file. +# see "man i3status" for documentation. + +# It is important that this file is edited as UTF-8. +# The following line should contain a sharp s: +# ß +# If the above line is not correctly displayed, fix your editor first! + +general { + colors = true + interval = 2 +} + +# order += "ipv6" +# order += "wireless _first_" +order += "ethernet _first_" +# order += "battery all" +order += "disk /" +# order += "load" +order += "memory" +order += "tztime local" + +wireless _first_ { + format_up = "W: (%quality at %essid) %ip" + format_down = "W: down" +} + +ethernet _first_ { + format_up = "E: %ip (%speed)" + format_down = "E: down" +} + +battery all { + format = "%status %percentage %remaining" +} + +disk "/" { + format = "%avail" +} + +load { + format = "%1min" +} + +memory { + format = "%used | %available" + threshold_degraded = "1G" + format_degraded = "MEMORY < %available" +} + +tztime local { + format = "%Y-%m-%d %H:%M" +} diff --git a/configs/init.lua b/configs/init.lua index 157fb61..b4f1a4a 100644 --- a/configs/init.lua +++ b/configs/init.lua @@ -1,4 +1,4 @@ -require("install-paq") +require("install-packer") local u = require("utils") @@ -6,52 +6,7 @@ local o = vim.o local g = vim.g local cmd = vim.cmd -local paq = require("paq") -paq:setup { - "savq/paq-nvim", -- Let Paq manage itself - -- General Helper Function - "nvim-lua/plenary.nvim", - -- Theming Plugins - "kaicataldo/material.vim", - "xiyaowong/nvim-transparent", - -- Layout Plugins - --"preservim/nerdtree", - --"unkiwii/vim-nerdtree-sync", - "kyazdani42/nvim-web-devicons", - "kyazdani42/nvim-tree.lua", - "alexghergh/nvim-tmux-navigation", - -- Code Navigation - "dense-analysis/ale", - "nathanmsmith/nvim-ale-diagnostic", - "junegunn/fzf", - "nvim-lua/popup.nvim", - "nvim-telescope/telescope.nvim", - "windwp/nvim-autopairs", - -- For better git support - "tpope/vim-fugitive", - -- Postman like featuresi - "NTBBloodbath/rest.nvim", - -- Obsidian / Roam features - "lervag/wiki.vim", - -- Syntax / Autocomplete - "preservim/nerdcommenter", - "neovim/nvim-lspconfig", - "kabouzeid/nvim-lspinstall", - "nvim-lua/lsp-status.nvim", - "hrsh7th/nvim-cmp", -- Autocompletion plugin - "hrsh7th/cmp-nvim-lsp", -- LSP source for nvim-cmp - "weilbith/nvim-code-action-menu", - --"saadparwaiz1/cmp_luasnip", -- Snippets source for nvim-cmp - "L3MON4D3/LuaSnip", -- Snippets plugin - {"nvim-treesitter/nvim-treesitter", run = ":TSUpdate"}, - -- Formatting - --"mhartington/formatter.nvim", - -- Git Interface - "akinsho/nvim-toggleterm.lua", - -- Database Interface - "tpope/vim-dadbod", - "kristijanhusak/vim-dadbod-ui" -} +require ("plugins") if u.has_plugin("cmp") then -- Global options @@ -128,8 +83,6 @@ if u.has_plugin("cmp") then g.mapleader = " " require "keymappings" - require'nvim-tree'.setup {} - require "nvim-tmux-navigation".setup { keybindings = { left = "", @@ -174,10 +127,12 @@ if u.has_plugin("cmp") then require("nvim-tree").setup { auto_open = 1, gitignore = 1, - lsp_diagnostics = 1, group_empty = 1, - hide_root_folder = true, - view = { + diagnostics = { + enable = true + }, + view = { + hide_root_folder = true, winopts = { signcolumn = "no" } @@ -220,8 +175,5 @@ if u.has_plugin("cmp") then require "lsp-utils" else - paq.install() - paq.list() - print "Installed Packages" - -- u.ReloadConfig() + vim.cmd[[PackerSync]] end diff --git a/configs/lua/install-packer.lua b/configs/lua/install-packer.lua new file mode 100644 index 0000000..d67a631 --- /dev/null +++ b/configs/lua/install-packer.lua @@ -0,0 +1,7 @@ +local fn = vim.fn + +local install_path = fn.stdpath('data') .. '/site/pack/packer/start/packer.nvim' + +if fn.empty(fn.glob(install_path)) > 0 then + fn.system({'git', 'clone', '--depth=1', 'https://github.com/wbthomason/packer.nvim', install_path}) +end diff --git a/configs/lua/install-paq.lua b/configs/lua/install-paq.lua deleted file mode 100644 index b661023..0000000 --- a/configs/lua/install-paq.lua +++ /dev/null @@ -1,7 +0,0 @@ -local fn = vim.fn - -local install_path = fn.stdpath('data') .. '/site/pack/paqs/start/paq-nvim' - -if fn.empty(fn.glob(install_path)) > 0 then - fn.system({'git', 'clone', '--depth=1', 'https://github.com/savq/paq-nvim.git', install_path}) -end \ No newline at end of file diff --git a/configs/lua/plugins.lua b/configs/lua/plugins.lua new file mode 100644 index 0000000..6053057 --- /dev/null +++ b/configs/lua/plugins.lua @@ -0,0 +1,57 @@ +return require("packer").startup(function() + + -- Let packer manage itself + use "wbthomason/packer.nvim" + + -- General Helper Functions + use "nvim-lua/plenary.nvim" + + use "alexghergh/nvim-tmux-navigation" + + -- Theming Section + use "kaicataldo/material.vim" + use "xiyaowong/nvim-transparent" + + -- Layout Plugins + use "kyazdani42/nvim-web-devicons" + use "kyazdani42/nvim-tree.lua" + use "nvim-lua/popup.nvim" + + -- Code Navigation + use "dense-analysis/ale" + use "nathanmsmith/nvim-ale-diagnostic" + use "junegunn/fzf" + use "nvim-telescope/telescope.nvim" + + -- Postman like features + use "NTBBloodbath/rest.nvim" + + -- Obsidian / Roam like features + use "lervag/wiki.vim" + + -- Syntax / Autocomplete + use "preservim/nerdcommenter" + use "neovim/nvim-lspconfig" + use "kabouzeid/nvim-lspinstall" + use "nvim-lua/lsp-status.nvim" + use "hrsh7th/nvim-cmp" + use "hrsh7th/cmp-nvim-lsp" + use "weilbith/nvim-code-action-menu" -- Need to find better alternative + use "L3MON4D3/LuaSnip" + use "windwp/nvim-autopairs" + use { + 'nvim-treesitter/nvim-treesitter', + run = ':TSUpdate' + } + + -- Formatting + use "mhartington/formatter.nvim" + + -- General Popup Window + use "akinsho/nvim-toggleterm.lua" + + -- Database Feature + use "tpope/vim-dadbod" + use "kristijanhusak/vim-dadbod-ui" + +end) diff --git a/install.sh b/install.sh old mode 100644 new mode 100755