about summary refs log tree commit diff
path: root/users
diff options
context:
space:
mode:
Diffstat (limited to 'users')
-rw-r--r--users/grfn/system/home/modules/development/readyset.nix5
-rw-r--r--users/sterni/emacs/init.el9
2 files changed, 9 insertions, 5 deletions
diff --git a/users/grfn/system/home/modules/development/readyset.nix b/users/grfn/system/home/modules/development/readyset.nix
index e3e84a31afce..9bb9d6644db3 100644
--- a/users/grfn/system/home/modules/development/readyset.nix
+++ b/users/grfn/system/home/modules/development/readyset.nix
@@ -8,7 +8,9 @@
   home.packages = with pkgs; [
     # This goes in $PATH so I can run it from rofi and parent to my WM
     (writeShellScriptBin "dotclip" "xclip -out -selection clipboard | dot -Tpng | feh -")
-    (buildGoModule rec {
+
+    # TODO(grfn): rain fails to build with Go >=1.18, investigate.
+    (buildGo117Module rec {
       pname = "rain";
       version = "1.2.0";
 
@@ -21,6 +23,7 @@
 
       vendorSha256 = "16bx7cjh5cq9zlis8lf28i016avgqf3j9fmcvkqzd8db2vxpqx3v";
     })
+
     awscli2
     amazon-ecr-credential-helper
   ];
diff --git a/users/sterni/emacs/init.el b/users/sterni/emacs/init.el
index 0d3f9037f5fb..3c6ed78cdf71 100644
--- a/users/sterni/emacs/init.el
+++ b/users/sterni/emacs/init.el
@@ -1,3 +1,8 @@
+;; set up package infrastructure
+
+(require 'use-package)
+(package-initialize)
+
 ;; Set default font and fallback font via set-fontset-font
 ;; TODO(sterni): Investigate why ZWJ sequences aren't shaped properly
 (let ((mono-font "Bitstream Vera Sans Mono-12")
@@ -162,10 +167,6 @@
         (project-magit "Magit")))
 
 ;;; Configure packages
-(require 'use-package)
-
-(package-initialize)
-
 (use-package undo-tree
   :config
   (global-undo-tree-mode)