about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--dev/.gitconfig8
-rw-r--r--nix/awesome.nix4
-rw-r--r--nix/configuration.nix2
-rw-r--r--nix/games.nix5
-rw-r--r--vim/.vim/vimrc1
5 files changed, 9 insertions, 11 deletions
diff --git a/dev/.gitconfig b/dev/.gitconfig
index 1303733..58af7c9 100644
--- a/dev/.gitconfig
+++ b/dev/.gitconfig
@@ -7,11 +7,6 @@
 	smtpuser = mcsinyx@disroot.org
 	smtpencryption = ssl
 	smtpserverport = 465
-[filter "lfs"]
-	clean = git-lfs clean -- %f
-	smudge = git-lfs smudge -- %f
-	process = git-lfs filter-process
-	required = true
 [color]
 	ui = auto
 [pull]
@@ -23,6 +18,9 @@
 [push]
 	followTags = true
 [core]
+	abbrev = 12
 	pager = less
 [commit]
 	gpgsign = true
+[pretty]
+	fixes = Fixes: %h (\"%s\")
diff --git a/nix/awesome.nix b/nix/awesome.nix
index 4116405..c9bde99 100644
--- a/nix/awesome.nix
+++ b/nix/awesome.nix
@@ -34,11 +34,11 @@
   };
 
   environment.systemPackages = with pkgs; [
-    gnome.adwaita-icon-theme gnome.networkmanagerapplet qt5ct
+    gnome.adwaita-icon-theme networkmanagerapplet qt5ct
     clipbuzz keynav playerctl pulsemixer xclip xdotool xorg.xkill
     aerc amfora ncdu ranger ueberzug rxvt-unicode vim_configurable
     arandr audacious keepassx-community liferea scrot zathura
-    firefox libreoffice mumble nheko tor-browser-bundle-bin transmission-gtk
+    dino firefox libreoffice mepo nheko tor-browser-bundle-bin transmission-gtk
   ];
 
   hardware.brillo.enable = true;
diff --git a/nix/configuration.nix b/nix/configuration.nix
index e9c6e31..3317930 100644
--- a/nix/configuration.nix
+++ b/nix/configuration.nix
@@ -67,7 +67,7 @@
     compsize cryptsetup htop inotify-tools killall rsync unzip
     oathToolkit isync stow tor w3m wget yt-dlp
     mpv pavucontrol sent vimiv-qt yacreader
-    ffmpeg gifski gimp imagemagick inkscape pdftk simplescreenrecorder sox
+    ffmpeg gimp imagemagick inkscape mkvtoolnix pdftk simplescreenrecorder sox
   ];
 
   programs.iotop.enable = true;
diff --git a/nix/games.nix b/nix/games.nix
index d441078..63e3ccf 100644
--- a/nix/games.nix
+++ b/nix/games.nix
@@ -6,8 +6,7 @@
     astromenace chromium-bsu # scrolling
     azimuth cdogs-sdl taisei # shmup
     bastet moon-buggy n2048 # text
-    # blackshades redeclipse warsow xonotic-glx # fps
-    redeclipse xonotic-glx
+    blackshades redeclipse xonotic-glx
     blobwars openclonk sienna superTux # platformer
     bonzomatic love # engine
     extremetuxracer gl117 gltron superTuxKart # vehicle
@@ -17,6 +16,6 @@
     (steam.override {
       nativeOnly = true;
       extraPkgs = pkgs: [ SDL2_net ];
-    }).run gnome.gtk # launcher
+    }).run # launcher
   ];
 }
diff --git a/vim/.vim/vimrc b/vim/.vim/vimrc
index 2b28cca..1c16a78 100644
--- a/vim/.vim/vimrc
+++ b/vim/.vim/vimrc
@@ -32,6 +32,7 @@ augroup vimrc
   autocmd FileType markdown,rst,tex setlocal spell
   autocmd BufWinEnter *
         \ if &filetype ==# 'python' || &filetype ==# 'cython'
+        \ || &filetype ==# 'mail'
         \ | let w:m1=matchadd('ColorColumn', '\%<80v.\%>73v', -1) |
         \ else
         \ | let w:m1=matchadd('ColorColumn', '\%<81v.\%>80v', -1) |