From 838efd409367057cdcd52dfed14493c71792a0e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kieran.meinhardt@gmail.com>
Date: Fri, 16 Oct 2020 08:23:27 +0200
Subject: [PATCH] feat: depend less on nixpkgs-unstable

---
 configs/alacritty.nix              | 5 ++---
 configs/fonts.nix                  | 2 +-
 configs/hledger.nix                | 4 ++--
 configs/i3.nix                     | 6 +++---
 configs/packages/default.nix       | 1 +
 configs/packages/writing.nix       | 2 +-
 modules/hledger.nix                | 2 +-
 systems/catullus/configuration.nix | 1 -
 8 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/configs/alacritty.nix b/configs/alacritty.nix
index ee28adf..f5da359 100644
--- a/configs/alacritty.nix
+++ b/configs/alacritty.nix
@@ -35,9 +35,8 @@ let
 in {
   environment.variables.TERMINAL = "alacritty";
 
-  environment.systemPackages = with pkgs; [
-    unstable.alacritty
-    unstable.alacritty.terminfo
+  environment.systemPackages = [
+    pkgs.unstable.alacritty
   ];
 
   home-manager.users.me.xdg.configFile = {
diff --git a/configs/fonts.nix b/configs/fonts.nix
index 3cfa552..45346ad 100644
--- a/configs/fonts.nix
+++ b/configs/fonts.nix
@@ -23,7 +23,7 @@
       source-sans-pro
       ubuntu_font_family
       gfs-fonts
-      unstable.jetbrains-mono
+      jetbrains-mono
       twemoji-color-font
       joypixels
     ];
diff --git a/configs/hledger.nix b/configs/hledger.nix
index 6cd963f..cebce5f 100644
--- a/configs/hledger.nix
+++ b/configs/hledger.nix
@@ -7,8 +7,8 @@
     server = {
       enable = false;
       user = config.users.users.me;
-      package = pkgs.unstable.hledger-web;
+      package = pkgs.hledger-web;
     };
-    package = pkgs.unstable.hledger;
+    package = pkgs.hledger;
   };
 }
diff --git a/configs/i3.nix b/configs/i3.nix
index 06eb481..39f891e 100644
--- a/configs/i3.nix
+++ b/configs/i3.nix
@@ -29,10 +29,10 @@ let
     };
   };
 
-  new-workspace = pkgs.unstable.writers.writeDash "new-workspace" ''
+  new-workspace = pkgs.writers.writeDash "new-workspace" ''
     i3-msg workspace $(($(i3-msg -t get_workspaces | tr , '\n' | grep '"num":' | cut -d : -f 2 | sort -rn | head -1) + 1))
   '';
-  move-to-new-workspace = pkgs.unstable.writers.writeDash "new-workspace" ''
+  move-to-new-workspace = pkgs.writers.writeDash "new-workspace" ''
     i3-msg move container to workspace $(($(i3-msg -t get_workspaces | tr , '\n' | grep '"num":' | cut -d : -f 2 | sort -rn | head -1) + 1))
   '';
 
@@ -146,7 +146,7 @@ in with config.niveum; {
             text = colours.foreground;
           };
         };
-        statusCommand = "${pkgs.unstable.i3status-rust}/bin/i3status-rs ${
+        statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs ${
             pkgs.writeTOML (import <niveum/dot/i3status-rust.nix> {
               wifi-interface = networkInterfaces.wireless;
               batteryBlock = batteryBlocks.default;
diff --git a/configs/packages/default.nix b/configs/packages/default.nix
index 7a8bdf3..70ec719 100644
--- a/configs/packages/default.nix
+++ b/configs/packages/default.nix
@@ -100,6 +100,7 @@
     pdfgrep # search in pdf
     pdftk # pdf toolkit
     evince # for viewing pdf annotations
+    xournal # for annotating pdfs
     youtubeDL
     bc # calculator
     scripts.default-gateway
diff --git a/configs/packages/writing.nix b/configs/packages/writing.nix
index c81d51e..193d6a9 100644
--- a/configs/packages/writing.nix
+++ b/configs/packages/writing.nix
@@ -71,7 +71,7 @@ in {
     haskellPackages.pandoc-citeproc
     # nur.repos.kmein.text2pdf
     libreoffice
-    pandoc
+    unstable.pandoc
     # proselint
     asciidoctor
     wordnet
diff --git a/modules/hledger.nix b/modules/hledger.nix
index 367b797..f50cf21 100644
--- a/modules/hledger.nix
+++ b/modules/hledger.nix
@@ -31,7 +31,7 @@ in {
     server = {
       enable = mkEnableOption "hledger server";
       port = mkOption {
-        type = pkgs.unstable.lib.types.port;
+        type = types.port;
         default = 5000;
       };
       host = mkOption {
diff --git a/systems/catullus/configuration.nix b/systems/catullus/configuration.nix
index 0c05d70..85cc926 100644
--- a/systems/catullus/configuration.nix
+++ b/systems/catullus/configuration.nix
@@ -8,7 +8,6 @@ let
     wilde =
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDyTnGhFq0Q+vghNhrqNrAyY+CsN7nNz8bPfiwIwNpjk kfm@wilde";
   };
-  unstable = import <nixos-unstable> { };
   wtf-config = pkgs.writeJSON "config.yml" {
     wtf = {
       colors = {