From 36d6f65daca766c55efe7fc1580ba58e2c28e8fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kieran.meinhardt@gmail.com>
Date: Wed, 30 Jan 2019 17:37:05 +0100
Subject: [PATCH] Configure urxvt

---
 configs/scripts.nix         |  3 ---
 configs/shells.nix          |  6 ++++++
 dot/urxvt.nix               |  5 ++++-
 dot/vim.nix                 |  4 ++--
 systems/catullus/config.nix | 11 +----------
 theme.nix                   |  4 ++--
 6 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/configs/scripts.nix b/configs/scripts.nix
index 0cad5dd..a3dfbd7 100644
--- a/configs/scripts.nix
+++ b/configs/scripts.nix
@@ -501,13 +501,10 @@ in {
     let rlwrap = cmd: "${pkgs.rlwrap}/bin/rlwrap ${cmd}";
     in {
       o = "${pkgs.xdg_utils}/bin/xdg-open";
-      ns = "nix-shell --command zsh";
-      ":r" = ''echo "You stupid!"'';
       clipboard = "${pkgs.xclip}/bin/xclip -se c";
       ip = "${pkgs.iproute}/bin/ip -c";
       ocaml = rlwrap "${pkgs.ocaml}/bin/ocaml";
       tmux = "${pkgs.tmux}/bin/tmux -2";
-      nixi = ''nix repl "<nixpkgs>"'';
     };
 
   environment.systemPackages = lib.attrsets.attrValues scripts;
diff --git a/configs/shells.nix b/configs/shells.nix
index 34ef0c4..eb04a53 100644
--- a/configs/shells.nix
+++ b/configs/shells.nix
@@ -1,5 +1,11 @@
 { pkgs, ... }:
 {
+  environment.shellAliases = {
+    ns = "nix-shell --command zsh";
+    ":r" = ''echo "You stupid!"'';
+    nixi = ''nix repl "<nixpkgs>"'';
+  };
+
   environment.interactiveShellInit = "export PATH=$PATH:$HOME/.local/bin:$HOME/.cargo/bin";
 
   programs.zsh = {
diff --git a/dot/urxvt.nix b/dot/urxvt.nix
index 6417a66..3df57fb 100644
--- a/dot/urxvt.nix
+++ b/dot/urxvt.nix
@@ -9,8 +9,11 @@ with import ../theme.nix;
   };
   scroll.bar.enable = false;
   extraConfig = {
-    perl-ext-common = "default,clipboard,url-select,keyboard-select";
+    perl-ext-common = "default,clipboard,url-select,atcher";
+    urlLauncher = "opera";
+    "matcher.button" = 3;
     fading = 50;
+    iso14755 = false;
     urgentOnBell = true;
   };
 }
diff --git a/dot/vim.nix b/dot/vim.nix
index 73a78d2..c15a4aa 100644
--- a/dot/vim.nix
+++ b/dot/vim.nix
@@ -17,7 +17,7 @@ with import ../helpers.nix;
     vim-sensible
     vim-startify
     vim-surround
-  ];
+    ];
   vimrc = ''
     " if tabular
     vmap a= :Tabularize /=<CR>
@@ -34,7 +34,7 @@ with import ../helpers.nix;
     set number
     set path=$PWD/**
     set completeopt=menu,longest
-    set wildmode=list:full
+    set wildmode=list:full wildignore+=${commaSep config.constants.ignore}
     set shortmess+=aI
     set nowritebackup noswapfile
     set mouse=a
diff --git a/systems/catullus/config.nix b/systems/catullus/config.nix
index efc49f3..f07d865 100644
--- a/systems/catullus/config.nix
+++ b/systems/catullus/config.nix
@@ -1,6 +1,5 @@
 { config, pkgs, ... }:
-/* let vimConfig = import ../../dot/vim.nix { inherit config pkgs; };
-in */ {
+{
   imports = [
     ../../configs/shells.nix
   ];
@@ -24,13 +23,6 @@ in */ {
   environment.systemPackages = with pkgs; [
     git
     htop
-/*    (vim_configurable.customize {
-      name = "kvim";
-      vimrcConfig = {
-        customRC = vimConfig.vimrc;
-        packages.kvim.start = vimConfig.startPackages;
-      };
-      })*/
     vim
   ];
 
@@ -43,7 +35,6 @@ in */ {
     createHome = true;
     group = "users";
     extraGroups = [ "wheel" ];
-    hashedPassword = "$6$w9hXyGFl/.IZBXk$5OiWzS1G.5hImhh1YQmZiCXYNAJhi3X6Y3uSLupJNYYXPLMsQpx2fwF4Xr2uYzGMV8Foqh8TgUavx1APD9rcb/";
     shell = pkgs.zsh;
   };
 }
diff --git a/theme.nix b/theme.nix
index 6292764..10b4f87 100644
--- a/theme.nix
+++ b/theme.nix
@@ -66,8 +66,8 @@ in rec {
   black = "#000000";
   gray = "#888888";
 
-  colorScheme = solarizedDark;
-  invertedColorScheme = solarizedLight;
+  colorScheme = macOS;
+  invertedColorScheme = flip macOS;
 
   colorPalette = [
     colorScheme.white.dark colorScheme.red.dark colorScheme.green.dark colorScheme.yellow.dark colorScheme.blue.dark colorScheme.magenta.dark colorScheme.cyan.dark colorScheme.black.dark