Skip to content

Commit 2dd4839

Browse files
committed
move keyboard layout switch stuff to x init file
1 parent 84381b2 commit 2dd4839

File tree

3 files changed

+26
-18
lines changed

3 files changed

+26
-18
lines changed

.config/nvim/init.vim

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ call plug#begin('~/.config/nvim/plugged')
6666
Plug 'neoclide/coc.nvim', {'branch': 'release'}
6767
Plug 'jiangmiao/auto-pairs', {'branch': 'master'}
6868
" jedi conflicts with Coc. Therefore when opening a .py file, do :CocDisable
69-
Plug 'davidhalter/jedi-vim', {'branch': 'master'}
69+
"Plug 'davidhalter/jedi-vim', {'branch': 'master'}
7070
"Plug 'neoclide/coc-jedi', {'do': 'yarn install'}
7171
Plug 'sirver/UltiSnips', {'branch': 'master'}
7272
Plug 'vim-airline/vim-airline'
@@ -97,6 +97,7 @@ call plug#begin('~/.config/nvim/plugged')
9797
Plug 'cocopon/iceberg.vim'
9898
Plug 'shadorain/shadotheme'
9999
Plug 'axvr/photon.vim'
100+
Plug 'vimwiki/vimwiki'
100101
call plug#end()
101102

102103

@@ -114,7 +115,7 @@ let g:jedi#use_tabs_not_buffers = 1
114115
"jedi for splits
115116
let g:jedi#use_splits_not_buffers = "left"
116117
" disable Coc on Python file startup because it conflicts with Jedi
117-
au BufEnter *.py CocDisable
118+
"au BufEnter *.py CocDisable
118119
" --> UltiSnips
119120
let g:UltiSnipsExpandTrigger="<c-e>"
120121
let g:UltiSnipsJumpForwardTrigger="<c-b>"
@@ -181,7 +182,7 @@ let g:mkdp_refresh_slow = 0
181182
let g:mkdp_command_for_global = 0
182183
let g:mkdp_open_to_the_world = 0
183184
let g:mkdp_open_ip = '127.0.0.1'
184-
let g:mkdp_browser = 'Brave'
185+
let g:mkdp_browser = 'brave'
185186
let g:mkdp_echo_preview_url = 0
186187
let g:mkdp_browserfunc = ''
187188
let g:mkdp_preview_options = {
@@ -218,11 +219,11 @@ endif
218219
"-------------------------------------------------------------------
219220
" Colours
220221
"-------------------------------------------------------------------
221-
colorscheme archery
222-
hi Normal guibg=NONE ctermbg=NONE
223-
let g:airline_theme='iceberg'
222+
colorscheme orbital
223+
"hi Normal guibg=NONE ctermbg=NONE
224+
let g:airline_theme='orbital'
224225
" remove background set by the colorscheme
225-
hi Normal ctermbg=None
226+
"hi Normal ctermbg=None
226227

227228

228229
" Custom commands

.xinitrc

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22

3+
# map caps lock to escape
4+
setxkbmap -option caps:escape
5+
#feh --bg-scale ~/Pictures/wallpapers/23493284932842384.jpg
6+
# switch layout with shift+alt
37
setxkbmap -option grp:alt_shift_toggle gb,gr
8+
9+
exec i3

README.md

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
### :large_orange_diamond: About
2-
This repo contains all (working and tested) dotfiles for my Linux setups. The files in the root of this repo should correspond to your home folder. For example, the `.bash` directory should correspond to `~/.bash` in your machine.
2+
This repo contains all (working and tested) dotfiles for my Linux setups.
3+
My setup uses Xorg so note that if you're using Wayland.
4+
The files in the root of this repo should correspond to your home folder.
5+
For example, the `.bash` directory should correspond to `~/.bash` in your machine.
36

47
### :large_orange_diamond: Managing the dotfiles
58

6-
It's recommended to manage them with the `stow` package. `stow` manages and creates symlinks. By using `stow` you won't have to copy your local dotfiles to your git repository every time you want to make changes. To install `stow` in Arch:
7-
```
8-
sudo pacman -S stow
9-
```
10-
To install it in Ubuntu:
11-
```
12-
sudo apt-get install stow
13-
```
9+
It's recommended to manage them with the `stow` package. `stow` manages and creates symlinks. By using `stow` you won't have to copy your local dotfiles to your git repository every time you want to make changes. To install `stow`:
10+
11+
| Arch | Ubuntu |
12+
|-----------------------|-----------------------------|
13+
| `sudo pacman -S stow` | `sudo apt-get install stow` |
14+
15+
1416
`stow`'s workflow is:
1517
1. Clone your dotfiles in some location (to a workspace)
1618
2. Use stow to create symlinks from your workspace (e.g. `~/Documents`) to `~`
1719
3. When you edit your dotfiles in the workspace, those in `~` will be symlinked to your workspace therefore automatically updated.
1820
4. When you're done with editing the files in the workspace and you've tested them, you're ready to commit on git!
19-
2021
```
2122
cd ~/Documents
2223
git clone [email protected]:leonmavr/dotfiles.git

0 commit comments

Comments
 (0)