16 files changed, 17 insertions, 673 deletions
diff --git a/.gitignore b/.gitignore
index 554de32..08fd080 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-vim/.cache/vim/viminfo
+vim/.cache/vim
 vim/.vim/.netrwhist
 vim/.vim/plugged
 awesome/.config/awesome/vicious/
diff --git a/acanban/.config/acanban/hypercorn.toml b/acanban/.config/acanban/hypercorn.toml
new file mode 100644
index 0000000..1e2aedc
--- /dev/null
+++ b/acanban/.config/acanban/hypercorn.toml
@@ -0,0 +1,2 @@
+graceful_timeout = 0
+use_reloader = true
diff --git a/acanban/.config/acanban/rethinkdb.toml b/acanban/.config/acanban/rethinkdb.toml
new file mode 100644
index 0000000..9b9cded
--- /dev/null
+++ b/acanban/.config/acanban/rethinkdb.toml
@@ -0,0 +1 @@
+db = 'test'
diff --git a/dev/.config/htop/htoprc b/dev/.config/htop/htoprc
index 591146a..0291eb0 100644
--- a/dev/.config/htop/htoprc
+++ b/dev/.config/htop/htoprc
@@ -3,7 +3,6 @@
 fields=0 48 17 18 38 39 40 2 46 47 49 1
 sort_key=47
 sort_direction=1
-hide_threads=0
 hide_kernel_threads=1
 hide_userland_threads=0
 shadow_other_users=0
@@ -12,12 +11,19 @@ show_program_path=0
 highlight_base_name=0
 highlight_megabytes=1
 highlight_threads=1
+highlight_changes=0
+highlight_changes_delay_secs=5
+find_comm_in_cmdline=1
+strip_exe_from_cmdline=1
+show_merged_command=1
 tree_view=0
 header_margin=1
 detailed_cpu_time=0
-cpu_count_from_zero=1
+cpu_count_from_one=0
 show_cpu_usage=1
 show_cpu_frequency=0
+show_cpu_temperature=0
+degree_fahrenheit=0
 update_process_names=0
 account_guest_in_cpu_meter=0
 color_scheme=0
@@ -27,4 +33,3 @@ left_meters=AllCPUs4 CPU
 left_meter_modes=1 1
 right_meters=Memory Swap Battery
 right_meter_modes=1 1 1
-vim_mode=1
diff --git a/nix/.config/alacritty.yml b/nix/.config/alacritty.yml
deleted file mode 100644
index 51c51fe..0000000
--- a/nix/.config/alacritty.yml
+++ /dev/null
@@ -1,439 +0,0 @@
-# Configuration for Alacritty, the GPU enhanced terminal emulator.
-
-# Any items in the `env` entry below will be added as
-# environment variables. Some entries may override variables
-# set by alacritty itself.
-#env:
-  # TERM variable
-  #
-  # This value is used to set the `$TERM` environment variable for
-  # each instance of Alacritty. If it is not present, alacritty will
-  # check the local terminfo database and use `alacritty` if it is
-  # available, otherwise `xterm-256color` is used.
-  #TERM: xterm-256color
-
-window:
-  dimensions:
-    columns: 80
-    lines: 24
-
-  # Window position (changes require restart)
-  #
-  # Specified in number of pixels.
-  # If the position is not set, the window manager will handle the placement.
-  #position:
-  #  x: 0
-  #  y: 0
-
-  # Window padding (changes require restart)
-  #
-  # Blank space added around the window in pixels. This padding is scaled
-  # by DPI and the specified value is always added at both opposing sides.
-  #padding:
-  #  x: 0
-  #  y: 0
-
-  # Spread additional padding evenly around the terminal content.
-  dynamic_padding: true
-
-  # Window decorations
-  #
-  # Values for `decorations`:
-  #     - full: Borders and title bar
-  #     - none: Neither borders nor title bar
-  #
-  # Values for `decorations` (macOS only):
-  #     - transparent: Title bar, transparent background and title bar buttons
-  #     - buttonless: Title bar, transparent background, but no title bar buttons
-  #decorations: full
-
-  # Startup Mode (changes require restart)
-  #
-  # Values for `startup_mode`:
-  #   - Windowed
-  #   - Maximized
-  #   - Fullscreen
-  #
-  # Values for `startup_mode` (macOS only):
-  #   - SimpleFullscreen
-  #startup_mode: Windowed
-
-  # Window title
-  #title: Alacritty
-
-  # Window class (Linux only):
-  #class:
-    # Application instance name
-    #instance: Alacritty
-    # General application class
-    #general: Alacritty
-
-  # GTK theme variant (Linux only)
-  #
-  # Override the variant of the GTK theme. Commonly supported values are `dark` and `light`.
-  # Set this to `None` to use the default theme variant.
-  #gtk_theme_variant: None
-
-#scrolling:
-  # Maximum number of lines in the scrollback buffer.
-  # Specifying '0' will disable scrolling.
-  #history: 10000
-
-  # Number of lines the viewport will move for every line scrolled when
-  # scrollback is enabled (history > 0).
-  #multiplier: 3
-
-  # Scroll to the bottom when new text is written to the terminal.
-  #auto_scroll: false
-
-# Spaces per Tab (changes require restart)
-#
-# This setting defines the width of a tab in cells.
-#
-# Some applications, like Emacs, rely on knowing about the width of a tab.
-# To prevent unexpected behavior in these applications, it's also required to
-# change the `it` value in terminfo when altering this setting.
-#tabspaces: 8
-
-# Font configuration
-font:
-  normal:
-    family: Latin Modern Mono
-  size: 12.0
-
-# If `true`, bold text is drawn using the bright color variants.
-#draw_bold_text_with_bright_colors: true
-
-# Colors (Papercolor light)
-colors:
-  # Default colors
-  primary:
-    background: '0xf6f5f4'
-    foreground: '0x303739'
-
-  # Normal colors
-  normal:
-    black:   '0xf6f5f4'
-    red:     '0xd7005f'
-    green:   '0x718c00'
-    yellow:  '0xd75f00'
-    blue:    '0x4271ae'
-    magenta: '0x8959a8'
-    cyan:    '0x3e999f'
-    white:   '0x4d4d4c'
-
-  # Bright colors
-  bright:
-    black:   '0x969694'
-    red:     '0xd7005f'
-    green:   '0x718c00'
-    yellow:  '0xd75f00'
-    blue:    '0x4271ae'
-    magenta: '0x8959a8'
-    cyan:    '0x3e999f'
-    white:   '0x303739'
-
-# Visual Bell
-#
-# Any time the BEL code is received, Alacritty "rings" the visual bell. Once
-# rung, the terminal background will be set to white and transition back to the
-# default background color. You can control the rate of this transition by
-# setting the `duration` property (represented in milliseconds). You can also
-# configure the transition function by setting the `animation` property.
-#
-# Values for `animation`:
-#   - Ease
-#   - EaseOut
-#   - EaseOutSine
-#   - EaseOutQuad
-#   - EaseOutCubic
-#   - EaseOutQuart
-#   - EaseOutQuint
-#   - EaseOutExpo
-#   - EaseOutCirc
-#   - Linear
-#
-# Specifying a `duration` of `0` will disable the visual bell.
-#visual_bell:
-#  animation: EaseOutExpo
-#  duration: 0
-#  color: '0xffffff'
-
-# Background opacity
-#
-# Window opacity as a floating point number from `0.0` to `1.0`.
-# The value `0.0` is completely transparent and `1.0` is opaque.
-#background_opacity: 1.0
-
-#selection:
-  #semantic_escape_chars: ",│`|:\"' ()[]{}<>\t"
-
-  # When set to `true`, selected text will be copied to the primary clipboard.
-  #save_to_clipboard: false
-
-# Allow terminal applications to change Alacritty's window title.
-#dynamic_title: true
-
-#cursor:
-  # Cursor style
-  #
-  # Values for `style`:
-  #   - ▇ Block
-  #   - _ Underline
-  #   - | Beam
-  #style: Block
-
-  # If this is `true`, the cursor will be rendered as a hollow box when the
-  # window is not focused.
-  #unfocused_hollow: true
-
-# Live config reload (changes require restart)
-#live_config_reload: true
-
-# Shell
-#
-# You can set `shell.program` to the path of your favorite shell, e.g. `/bin/fish`.
-# Entries in `shell.args` are passed unmodified as arguments to the shell.
-#
-# Default:
-#   - (macOS) /bin/bash --login
-#   - (Linux) user login shell
-#   - (Windows) powershell
-#shell:
-#  program: /bin/bash
-#  args:
-#    - --login
-
-# Startup directory
-#
-# Directory the shell is started in. If this is unset, or `None`, the working
-# directory of the parent process will be used.
-#working_directory: None
-
-# Windows 10 ConPTY backend (Windows only)
-#
-# This will enable better color support and may resolve other issues,
-# however this API and its implementation is still young and so is
-# disabled by default, as stability may not be as good as the winpty
-# backend.
-#
-# Alacritty will fall back to the WinPTY automatically if the ConPTY
-# backend cannot be initialized.
-#enable_experimental_conpty_backend: false
-
-# Send ESC (\x1b) before characters when alt is pressed.
-#alt_send_esc: true
-
-#debug:
-  # Display the time it takes to redraw each frame.
-  #render_timer: false
-
-  # Keep the log file after quitting Alacritty.
-  #persistent_logging: false
-
-  # Log level
-  #
-  # Values for `log_level`:
-  #   - None
-  #   - Error
-  #   - Warn
-  #   - Info
-  #   - Debug
-  #   - Trace
-  #log_level: Warn
-
-  # Print all received window events.
-  #print_events: false
-
-  # Record all characters and escape sequences as test data.
-  #ref_test: false
-
-#mouse:
-  # Click settings
-  #
-  # The `double_click` and `triple_click` settings control the time
-  # alacritty should wait for accepting multiple clicks as one double
-  # or triple click.
-  #double_click: { threshold: 300 }
-  #triple_click: { threshold: 300 }
-
-  # If this is `true`, the cursor is temporarily hidden when typing.
-  #hide_when_typing: false
-
-  #url:
-    # URL launcher
-    #
-    # This program is executed when clicking on a text which is recognized as a URL.
-    # The URL is always added to the command as the last parameter.
-    #
-    # When set to `None`, URL launching will be disabled completely.
-    #
-    # Default:
-    #   - (macOS) open
-    #   - (Linux) xdg-open
-    #   - (Windows) explorer
-    #launcher:
-    #  program: xdg-open
-    #  args: []
-
-    # URL modifiers
-    #
-    # These are the modifiers that need to be held down for opening URLs when clicking
-    # on them. The available modifiers are documented in the key binding section.
-    #modifiers: None
-
-# Mouse bindings
-#
-# Mouse bindings are specified as a list of objects, much like the key
-# bindings further below.
-#
-# Each mouse binding will specify a:
-#
-# - `mouse`:
-#
-#   - Middle
-#   - Left
-#   - Right
-#   - Numeric identifier such as `5`
-#
-# - `action` (see key bindings)
-#
-# And optionally:
-#
-# - `mods` (see key bindings)
-#mouse_bindings:
-#  - { mouse: Middle, action: PasteSelection }
-
-# Key bindings
-#
-# Key bindings are specified as a list of objects. For example, this is the
-# default paste binding:
-#
-# `- { key: V, mods: Control|Shift, action: Paste }`
-#
-# Each key binding will specify a:
-#
-# - `key`: Identifier of the key pressed
-#
-#    - A-Z
-#    - F1-F24
-#    - Key0-Key9
-#
-#    A full list with available key codes can be found here:
-#    https://docs.rs/glutin/*/glutin/event/enum.VirtualKeyCode.html#variants
-#
-#    Instead of using the name of the keys, the `key` field also supports using
-#    the scancode of the desired key. Scancodes have to be specified as a
-#    decimal number. This command will allow you to display the hex scancodes
-#    for certain keys:
-#
-#       `showkey --scancodes`.
-#
-# Then exactly one of:
-#
-# - `chars`: Send a byte sequence to the running application
-#
-#    The `chars` field writes the specified string to the terminal. This makes
-#    it possible to pass escape sequences. To find escape codes for bindings
-#    like `PageUp` (`"\x1b[5~"`), you can run the command `showkey -a` outside
-#    of tmux. Note that applications use terminfo to map escape sequences back
-#    to keys. It is therefore required to update the terminfo when changing an
-#    escape sequence.
-#
-# - `action`: Execute a predefined action
-#
-#   - Copy
-#   - Paste
-#   - PasteSelection
-#   - IncreaseFontSize
-#   - DecreaseFontSize
-#   - ResetFontSize
-#   - ScrollPageUp
-#   - ScrollPageDown
-#   - ScrollLineUp
-#   - ScrollLineDown
-#   - ScrollToTop
-#   - ScrollToBottom
-#   - ClearHistory
-#   - Hide
-#   - Quit
-#   - ToggleFullscreen
-#   - SpawnNewInstance
-#   - ClearLogNotice
-#   - ReceiveChar
-#   - None
-#
-#   (macOS only):
-#   - ToggleSimpleFullscreen: Enters fullscreen without occupying another space
-#
-# - `command`: Fork and execute a specified command plus arguments
-#
-#    The `command` field must be a map containing a `program` string and an
-#    `args` array of command line parameter strings. For example:
-#       `{ program: "alacritty", args: ["-e", "vttest"] }`
-#
-# And optionally:
-#
-# - `mods`: Key modifiers to filter binding actions
-#
-#    - Command
-#    - Control
-#    - Option
-#    - Super
-#    - Shift
-#    - Alt
-#
-#    Multiple `mods` can be combined using `|` like this:
-#       `mods: Control|Shift`.
-#    Whitespace and capitalization are relevant and must match the example.
-#
-# - `mode`: Indicate a binding for only specific terminal reported modes
-#
-#    This is mainly used to send applications the correct escape sequences
-#    when in different modes.
-#
-#    - AppCursor
-#    - AppKeypad
-#    - Alt
-#
-#    A `~` operator can be used before a mode to apply the binding whenever
-#    the mode is *not* active, e.g. `~Alt`.
-#
-# Bindings are always filled by default, but will be replaced when a new
-# binding with the same triggers is defined. To unset a default binding, it can
-# be mapped to the `ReceiveChar` action. Alternatively, you can use `None` for
-# a no-op if you do not wish to receive input characters for that binding.
-#key_bindings:
-  # (Windows/Linux only)
-  #- { key: V,        mods: Control|Shift, action: Paste            }
-  #- { key: C,        mods: Control|Shift, action: Copy             }
-  #- { key: Insert,   mods: Shift,         action: PasteSelection   }
-  #- { key: Key0,     mods: Control,       action: ResetFontSize    }
-  #- { key: Equals,   mods: Control,       action: IncreaseFontSize }
-  #- { key: Add,      mods: Control,       action: IncreaseFontSize }
-  #- { key: Subtract, mods: Control,       action: DecreaseFontSize }
-  #- { key: Minus,    mods: Control,       action: DecreaseFontSize }
-  #- { key: Return,   mods: Alt,           action: ToggleFullscreen }
-
-  # (macOS only)
-  #- { key: Key0,   mods: Command,         action: ResetFontSize    }
-  #- { key: Equals, mods: Command,         action: IncreaseFontSize }
-  #- { key: Add,    mods: Command,         action: IncreaseFontSize }
-  #- { key: Minus,  mods: Command,         action: DecreaseFontSize }
-  #- { key: K,      mods: Command,         action: ClearHistory     }
-  #- { key: K,      mods: Command,         chars: "\x0c"            }
-  #- { key: V,      mods: Command,         action: Paste            }
-  #- { key: C,      mods: Command,         action: Copy             }
-  #- { key: H,      mods: Command,         action: Hide             }
-  #- { key: Q,      mods: Command,         action: Quit             }
-  #- { key: W,      mods: Command,         action: Quit             }
-  #- { key: F,      mods: Command|Control, action: ToggleFullscreen }
-
-  #- { key: Paste,                    action: Paste                            }
-  #- { key: Copy,                     action: Copy                             }
-  #- { key: L,         mods: Control, action: ClearLogNotice                   }
-  #- { key: L,         mods: Control, chars: "\x0c"                            }
-  #- { key: PageUp,    mods: Shift,   action: ScrollPageUp,   mode: ~Alt       }
-  #- { key: PageDown,  mods: Shift,   action: ScrollPageDown, mode: ~Alt       }
-  #- { key: Home,      mods: Shift,   action: ScrollToTop,    mode: ~Alt       }
-  #- { key: End,       mods: Shift,   action: ScrollToBottom, mode: ~Alt       }
diff --git a/nix/.config/gtk-3.0/bookmarks b/nix/.config/gtk-3.0/bookmarks
deleted file mode 100644
index 26d6f43..0000000
--- a/nix/.config/gtk-3.0/bookmarks
+++ /dev/null
@@ -1 +0,0 @@
-file:///home/cee/Salsa
diff --git a/nix/.config/gtk-3.0/settings.ini b/nix/.config/gtk-3.0/settings.ini
deleted file mode 100644
index ee90d17..0000000
--- a/nix/.config/gtk-3.0/settings.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-[Settings]
-gtk-application-prefer-dark-theme=0
-gtk-button-images=1
-gtk-cursor-theme-name=PearWhiteCursors
-gtk-decoration-layout=close:icon
-gtk-enable-animations=0
-gtk-font-name=LM Sans 10,  12
-gtk-icon-theme-name=breeze
-gtk-key-theme-name=Emacs
-gtk-menu-images=1
-gtk-primary-button-warps-slider=0
-gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ
diff --git a/nix/.config/systemd/user/default.target.wants/emacs.service b/nix/.config/systemd/user/default.target.wants/emacs.service
deleted file mode 120000
index bb810be..0000000
--- a/nix/.config/systemd/user/default.target.wants/emacs.service
+++ /dev/null
@@ -1 +0,0 @@
-/home/cee/.config/systemd/user/emacs.service
-\ No newline at end of file
diff --git a/nix/.config/systemd/user/default.target.wants/ipfs.service b/nix/.config/systemd/user/default.target.wants/ipfs.service
deleted file mode 120000
index 63ddeda..0000000
--- a/nix/.config/systemd/user/default.target.wants/ipfs.service
+++ /dev/null
@@ -1 +0,0 @@
-/home/cee/.config/systemd/user/ipfs.service
-\ No newline at end of file
diff --git a/nix/.config/systemd/user/emacs.service b/nix/.config/systemd/user/emacs.service
deleted file mode 100644
index d06a506..0000000
--- a/nix/.config/systemd/user/emacs.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Emacs: the extensible, self-documenting text editor
-
-[Service]
-Environment="LOCALE_ARCHIVE=/nix/store/l4qnw7z34dv4kbn2wnckq0bdjlyzxrmx-glibc-locales-2.27/lib/locale/locale-archive"
-Environment="PATH=/nix/store/j0lhk5xkky410h5v9af98sz6kd8cbp40-coreutils-8.31/bin:/nix/store/kmc865qs56czqk5k5vr0nj4zvfijlq7n-findutils-4.7.0/bin:/nix/store/20b535jb98hy7k4z8vkrlkjma212a3l5-gnugrep-3.3/bin:/nix/store/dv52knazq6pb1zv9pazzj666zg550zni-gnused-4.7/bin:/nix/store/jy856r03m1jk299wkk2zm3dan8gqj64s-systemd-243/bin:/nix/store/j0lhk5xkky410h5v9af98sz6kd8cbp40-coreutils-8.31/sbin:/nix/store/kmc865qs56czqk5k5vr0nj4zvfijlq7n-findutils-4.7.0/sbin:/nix/store/20b535jb98hy7k4z8vkrlkjma212a3l5-gnugrep-3.3/sbin:/nix/store/dv52knazq6pb1zv9pazzj666zg550zni-gnused-4.7/sbin:/nix/store/jy856r03m1jk299wkk2zm3dan8gqj64s-systemd-243/sbin"
-Environment="TZDIR=/nix/store/27ils7qkz0rkhq02bq104gyj9s10vaf6-tzdata-2019b/share/zoneinfo"
-
-ExecStart=/nix/store/b34zjdmq5l8k6rwdykjx55yl9r9isl8k-bash-4.4-p23/bin/bash -c 'source /nix/store/j68zvm2dnkgmflcn128la1c51bpka127-set-environment; exec /nix/store/47jy4mm9262hx88k88b8acrlb9w86z9m-emacs-26.3/bin/emacs --daemon'
-ExecStop=/nix/store/47jy4mm9262hx88k88b8acrlb9w86z9m-emacs-26.3/bin/emacsclient --eval (kill-emacs)
-Restart=always
-Type=forking
-
-[Install]
-WantedBy=default.target
diff --git a/nix/.config/systemd/user/ipfs.service b/nix/.config/systemd/user/ipfs.service
deleted file mode 100644
index 673a093..0000000
--- a/nix/.config/systemd/user/ipfs.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=IPFS daemon
-After=network.target
-
-[Service]
-ExecStart=/run/current-system/sw/bin/ipfs daemon
-Restart=on-failure
-
-[Install]
-WantedBy=default.target
diff --git a/nix/.dictrc b/nix/.dictrc
deleted file mode 100644
index 21701d9..0000000
--- a/nix/.dictrc
+++ /dev/null
@@ -1,2 +0,0 @@
-server 127.0.0.1
-server dict.org
-\ No newline at end of file
diff --git a/nix/.gtkrc-2.0 b/nix/.gtkrc-2.0
deleted file mode 100644
index 7a29cb5..0000000
--- a/nix/.gtkrc-2.0
+++ /dev/null
@@ -1,3 +0,0 @@
-gtk-font-name="Latin Modern Sans 12"
-gtk-key-theme-name="Emacs"
-gtk-modules=appmenu-gtk-module
-\ No newline at end of file
diff --git a/nix/configuration.nix b/nix/configuration.nix
deleted file mode 100644
index e001553..0000000
--- a/nix/configuration.nix
+++ /dev/null
@@ -1,128 +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
-    ];
-
-  # Use the systemd-boot EFI boot loader.
-  boot.loader.systemd-boot.enable = true;
-
-  networking.hostName = "nix"; # Define your hostname.
-  # Enables wireless support via wpa_supplicant.
-  # networking.wireless.enable = true;
-
-  # The global useDHCP flag is deprecated,
-  # therefore explicitly set to false here.
-  # Per-interface useDHCP will be mandatory in the future,
-  # so this generated config replicates the default behaviour.
-  networking.useDHCP = false;
-  networking.interfaces.enp1s0.useDHCP = true;
-  networking.interfaces.wlp2s0.useDHCP = true;
-
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-  
-  # Enable NetworkManager
-  networking.networkmanager.enable = true;
-
-  # Select internationalisation properties.
-  i18n = {
-    defaultLocale = "en_US.UTF-8";
-    inputMethod = {
-      enabled = "ibus";
-      ibus.engines = with pkgs.ibus-engines; [ table table-others
-                                               typing-booster ];
-    };
-  };
-
-  console = {
-    font = "Lat2-Terminus16";
-    keyMap = "us";
-  };
-
-  # Set your time zone.
-  time.timeZone = "Asia/Ho_Chi_Minh";
-
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  environment.systemPackages = with pkgs; with kdeApplications; [
-    ack htop mc stow zip
-    alacritty emacs git nix-prefetch-scripts pkg-config
-    alure2 libogg libsndfile libvorbis openal opusfile
-    aria2 curl firefox ipfs thunderbird w3m wget
-    ark ktorrent libreoffice okular spectacle
-    audaciousQt5 ffmpeg-full mpv zbar
-    azimuth duckmarines freedink gweled liquidwar lugaru tbe xonotic
-    blender frei0r glfw gmic-qt-krita kdenlive krita simplescreenrecorder
-    cmake gcc gdb man-pages posix_man_pages
-    dict dictdDBs.eng2fra dictdDBs.fra2eng dictdDBs.wiktionary dictdDBs.wordnet
-    efibootmgr refind
-    go guile jdk12 lua octave rakudo rlwrap sbcl
-    lmodern texlive.combined.scheme-full
-    (python38.withPackages(ps: with ps; [
-      flake8 pip setuptools tox twine wheel
-      cython numpy moderngl pillow pygame ]))
-  ];
-
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  programs.mtr.enable = true;
-  programs.gnupg.agent = { enable = true; enableSSHSupport = true; };
-
-  # List services that you want to enable:
-  services.dictd.enable = true;
-  services.dictd.DBs = with pkgs.dictdDBs; [ eng2fra fra2eng
-                                             wiktionary wordnet ];
-
-  # Emacs daemon
-  services.emacs.enable = false;
-  services.emacs.install = true;
-  services.emacs.defaultEditor = true;
-
-  # Enable the OpenSSH daemon.
-  # services.openssh.enable = true;
-
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
-  # Enable CUPS to print documents.
-  services.printing.enable = true;
-
-  # Enable sound.
-  sound.enable = true;
-  hardware.pulseaudio.enable = true;
-
-  # Enable the X11 windowing system.
-  services.xserver.enable = true;
-  services.xserver.layout = "us";
-  services.xserver.xkbOptions = "caps:ctrl_modifier,compose:ralt";
-
-  # Enable touchpad support.
-  services.xserver.libinput.enable = true;
-
-  # Enable the KDE Desktop Environment.
-  services.xserver.displayManager.sddm.enable = true;
-  services.xserver.desktopManager.plasma5.enable = true;
-
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.cee = {
-    isNormalUser = true;
-    extraGroups = [ "wheel" "networkmanager" ];
-  };
-
-  # This value determines the NixOS release with which your system is to be
-  # compatible, in order to avoid breaking some software such as database
-  # servers. You should change this only after NixOS release notes say you
-  # should.
-  system.stateVersion = "20.03"; # Did you read the comment?
-}
diff --git a/vim/.vim/scripts.vim b/vim/.vim/scripts.vim
deleted file mode 100644
index 6221c55..0000000
--- a/vim/.vim/scripts.vim
+++ /dev/null
@@ -1,55 +0,0 @@
-" Additional scripts' filetype detections
-
-" This file is called by an autocommand for every file that has just been
-" loaded into a buffer.  It checks if the type of file can be recognized by
-" the file contents.  The autocommand is in $VIMRUNTIME/filetype.vim.
-"
-" Note that the pattern matches are done with =~# to avoid the value of the
-" 'ignorecase' option making a difference.  Where case is to be ignored use
-" =~? instead.  Do not use =~ anywhere.
-
-" Only do the rest when the FileType autocommand has not been triggered yet.
-if did_filetype()
-  finish
-endif
-
-" Line continuation is used here, remove 'C' from 'cpoptions'
-let s:cpo_save = &cpo
-set cpo&vim
-
-let s:line1 = getline(1)
-if s:line1 =~# "^#!"
-  " A script that starts with "#!".
-  " Check for a line like "#!/usr/bin/env VAR=val bash".  Turn it into
-  " "#!/usr/bin/bash" to make matching easier.
-  if s:line1 =~# '^#!\s*\S*\<env\s'
-    let s:line1 = substitute(s:line1, '\S\+=\S\+', '', 'g')
-    let s:line1 = substitute(s:line1, '\<env\s\+', '', '')
-  endif
-
-  " Get the program name.
-  " Only accept spaces in PC style paths: "#!c:/program files/perl [args]".
-  " If the word env is used, use the first word after the space:
-  " "#!/usr/bin/env perl [path/args]"
-  " If there is no path use the first word: "#!perl [path/args]".
-  " Otherwise get the last word after a slash: "#!/usr/bin/perl [path/args]".
-  if s:line1 =~# '^#!\s*\a:[/\\]'
-    let s:name = substitute(s:line1, '^#!.*[/\\]\(\i\+\).*', '\1', '')
-  elseif s:line1 =~# '^#!.*\<env\>'
-    let s:name = substitute(s:line1, '^#!.*\<env\>\s\+\(\i\+\).*', '\1', '')
-  elseif s:line1 =~# '^#!\s*[^/\\ ]*\>\([^/\\]\|$\)'
-    let s:name = substitute(s:line1, '^#!\s*\([^/\\ ]*\>\).*', '\1', '')
-  else
-    let s:name = substitute(s:line1, '^#!\s*\S*[/\\]\(\i\+\).*', '\1', '')
-  endif
-
-  " GNU Octave
-  if s:name =~# 'octave'
-    set ft=octave
-  endif
-  unlet s:name
-endif
-
-" Restore 'cpoptions'
-let &cpo = s:cpo_save
-unlet s:cpo_save s:line1
diff --git a/vim/.vim/vimrc b/vim/.vim/vimrc
index fce91f9..e72b9e4 100755
--- a/vim/.vim/vimrc
+++ b/vim/.vim/vimrc
@@ -35,6 +35,7 @@ augroup END
 
 let g:netrw_banner = 0
 let g:netrw_liststyle = 3
+let g:VM_Enabled = 1
 let g:srcery_italic = 1
 let g:jedi#popup_on_dot = 0
 let g:jedi#popup_select_first = 0
@@ -42,10 +43,12 @@ let g:jedi#show_call_signatures = 2
 let g:jedi#smart_auto_mappings = 0
 let g:polyglot_disabled = ['latex']
 
+packadd! python-jedi
 call plug#begin('~/.vim/plugged')
+Plug 'https://github.com/andrep/vimacs'
 Plug 'https://github.com/vim/killersheep'
-Plug 'https://github.com/francoiscabrol/ranger.vim'
 Plug 'https://github.com/sheerun/vim-polyglot'
+Plug 'https://github.com/francoiscabrol/ranger.vim'
 Plug 'https://github.com/srcery-colors/srcery-vim'
 Plug 'https://github.com/knsh14/vim-github-link'
 Plug 'https://github.com/lervag/vimtex', {'for': 'tex'}
@@ -55,10 +58,10 @@ Plug 'https://github.com/racer-rust/vim-racer', {'for': 'rust'}
 Plug 'https://github.com/rhysd/rust-doc.vim', {'for': 'rust'}
 Plug 'https://github.com/artur-shaik/vim-javacomplete2', {'for': 'java'}
 call plug#end()
-source /usr/share/doc/fzf/examples/fzf.vim
 
 set t_Co=256
 colorscheme srcery
 map Q gq
 command Q q
 command W w
+nmap W :w<CR>