update to 19.03

configs/default.nix

@@ -19,6 +19,7 @@
     <configs/htop.nix>
     <configs/dunst.nix>
     # <configs/mopidy.nix>
+    <configs/nixpkgs-unstable.nix>
     <configs/mail.nix>
     <configs/default.nix>
     <configs/python.nix>
@@ -89,10 +90,6 @@
           acronym = pkgs.callPackage <stockholm/lass/5pkgs/acronym> {};
           urban = pkgs.callPackage <stockholm/lass/5pkgs/urban> {};
           mpv-poll = pkgs.callPackage <stockholm/lass/5pkgs/mpv-poll> {};
-
-          unstable = import <nixos-unstable> {
-            config = config.nixpkgs.config;
-          };
         };
       };
     }
@@ -137,6 +134,24 @@
 
       environment.systemPackages = [ pkgs.pavucontrol pkgs.pamixer ];
     }
+    {
+      environment.systemPackages = [
+        (pkgs.unstable.writers.writeDashBin "niveum-deploy" ''
+          NIVEUM_DIR=/home/kfm/prog/git/niveum
+
+          for system in "$@"; do
+            eval $(nix-build --no-out-link "$NIVEUM_DIR/deploy.nix" -A "$system") &
+          done
+
+          wait
+        '')
+        (pkgs.unstable.writers.writeDashBin "niveum-update" ''
+          NIVEUM_DIR=/home/kfm/prog/git/niveum
+
+          nix-prefetch-git --url https://github.com/NixOS/nixpkgs-channels --rev refs/heads/nixos-18.09 > "$NIVEUM_DIR/nixpkgs.json"
+        '')
+      ];
+    }
     {
       environment.interactiveShellInit = "export PATH=$PATH:$HOME/.local/bin:$HOME/.cargo/bin";
       environment.shellAliases = {
@@ -153,7 +168,6 @@
         ls = "${pkgs.exa}/bin/exa";
         ll = "${pkgs.exa}/bin/exa -l";
         la = "${pkgs.exa}/bin/exa -la";
-        niveum-update = "nix-prefetch-git --url https://github.com/NixOS/nixpkgs-channels --rev refs/heads/nixos-18.09 > ~niveum/nixpkgs.json";
       };
     }
     {
@@ -271,7 +285,7 @@
         })
         pandoc
         haskellPackages.pandoc-citeproc
-        haskellPackages.patat
+        # haskellPackages.patat
         asciidoctor
         proselint
       ] ++ [ # programming

configs/haskell/default.nix

@@ -6,10 +6,10 @@
       :def hoogle \s -> return $ ":!${pkgs.haskellPackages.hoogle}/bin/hoogle search --color -l --count=15 \"" ++ s ++ "\""
       :def doc \s -> return $ ":!${pkgs.haskellPackages.hoogle}/bin/hoogle search --color -l --info \"" ++ s ++ "\""
       :def pl \x -> return $ ":!${pkgs.haskellPackages.pointfree}/bin/pointfree -v \"" ++ x ++ "\""
-      :def unpl \x -> return $ ":!${pkgs.haskellPackages.pointful}/bin/pointful \"" ++ x ++ "\""
       :set prompt "\o033[1m%s\o033[1;34m λ\o033[0m "
       :set -Wall
     '';
+      # :def unpl \x -> return $ ":!${pkgs.haskellPackages.pointful}/bin/pointful \"" ++ x ++ "\""
     ".stack/config.yaml".text = let user = config.niveum.user; in ''
       templates:
         params:
@@ -30,16 +30,16 @@
     stack2nix
     cabal-install
     hlint
-    haskellPackages.brittany
+    # haskellPackages.brittany
     (haskellPackages.ghcWithHoogle (import ./packages.nix))
   ] ++ map haskell.lib.justStaticExecutables [
     haskellPackages.ghcid
     haskellPackages.hakyll
-    haskellPackages.hfmt
+    # haskellPackages.hfmt
     haskellPackages.hasktags
     haskellPackages.hindent
     haskellPackages.pointfree
-    haskellPackages.pointful
+    # haskellPackages.pointful
     haskellPackages.hpack
   ];
 }

configs/haskell/packages.nix

@@ -8,7 +8,7 @@ with haskellPackages; [
   ad
   adjunctions
   aeson
-  algebra
+  # algebra
   ansi-terminal
   async
   attoparsec

configs/i3.nix

@@ -133,9 +133,9 @@ in with config.niveum; {
         "${modifier}+Shift+Left" = "move left";
         "${modifier}+Shift+Right" = "move right";
         "${modifier}+Shift+Up" = "move up";
+        "${modifier}+Shift+b" = "move window to workspace prev";
         "${modifier}+Shift+c" = "reload";
         "${modifier}+Shift+n" = "move window to workspace next";
-        "${modifier}+Shift+b" = "move window to workspace prev";
         "${modifier}+Shift+q" = "kill";
         "${modifier}+Shift+r" = "restart";
         "${modifier}+Shift+w" = "exec ${pkgs.xautolock}/bin/xautolock -locknow";
@@ -143,12 +143,16 @@ in with config.niveum; {
         "${modifier}+Shift+z" = "floating toggle";
         "${modifier}+Up" = "focus up";
         "${modifier}+a" = "exec ${pkgs.rofi}/bin/rofi -display-window — -show window";
+        "${modifier}+b" = "workspace prev";
+        "${modifier}+c" = "split h";
         "${modifier}+d" = "exec ${pkgs.rofi}/bin/rofi -display-run — -show run";
         "${modifier}+e" = "layout toggle split";
         "${modifier}+f" = "fullscreen toggle";
-        "${modifier}+h" = "split h";
+        "${modifier}+h" = "focus left";
+        "${modifier}+j" = "focus down";
+        "${modifier}+k" = "focus up";
+        "${modifier}+l" = "focus right";
         "${modifier}+n" = "workspace next";
-        "${modifier}+b" = "workspace prev";
         "${modifier}+p" = "exec ${pkgs.rofi-pass}/bin/rofi-pass";
         "${modifier}+r" = "mode resize";
         "${modifier}+s" = "layout stacking";

configs/mopidy.nix

@@ -4,11 +4,13 @@ in {
   services.mopidy = {
     enable = true;
     extensionPackages = [
-      pkgs.mopidy-spotify
-      pkgs.mopidy-iris
       pkgs.mopidy-gmusic
+      pkgs.mopidy-iris
       pkgs.mopidy-moped
+      pkgs.mopidy-mopify
       pkgs.mopidy-soundcloud
+      pkgs.mopidy-spotify
+      pkgs.mopidy-spotify-tunigo
       pkgs.mopidy-youtube
     ];
     configuration = ''

configs/nixpkgs-unstable.nix

@@ -0,0 +1,8 @@
+{ config, ... }:
+{
+  nixpkgs.config.packageOverrides = pkgs: {
+    unstable = import <nixos-unstable> {
+      config = config.nixpkgs.config;
+    };
+  };
+}

configs/todoist.nix

@@ -1,17 +1,11 @@
 { pkgs, ... }:
 let
   secrets = import <dot/secrets.nix>;
-  todoist = pkgs.unstable.callPackage <packages/todoist.nix> {};
 in {
-  environment.systemPackages = [
-    (pkgs.unstable.writers.writeDashBin "todoist" ''
-      ${todoist}/bin/todoist --color $@
-    '')
-  ];
+  imports = [ <modules/todoist.nix> ];
 
-  home-manager.users.me.home.file.".todoist.config.json".text = ''
-    {
-      "token": "${secrets.todoist.token}"
-    }
-  '';
+  niveum.todoist = {
+    enable = true;
+    token = secrets.todoist.token;
+  };
 }

configs/zsh.nix

@@ -39,13 +39,6 @@
         mkdir $1
         cd $1
       }
-
-      niveum-deploy() {
-        for system in "$@"; do
-          eval $(nix-build --no-out-link ~niveum/deploy.nix -A "$system") &
-        done
-        wait
-      }
     '';
     promptInit = ''
       autoload -Uz vcs_info