Compare commits

...

6 Commits

6 changed files with 264 additions and 240 deletions

15
.editorconfig Normal file
View File

@ -0,0 +1,15 @@
root = true
[*]
# Future: https://github.com/editorconfig/editorconfig/issues/89
end_of_line = lf
trim_trailing_whitespace = true
insert_final_newline = true
charset = utf-8
# Accessibility reasons. Vim: :%retab! (note also :set ts=4)
indent_style = tab
indent_size = tab
#tab_width =
[*.{reg,bat,ahk}]
end_of_line = crlf

View File

@ -1,70 +1,70 @@
[user] [user]
name = Aminda Suomalainen name = Aminda Suomalainen
email = suomalainen+git@mikaela.info email = suomalainen+git@mikaela.info
# Aminda Suomalainen FINEID 20.12.2021-20.12.2026 # Aminda Suomalainen FINEID 20.12.2021-20.12.2026
signingkey = ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCuq/w936y0Enjg7e+t27p6Hwj7RJpuDdhjV/FeikCitey23dx72yIFe3giHW10eBKHr0lhWbDhm2m0b74ZNKneR+oJ99Kl98KegGwjS/gRcjYILHWBJBCF7y61XNeJTlehEZ4zAXS3zLGaZ6DUWY3aqoMkoiAFDdHEAu5EfYITybR+eQZNiGOLVpEVC96bSgGYl4BtUjLib8YCkznllo1hbQWOJSeftIkCJj/XcOvX5kIHsnTMdkgPVd+JhBJ1ReYLf4mBYA0BVTBbHJVrMajz77Oo4iZua3XDw3RF9cekAHjh+x/zZntwiRu0k51xI0mX5nr9SsuiQccD/fxwCoI9P1u2xZHFthiHl4MxUvTRDuBTz8bktdUruqxJP+ZkKZmuozLhP738m+9nMRiavSJm0RQGDUMXfHoJ8+9VVB4uZRZq9Hprt7ReCYobgRaq4220Cpg/WADcm13o0jp0PKOl2uiS6MdIbReiLGJVf/XxeNun43K1+osv/Ermy6qL5WM= signingkey = ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCuq/w936y0Enjg7e+t27p6Hwj7RJpuDdhjV/FeikCitey23dx72yIFe3giHW10eBKHr0lhWbDhm2m0b74ZNKneR+oJ99Kl98KegGwjS/gRcjYILHWBJBCF7y61XNeJTlehEZ4zAXS3zLGaZ6DUWY3aqoMkoiAFDdHEAu5EfYITybR+eQZNiGOLVpEVC96bSgGYl4BtUjLib8YCkznllo1hbQWOJSeftIkCJj/XcOvX5kIHsnTMdkgPVd+JhBJ1ReYLf4mBYA0BVTBbHJVrMajz77Oo4iZua3XDw3RF9cekAHjh+x/zZntwiRu0k51xI0mX5nr9SsuiQccD/fxwCoI9P1u2xZHFthiHl4MxUvTRDuBTz8bktdUruqxJP+ZkKZmuozLhP738m+9nMRiavSJm0RQGDUMXfHoJ8+9VVB4uZRZq9Hprt7ReCYobgRaq4220Cpg/WADcm13o0jp0PKOl2uiS6MdIbReiLGJVf/XxeNun43K1+osv/Ermy6qL5WM=
#signingkey = ~/.ssh/id_ed25519.pub #signingkey = ~/.ssh/id_ed25519.pub
##wtop ##wtop
#email = mikaela+digitalents@mikaela.info #email = mikaela+digitalents@mikaela.info
#signingkey = 0xDF046339D69EB8C9 #signingkey = 0xDF046339D69EB8C9
[alias] [alias]
cleandi = clean -di cleandi = clean -di
cleandix = clean -dix cleandix = clean -dix
# From http://progit.org/book/ch2-7.html # From http://progit.org/book/ch2-7.html
last = cat-file commit HEAD last = cat-file commit HEAD
mergen = merge --no-ff mergen = merge --no-ff
pulln = pull --no-ff pulln = pull --no-ff
pullen = pull --no-ff pullen = pull --no-ff
verify = verify-commit HEAD verify = verify-commit HEAD
[core] [core]
editor = vim editor = vim
autocrlf = input autocrlf = input
[color] [color]
# From git manpage and http://book.git-scm.com/5_customizing_git.html # From git manpage and http://book.git-scm.com/5_customizing_git.html
branch = true branch = true
diff = true diff = true
grep = true grep = true
interactive = true interactive = true
pager = true pager = true
showbranch = true showbranch = true
status = true status = true
ui = true ui = true
[push] [push]
default = current default = current
gpgSign = if-asked gpgSign = if-asked
autoSetupRemote = true autoSetupRemote = true
recurseSubmodules = on-demand recurseSubmodules = on-demand
[credential] [credential]
helper = cache --timeout=86400 helper = cache --timeout=86400
[merge] [merge]
ff = only ff = only
[format] [format]
signOff = true signOff = true
[commit] [commit]
gpgsign = true gpgsign = true
[diff] [diff]
compactionHeuristic = true compactionHeuristic = true
[pager] [pager]
# log = diff-highlight | less # log = diff-highlight | less
# show = diff-highlight | less # show = diff-highlight | less
# diff = diff-highlight | less # diff = diff-highlight | less
[interactive] [interactive]
# diffFilter = diff-highlight # diffFilter = diff-highlight
[gpg] [gpg]
format = ssh format = ssh
[tag] [tag]
forceSignAnnotated = true forceSignAnnotated = true
[pull] [pull]
ff = only ff = only
[init] [init]
defaultBranch = cxefa defaultBranch = cxefa
[gpg "ssh"] [gpg "ssh"]
allowedSignersFile = ~/src/gitea.blesmrt.net/Mikaela/ssh-allowed_signers/allowed_signers allowedSignersFile = ~/src/gitea.blesmrt.net/Mikaela/ssh-allowed_signers/allowed_signers
[advice] [advice]
# I am not developing in detached head state, I generally want to compile # I am not developing in detached head state, I generally want to compile
# a specific version of a program and I know how to get out of it # a specific version of a program and I know how to get out of it
detachedHead = false detachedHead = false
[filter "lfs"] [filter "lfs"]
clean = git-lfs clean -- %f clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f smudge = git-lfs smudge -- %f

4
Windows/.editorconfig Normal file
View File

@ -0,0 +1,4 @@
root = false
[*]
end_of_line = crlf

View File

@ -1,70 +1,70 @@
[user] [user]
#name = Aminda Suomalainen #name = Aminda Suomalainen
#email = suomalainen+git@mikaela.info #email = suomalainen+git@mikaela.info
# Aminda Suomalainen FINEID 20.12.2021-20.12.2026 # Aminda Suomalainen FINEID 20.12.2021-20.12.2026
#signingkey = ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCuq/w936y0Enjg7e+t27p6Hwj7RJpuDdhjV/FeikCitey23dx72yIFe3giHW10eBKHr0lhWbDhm2m0b74ZNKneR+oJ99Kl98KegGwjS/gRcjYILHWBJBCF7y61XNeJTlehEZ4zAXS3zLGaZ6DUWY3aqoMkoiAFDdHEAu5EfYITybR+eQZNiGOLVpEVC96bSgGYl4BtUjLib8YCkznllo1hbQWOJSeftIkCJj/XcOvX5kIHsnTMdkgPVd+JhBJ1ReYLf4mBYA0BVTBbHJVrMajz77Oo4iZua3XDw3RF9cekAHjh+x/zZntwiRu0k51xI0mX5nr9SsuiQccD/fxwCoI9P1u2xZHFthiHl4MxUvTRDuBTz8bktdUruqxJP+ZkKZmuozLhP738m+9nMRiavSJm0RQGDUMXfHoJ8+9VVB4uZRZq9Hprt7ReCYobgRaq4220Cpg/WADcm13o0jp0PKOl2uiS6MdIbReiLGJVf/XxeNun43K1+osv/Ermy6qL5WM= #signingkey = ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCuq/w936y0Enjg7e+t27p6Hwj7RJpuDdhjV/FeikCitey23dx72yIFe3giHW10eBKHr0lhWbDhm2m0b74ZNKneR+oJ99Kl98KegGwjS/gRcjYILHWBJBCF7y61XNeJTlehEZ4zAXS3zLGaZ6DUWY3aqoMkoiAFDdHEAu5EfYITybR+eQZNiGOLVpEVC96bSgGYl4BtUjLib8YCkznllo1hbQWOJSeftIkCJj/XcOvX5kIHsnTMdkgPVd+JhBJ1ReYLf4mBYA0BVTBbHJVrMajz77Oo4iZua3XDw3RF9cekAHjh+x/zZntwiRu0k51xI0mX5nr9SsuiQccD/fxwCoI9P1u2xZHFthiHl4MxUvTRDuBTz8bktdUruqxJP+ZkKZmuozLhP738m+9nMRiavSJm0RQGDUMXfHoJ8+9VVB4uZRZq9Hprt7ReCYobgRaq4220Cpg/WADcm13o0jp0PKOl2uiS6MdIbReiLGJVf/XxeNun43K1+osv/Ermy6qL5WM=
#signingkey = ~/.ssh/id_ed25519.pub #signingkey = ~/.ssh/id_ed25519.pub
##wtop ##wtop
#email = mikaela+digitalents@mikaela.info #email = mikaela+digitalents@mikaela.info
#signingkey = 0xDF046339D69EB8C9 #signingkey = 0xDF046339D69EB8C9
[alias] [alias]
cleandi = clean -di cleandi = clean -di
cleandix = clean -dix cleandix = clean -dix
# From http://progit.org/book/ch2-7.html # From http://progit.org/book/ch2-7.html
last = cat-file commit HEAD last = cat-file commit HEAD
mergen = merge --no-ff mergen = merge --no-ff
pulln = pull --no-ff pulln = pull --no-ff
pullen = pull --no-ff pullen = pull --no-ff
verify = verify-commit HEAD verify = verify-commit HEAD
[core] [core]
editor = vim editor = vim
autocrlf = input autocrlf = input
[color] [color]
# From git manpage and http://book.git-scm.com/5_customizing_git.html # From git manpage and http://book.git-scm.com/5_customizing_git.html
branch = true branch = true
diff = true diff = true
grep = true grep = true
interactive = true interactive = true
pager = true pager = true
showbranch = true showbranch = true
status = true status = true
ui = true ui = true
[push] [push]
default = current default = current
gpgSign = if-asked gpgSign = if-asked
autoSetupRemote = true autoSetupRemote = true
recurseSubmodules = on-demand recurseSubmodules = on-demand
[credential] [credential]
helper = cache --timeout=86400 helper = cache --timeout=86400
[merge] [merge]
ff = only ff = only
[format] [format]
signOff = true signOff = true
[commit] [commit]
gpgsign = true gpgsign = true
[diff] [diff]
compactionHeuristic = true compactionHeuristic = true
[pager] [pager]
# log = diff-highlight | less # log = diff-highlight | less
# show = diff-highlight | less # show = diff-highlight | less
# diff = diff-highlight | less # diff = diff-highlight | less
[interactive] [interactive]
# diffFilter = diff-highlight # diffFilter = diff-highlight
[gpg] [gpg]
format = ssh format = ssh
[tag] [tag]
forceSignAnnotated = true forceSignAnnotated = true
[pull] [pull]
ff = only ff = only
[init] [init]
defaultBranch = cxefa defaultBranch = cxefa
[gpg "ssh"] [gpg "ssh"]
allowedSignersFile = ~/src/gitea.blesmrt.net/Mikaela/ssh-allowed_signers/allowed_signers allowedSignersFile = ~/src/gitea.blesmrt.net/Mikaela/ssh-allowed_signers/allowed_signers
[advice] [advice]
# I am not developing in detached head state, I generally want to compile # I am not developing in detached head state, I generally want to compile
# a specific version of a program and I know how to get out of it # a specific version of a program and I know how to get out of it
detachedHead = false detachedHead = false
[filter "lfs"] [filter "lfs"]
clean = git-lfs clean -- %f clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f smudge = git-lfs smudge -- %f

View File

@ -26,7 +26,9 @@ set $menu bemenu-run | xargs swaymsg exec --
set $ScreenLockCmd swaylock -c 000000 -F -k -l -f set $ScreenLockCmd swaylock -c 000000 -F -k -l -f
# Preferred graphical text editor # Preferred graphical text editor
set $TEXTEDITOR pluma #set $TEXTEDITOR pluma
# Native .editorconfig support via KTextEditor
set $TEXTEDITOR kate
# Font # Font
font pango:Noto Sans Mono Regular 10 font pango:Noto Sans Mono Regular 10
@ -38,7 +40,7 @@ font pango:Noto Sans Mono Regular 10
# #
# Example configuration: # Example configuration:
# #
# output HDMI-A-1 resolution 1920x1080 position 1920,0 # output HDMI-A-1 resolution 1920x1080 position 1920,0
# #
# You can get the names of your outputs by running: swaymsg -t get_outputs # You can get the names of your outputs by running: swaymsg -t get_outputs
@ -47,9 +49,9 @@ font pango:Noto Sans Mono Regular 10
# Example configuration: # Example configuration:
# #
# exec swayidle -w \ # exec swayidle -w \
# timeout 300 'swaylock -f -c 000000' \ # timeout 300 'swaylock -f -c 000000' \
# timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \ # timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
# before-sleep 'swaylock -f -c 000000' # before-sleep 'swaylock -f -c 000000'
# #
# This will lock your screen after 300 seconds of inactivity, then turn off # This will lock your screen after 300 seconds of inactivity, then turn off
# your displays after another 300 seconds, and turn your screens back on when # your displays after another 300 seconds, and turn your screens back on when
@ -59,12 +61,12 @@ font pango:Noto Sans Mono Regular 10
# #
# Example configuration: # Example configuration:
# #
# input "2:14:SynPS/2_Synaptics_TouchPad" { # input "2:14:SynPS/2_Synaptics_TouchPad" {
# dwt enabled # dwt enabled
# tap enabled # tap enabled
# natural_scroll enabled # natural_scroll enabled
# middle_emulation enabled # middle_emulation enabled
# } # }
# #
# You can get the names of your inputs by running: swaymsg -t get_inputs # You can get the names of your inputs by running: swaymsg -t get_inputs
# Read `man 5 sway-input` for more information about this section. # Read `man 5 sway-input` for more information about this section.
@ -73,145 +75,145 @@ font pango:Noto Sans Mono Regular 10
# #
# Basics: # Basics:
# #
# Start a terminal # Start a terminal
bindsym $mod+Return exec $term bindsym $mod+Return exec $term
# Kill focused window # Kill focused window
bindsym $mod+Shift+q kill bindsym $mod+Shift+q kill
# Start your launcher # Start your launcher
bindsym $mod+d exec $menu bindsym $mod+d exec $menu
# Drag floating windows by holding down $mod and left mouse button. # Drag floating windows by holding down $mod and left mouse button.
# Resize them with right mouse button + $mod. # Resize them with right mouse button + $mod.
# Despite the name, also works for non-floating windows. # Despite the name, also works for non-floating windows.
# Change normal to inverse to use left mouse button for resizing and right # Change normal to inverse to use left mouse button for resizing and right
# mouse button for dragging. # mouse button for dragging.
floating_modifier $mod normal floating_modifier $mod normal
# Reload the configuration file # Reload the configuration file
bindsym $mod+Shift+c reload bindsym $mod+Shift+c reload
# Exit sway (logs you out of your Wayland session) # Exit sway (logs you out of your Wayland session)
bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit' bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit'
# Lock and suspend # Lock and suspend
bindsym $mod+Escape exec "swaynag -t warning -m 'You pressed the SUSPEND shortcut. Do you really want to SUSPEND?' -B 'Yes, SUSPEND' '$ScreenLockCmd; systemctl -i suspend'" bindsym $mod+Escape exec "swaynag -t warning -m 'You pressed the SUSPEND shortcut. Do you really want to SUSPEND?' -B 'Yes, SUSPEND' '$ScreenLockCmd; systemctl -i suspend'"
# #
# Moving around: # Moving around:
# #
# Move your focus around # Move your focus around
bindsym $mod+$left focus left bindsym $mod+$left focus left
bindsym $mod+$down focus down bindsym $mod+$down focus down
bindsym $mod+$up focus up bindsym $mod+$up focus up
bindsym $mod+$right focus right bindsym $mod+$right focus right
# Or use $mod+[up|down|left|right] # Or use $mod+[up|down|left|right]
bindsym $mod+Left focus left bindsym $mod+Left focus left
bindsym $mod+Down focus down bindsym $mod+Down focus down
bindsym $mod+Up focus up bindsym $mod+Up focus up
bindsym $mod+Right focus right bindsym $mod+Right focus right
# Move the focused window with the same, but add Shift # Move the focused window with the same, but add Shift
bindsym $mod+Shift+$left move left bindsym $mod+Shift+$left move left
bindsym $mod+Shift+$down move down bindsym $mod+Shift+$down move down
bindsym $mod+Shift+$up move up bindsym $mod+Shift+$up move up
bindsym $mod+Shift+$right move right bindsym $mod+Shift+$right move right
# Ditto, with arrow keys # Ditto, with arrow keys
bindsym $mod+Shift+Left move left bindsym $mod+Shift+Left move left
bindsym $mod+Shift+Down move down bindsym $mod+Shift+Down move down
bindsym $mod+Shift+Up move up bindsym $mod+Shift+Up move up
bindsym $mod+Shift+Right move right bindsym $mod+Shift+Right move right
# #
# Workspaces: # Workspaces:
# #
# Switch to workspace # Switch to workspace
bindsym $mod+1 workspace number 1 bindsym $mod+1 workspace number 1
bindsym $mod+2 workspace number 2 bindsym $mod+2 workspace number 2
bindsym $mod+3 workspace number 3 bindsym $mod+3 workspace number 3
bindsym $mod+4 workspace number 4 bindsym $mod+4 workspace number 4
bindsym $mod+5 workspace number 5 bindsym $mod+5 workspace number 5
bindsym $mod+6 workspace number 6 bindsym $mod+6 workspace number 6
bindsym $mod+7 workspace number 7 bindsym $mod+7 workspace number 7
bindsym $mod+8 workspace number 8 bindsym $mod+8 workspace number 8
bindsym $mod+9 workspace number 9 bindsym $mod+9 workspace number 9
bindsym $mod+0 workspace number 10 bindsym $mod+0 workspace number 10
# Move focused container to workspace # Move focused container to workspace
bindsym $mod+Shift+1 move container to workspace number 1 bindsym $mod+Shift+1 move container to workspace number 1
bindsym $mod+Shift+2 move container to workspace number 2 bindsym $mod+Shift+2 move container to workspace number 2
bindsym $mod+Shift+3 move container to workspace number 3 bindsym $mod+Shift+3 move container to workspace number 3
bindsym $mod+Shift+4 move container to workspace number 4 bindsym $mod+Shift+4 move container to workspace number 4
bindsym $mod+Shift+5 move container to workspace number 5 bindsym $mod+Shift+5 move container to workspace number 5
bindsym $mod+Shift+6 move container to workspace number 6 bindsym $mod+Shift+6 move container to workspace number 6
bindsym $mod+Shift+7 move container to workspace number 7 bindsym $mod+Shift+7 move container to workspace number 7
bindsym $mod+Shift+8 move container to workspace number 8 bindsym $mod+Shift+8 move container to workspace number 8
bindsym $mod+Shift+9 move container to workspace number 9 bindsym $mod+Shift+9 move container to workspace number 9
bindsym $mod+Shift+0 move container to workspace number 10 bindsym $mod+Shift+0 move container to workspace number 10
# Note: workspaces can have any name you want, not just numbers. # Note: workspaces can have any name you want, not just numbers.
# We just use 1-10 as the default. # We just use 1-10 as the default.
# #
# Layout stuff: # Layout stuff:
# #
# Default to tabbed layout # Default to tabbed layout
workspace_layout tabbed workspace_layout tabbed
# You can "split" the current object of your focus with # You can "split" the current object of your focus with
# $mod+b or $mod+v, for horizontal and vertical splits # $mod+b or $mod+v, for horizontal and vertical splits
# respectively. # respectively.
bindsym $mod+b splith bindsym $mod+b splith
bindsym $mod+v splitv bindsym $mod+v splitv
# Switch the current container between different layout styles # Switch the current container between different layout styles
bindsym $mod+s layout stacking bindsym $mod+s layout stacking
bindsym $mod+w layout tabbed bindsym $mod+w layout tabbed
bindsym $mod+e layout toggle split bindsym $mod+e layout toggle split
# Make the current focus fullscreen # Make the current focus fullscreen
bindsym $mod+f fullscreen bindsym $mod+f fullscreen
# Toggle the current focus between tiling and floating mode # Toggle the current focus between tiling and floating mode
bindsym $mod+Shift+space floating toggle bindsym $mod+Shift+space floating toggle
# Swap focus between the tiling area and the floating area # Swap focus between the tiling area and the floating area
bindsym $mod+space focus mode_toggle bindsym $mod+space focus mode_toggle
# Move focus to the parent container # Move focus to the parent container
bindsym $mod+a focus parent bindsym $mod+a focus parent
# #
# Scratchpad: # Scratchpad:
# #
# Sway has a "scratchpad", which is a bag of holding for windows. # Sway has a "scratchpad", which is a bag of holding for windows.
# You can send windows there and get them back later. # You can send windows there and get them back later.
# Move the currently focused window to the scratchpad # Move the currently focused window to the scratchpad
bindsym $mod+Shift+minus move scratchpad bindsym $mod+Shift+minus move scratchpad
# Show the next scratchpad window or hide the focused scratchpad window. # Show the next scratchpad window or hide the focused scratchpad window.
# If there are multiple scratchpad windows, this command cycles through them. # If there are multiple scratchpad windows, this command cycles through them.
bindsym $mod+minus scratchpad show bindsym $mod+minus scratchpad show
# #
# Resizing containers: # Resizing containers:
# #
mode "resize" { mode "resize" {
# left will shrink the containers width # left will shrink the containers width
# right will grow the containers width # right will grow the containers width
# up will shrink the containers height # up will shrink the containers height
# down will grow the containers height # down will grow the containers height
bindsym $left resize shrink width 10px bindsym $left resize shrink width 10px
bindsym $down resize grow height 10px bindsym $down resize grow height 10px
bindsym $up resize shrink height 10px bindsym $up resize shrink height 10px
bindsym $right resize grow width 10px bindsym $right resize grow width 10px
# Ditto, with arrow keys # Ditto, with arrow keys
bindsym Left resize shrink width 10px bindsym Left resize shrink width 10px
bindsym Down resize grow height 10px bindsym Down resize grow height 10px
bindsym Up resize shrink height 10px bindsym Up resize shrink height 10px
bindsym Right resize grow width 10px bindsym Right resize grow width 10px
# Return to default mode # Return to default mode
bindsym Return mode "default" bindsym Return mode "default"
bindsym Escape mode "default" bindsym Escape mode "default"
} }
bindsym $mod+r mode "resize" bindsym $mod+r mode "resize"

View File

@ -4,24 +4,24 @@ set nocompatible
" Show syntax colours " Show syntax colours
syntax on syntax on
set showcmd " Show (partial) command in status line. set showcmd " Show (partial) command in status line.
set showmatch " Show matching brackets. set showmatch " Show matching brackets.
set ignorecase " Do case insensitive matching set ignorecase " Do case insensitive matching
set smartcase " Do smart case matching set smartcase " Do smart case matching
"set incsearch " Incremental search "set incsearch " Incremental search
set autowrite " Automatically save before commands like :next and :make set autowrite " Automatically save before commands like :next and :make
set hidden " Hide buffers when they are abandoned set hidden " Hide buffers when they are abandoned
"set mouse=a " Enable mouse usage (all modes) "set mouse=a " Enable mouse usage (all modes)
" Source a global configuration file if available " Source a global configuration file if available
if filereadable("/etc/vim/vimrc.local") if filereadable("/etc/vim/vimrc.local")
source /etc/vim/vimrc.local source /etc/vim/vimrc.local
endif endif
set number " Show line numbers. set number " Show line numbers.
set ruler " Show the line and column number of the cursor position, set ruler " Show the line and column number of the cursor position,
" separated by a comma. " separated by a comma.
set background=dark set background=dark
@ -30,8 +30,10 @@ set modeline
" These may be difficult with multiple languages especially if Vim already " These may be difficult with multiple languages especially if Vim already
" knows what to do " knows what to do
"set tabstop=4 "four spaces is likely a tab set tabstop=4 "four spaces is likely a tab
"set shiftwidth=4 "set shiftwidth=4
" For accessibility tabs instead of spaces (uncomment for spaces instead of
" tabs)
"set expandtab "set expandtab
set autoindent set autoindent
@ -52,7 +54,7 @@ set visualbell
" gvim has light background " gvim has light background
"if has('gui_running') "if has('gui_running')
" set background=light " set background=light
"endif "endif
" Show hidden characters via " Show hidden characters via
@ -77,27 +79,28 @@ filetype plugin indent on
" Return to last edit position when opening files (You want this!) " Return to last edit position when opening files (You want this!)
autocmd BufReadPost * autocmd BufReadPost *
\ if line("'\"") > 0 && line("'\"") <= line("$") | \ if line("'\"") > 0 && line("'\"") <= line("$") |
\ exe "normal! g`\"" | \ exe "normal! g`\"" |
\ endif \ endif
" I think leaving line endings to git may be more safe
" dos2unix ^M copied from https://stackoverflow.com/a/5361702/1675649 " dos2unix ^M copied from https://stackoverflow.com/a/5361702/1675649
fun! Dos2unixFunction() "fun! Dos2unixFunction()
let _s=@/ " let _s=@/
let l = line(".") " let l = line(".")
let c = col(".") " let c = col(".")
try " try
set ff=unix " set ff=unix
w! " w!
"%s/\%x0d$//e " "%s/\%x0d$//e
catch /E32:/ " catch /E32:/
echo "Sorry, the file is not saved." " echo "Sorry, the file is not saved."
endtry " endtry
let @/=_s " let @/=_s
call cursor(l, c) " call cursor(l, c)
endfun "endfun
com! Dos2Unix keepjumps call Dos2unixFunction() "com! Dos2Unix keepjumps call Dos2unixFunction()
au BufReadPost * keepjumps call Dos2unixFunction() "au BufReadPost * keepjumps call Dos2unixFunction()
" Highlight all search results " Highlight all search results
set hlsearch set hlsearch