Put things up to date

.gitignore

@@ -2,4 +2,8 @@
 /host.nix
 *-secret.nix
 
+/res/tinc
+/res/taskwarrior
+/res/rsync
+
 result

commandline.nix

@@ -3,7 +3,11 @@
 with import ./lib/theme.nix { inherit lib; };
 let
   dominantEscapeCode = fgEscapeCode config.theme.colors.dominant;
-  myPackages = import ./packages { inherit pkgs; };
+  myPackages = import ./packages { inherit pkgs config; };
+
+  shellScripts = {
+    split-cue = ./scripts/standalone/split-cue.sh;
+  };
 in
 {
   environment.shellAliases = {
@@ -23,6 +27,11 @@ in
 
       source "${myPackages.zsh-history-substring-search}"
 
+      alias ${concatStringsSep " "
+        (mapAttrsToList
+          (name: script: "${name}=\"${script}\"")
+          shellScripts)}
+
       function () {
         local dominant_escape_code="${dominantEscapeCode}"
         local dim_fg_escape_code="${fgEscapeCode config.theme.colors.dimForeground}"

configuration.nix

@@ -16,6 +16,7 @@
       ./host.nix
       ./networking.nix
       ./tmux.nix
+      ./topology-secret.nix
       ./vim.nix
       ./x.nix
     ];
@@ -44,7 +45,7 @@
     wipe
     git
     gnupg
-    nox nix-prefetch-scripts nix-repl
+    nox nix-prefetch-scripts
     shellcheck
   ];
 
@@ -70,23 +71,36 @@
 
   services.printing = {
     enable = true;
-    drivers = [ pkgs.gutenprint ];
+    drivers = [ pkgs.gutenprint pkgs.mfcl2720dwcupswrapper ];
   };
 
+  services.journald.rateLimitBurst = 1000;
+
+  programs.adb.enable = true;
+
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.extraUsers.minijackson = {
     isNormalUser = true;
     uid = 1000;
-    extraGroups = [ "users" "wheel" "networkmanager" "lp" "video" "input" ];
+    extraGroups = [ "users" "wheel" "networkmanager" "lp" "video" "input" "adbusers" ];
     openssh.authorizedKeys.keys = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCmyjB5yuU8GK3ZVFznELVEwXN7zzjQJcPYZ89YCGTANjPHpHxZv5R9/kgjTtIKrqqHdTvfr8V8sao9Nr7PhtcV9UywrFn+kplyGf9WDl2oDF9eZprX3beR9zwDj/YIcFRx3wXk4JK/ioZJjcVZ3+xWPixiFplvHIyMsTjKfgRplntHpvoyLM8vURjLOCdPr6SRPReVXuSR2DRlVO7q7y+4FwA1FKAndg9YACoM1g2bEJ6eGyCPp2kFde+GvMv1y6FlBS1OFddGmBpUJzJ4mQ4ebqDVFsKQMx1xCkiz0l7tfVpXqXToHF+baTESEKbC4654PunD99BC0J4otHKrerdmX0HdTgHKtAnslSwRD5NZVAojk/CR3DiSQYFSO9OhFVjHNQsc1zpoKPtJYMe1ax3pcvc+XLCrKLUdHH8x9rVGefZXwIyLrrGrB7fVlyIyX7j04dNALQZiuFOKCInaYypVLHLy0k+buhQlVqKCS6N1xP5O6JiWUKXFYYyoRmSoX9+bfPiwsMrPL+rYXkee0K67BI1NiFAYPmdFFM0jtdFaYuvgEAWw7b9WyWyO/JAdHRwtlqfAqraPBrb4sldvQfLBm8RdORBYMaVbg4EUKMOJjIeAAK+7xWPtg2XeJNnsje/IsWaVXIBx2IAC50uAnIZ/ksw5lyAZP+HyGIHhCAQChQ== [email protected]"];
   };
 
   nixpkgs.config.allowUnfree = true;
 
-  nix.gc = {
-    automatic = true;
-    dates = "03:15";
-    options = "--delete-older-than 30d";
+  nix = {
+    binaryCaches = [ "https://hydra.huh.gdn/" "https://cache.nixos.org/" ];
+    binaryCachePublicKeys = [
+      "hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs="
+      "hydra.huh.gdn-1:MZDmrn/p0MxBN2ScynKJd7v6TVC7vxRTGK8E9vxkxEk="
+    ];
+
+    autoOptimiseStore = true;
+    gc = {
+      automatic = true;
+      dates = "03:15";
+      options = "--delete-older-than 30d";
+    };
   };
 
   system.autoUpgrade.enable = true;
@@ -95,6 +109,5 @@
   # 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 = "18.03"; # Did you read the comment?
-
+  system.stateVersion = "18.09"; # Did you read the comment?
 }

dotfiles/alacritty.yml

@@ -31,7 +31,28 @@ window:
 
   # Window decorations
   # Setting this to false will result in window without borders and title bar.
-  decorations: true
+  decorations: full
+
+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
+
+  # Faux Scrolling
+  #
+  # The `faux_multiplier` setting controls the number of lines the terminal
+  # should scroll when the alternate screen buffer is active. This is used
+  # to allow mouse scrolling for applications like `man`.
+  #
+  # Specifying `0` will disable faux scrolling.
+  faux_multiplier: 3
+
+  # Scroll to the bottom when new text is written to the terminal.
+  auto_scroll: false
 
 # Display tabs using this many cells (changes require restart)
 tabspaces: 4
@@ -79,19 +100,21 @@ font:
 
   # Point size of the font
   size: 9.0
+  # size: 6.0
 
   # Offset is the extra space around each character. offset.y can be thought of
   # as modifying the linespacing, and offset.x as modifying the letter spacing.
   offset:
-    x: 0.0
-    y: 0.0
+    x: 0
+    y: 0
 
   # Glyph offset determines the locations of the glyphs within their cells with
   # the default being at the bottom. Increase the x offset to move the glyph to
   # the right, increase the y offset to move the glyph upward.
   glyph_offset:
-    x: 0.0
-    y: -1.7
+    x: 0
+    # y: -1.7
+    y: 0
 
   # OS X only: use thin stroke font rendering. Thin strokes are suitable
   # for retina displays, but for non-retina you probably want this set to
@@ -101,17 +124,22 @@ font:
 # Should display the render timer
 render_timer: false
 
-# Use custom cursor colors. If true, display the cursor in the cursor.foreground
-# and cursor.background colors, otherwise invert the colors of the cursor.
-custom_cursor_colors: false
-
 # Colors (Gruvbox from gruvbox-contrib's Xresources)
 colors:
   # Default colors
   primary:
     background: '0x32302f'
     foreground: '0xebdbb2'
 
+  # Cursor colors
+  #
+  # Colors which should be used to draw the terminal cursor. If these are unset,
+  # the cursor color will be the inverse of the cell color.
+  #
+  #cursor:
+  #  text: '0x000000'
+  #  cursor: '0xffffff'
+
   # Normal colors
   normal:
     black:   '0x282828'
@@ -242,23 +270,24 @@ mouse:
   # screen buffer is active. This is used to allow mouse
   # scrolling for applications like `man`.
   #
-  # To disable this completely, set `faux_scrollback_lines` to 0.
-  faux_scrollback_lines: 1
+  # To disable this completely, set `faux_scrolling_lines` to 0.
+  faux_scrolling_lines: 1
+
+  hide_when_typing: false
 
 selection:
   semantic_escape_chars: ",│`|:\"' ()[]{}<>"
 
 dynamic_title: true
 
-hide_cursor_when_typing: false
-
-# Style of the cursor
-#
-# Values for 'cursor_style':
-# - Block
-# - Underline
-# - Beam
-cursor_style: Block
+cursor:
+  # Style of the cursor
+  #
+  # Values for 'cursor_style':
+  # - Block
+  # - Underline
+  # - Beam
+  style: Block
 
 # Live config reload (changes require restart)
 live_config_reload: true

dotfiles/ncmpcpp

@@ -25,7 +25,7 @@ header_visibility = "yes"
 statusbar_visibility = "yes"
 song_list_format = "{%a - }{%t}|{$5%f$9}$R{$7(%l)$9}"
 song_status_format = "$2%a $1• $3%t $1• $4%b {(Disc %d) }$1• $5%y$1"
-song_window_title_format = "{%a - }{%t}|{%f}"
+song_window_title_format = "Ncmpcpp: {%a - }{%t}|{%f}"
 song_columns_list_format = "(7f)[white]{n} (33)[cyan]{t} (20)[green]{a} (20)[magenta]{b} (10)[magenta]{y} (7f)[white]{l}"
 playlist_display_mode = "columns"
 browser_display_mode = "columns"