From 7a7551af0aae406aa421323c4cac7ed4a6b44624 Mon Sep 17 00:00:00 2001
From: Alejandro Soto <alejandro@34project.org>
Date: Thu, 8 Feb 2024 14:22:36 -0600
Subject: home: update for changes in 23.11

---
 home/environ.nix | 30 +++++++++++++++++-------------
 pkgs/rqlite.nix  |  2 +-
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/home/environ.nix b/home/environ.nix
index bbec900..5c5b102 100644
--- a/home/environ.nix
+++ b/home/environ.nix
@@ -1,5 +1,11 @@
 { config, lib, pkgs, ... }:
-with lib; {
+with lib; let
+  symlink = config.lib.file.mkOutOfStoreSymlink;
+
+  #TODO: No sirve, creo que por readline
+  devNull = symlink "/dev/null";
+in
+{
   config = {
     xdg.enable = true;
 
@@ -7,23 +13,17 @@ with lib; {
       "d %t/vtmp 0700"
     ];
 
-    home.file =
-      let
-        symlink = path: { source = config.lib.file.mkOutOfStoreSymlink path; };
-        #TODO: No sirve, creo que por readline
-        devNull = symlink "/dev/null";
-      in
-      {
-        "vtmp" = symlink "/run/user/${toString config.local.uid}/vtmp";
-        ".units_history" = devNull;
-        #TODO: .calc_history
-      };
+    home.file = {
+      #TODO: .calc_history
+      "vtmp".source = symlink "/run/user/${toString config.local.uid}/vtmp";
+      ".units_history".source = devNull;
+    };
 
     programs = {
       zsh = {
         enable = true;
         enableAutosuggestions = true;
-        enableSyntaxHighlighting = true;
+        syntaxHighlighting.enable = true;
         initExtra = import ./zshrc.nix pkgs;
       };
 
@@ -44,5 +44,9 @@ with lib; {
         '';
       };
     };
+
+    xdg.configFile."home-manager" = mkIf (!config.home.isolation.active) {
+      source = symlink "${config.home.homeDirectory}/nix";
+    };
   };
 }
diff --git a/pkgs/rqlite.nix b/pkgs/rqlite.nix
index 19d0fa3..86468b4 100644
--- a/pkgs/rqlite.nix
+++ b/pkgs/rqlite.nix
@@ -13,6 +13,6 @@ buildGoModule {
     sha256 = "0hi5kq8w26i8azlcxy750zmbciga6l5n090ir261n00djigm5m59";
   };
 
-  vendorSha256 = "sha256-YT1nK1vFmNCRJyWOiQhSJr83qW8uxkHXCZ81/Ch6qpg=";
+  vendorHash = "sha256-YT1nK1vFmNCRJyWOiQhSJr83qW8uxkHXCZ81/Ch6qpg=";
   doCheck = false;
 }
-- 
cgit v1.2.3