From 211a0aa73632b5a422976edb10990c62d576b1fb Mon Sep 17 00:00:00 2001
From: mat ess <mat@mat.services>
Date: Wed, 20 Apr 2022 16:31:11 -0400
Subject: [PATCH] More minor tweaks

---
 flake.lock       | 36 ++++++++++++++++++------------------
 home/default.nix |  7 +++++++
 home/shells.nix  | 32 ++++++++++++++++----------------
 3 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/flake.lock b/flake.lock
index 9c5e508..a428e63 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1642495030,
-        "narHash": "sha256-u1ZlFbLWzkM6zOfuZ1tr0tzTuDWucOYwALPWDWLorkE=",
+        "lastModified": 1648278671,
+        "narHash": "sha256-1WrR9ex+rKTjZtODNUZQhkWYUprtfOkjOyo9YWL2NMs=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "bcdb6022b3a300abf59cb5d0106c158940f5120e",
+        "rev": "4fdbb8168f61d31d3f90bb0d07f48de709c4fe79",
         "type": "github"
       },
       "original": {
@@ -24,11 +24,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1641205782,
-        "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=",
+        "lastModified": 1648199409,
+        "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7",
+        "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03",
         "type": "github"
       },
       "original": {
@@ -39,11 +39,11 @@
     },
     "flake-utils": {
       "locked": {
-        "lastModified": 1642700792,
-        "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=",
+        "lastModified": 1649676176,
+        "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba",
+        "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
         "type": "github"
       },
       "original": {
@@ -59,11 +59,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1642882610,
-        "narHash": "sha256-pmdgeJ9v6y+T0UfNQ/Z+Hdv5tPshFFra5JLF/byUA/Y=",
+        "lastModified": 1650301786,
+        "narHash": "sha256-9rz9NqL+mC+BIggn2emuzZ+3MYogxVBTdsFK7E3Vv1k=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c47c350f6518ed39c2a16e4fadf9137b6c559ddc",
+        "rev": "8d38ca886880265d523a66fe3da4d42e92ab0748",
         "type": "github"
       },
       "original": {
@@ -74,11 +74,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1642814097,
-        "narHash": "sha256-4H0Pk/x8eKth06f+mVucLO6saavVEqJVqXprTPfFJiA=",
+        "lastModified": 1650287833,
+        "narHash": "sha256-lTmQ/Yj7zjtRAcEstIa4sxOvn6vAQRsgekX88wO2CXI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "fd2624ba104e8b9f9b6b6a7941226b35a58fe41a",
+        "rev": "ac1191a866bf974d7e246cc7bb0b9c7e80d7cd7a",
         "type": "github"
       },
       "original": {
@@ -90,11 +90,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1642791444,
-        "narHash": "sha256-vVKbyx3g2a4oa1jFbmR1O5emQrK+kSf2lfsYu3OhLSI=",
+        "lastModified": 1650194139,
+        "narHash": "sha256-kurZsqeOw5fpqA/Ig+8tHvbjwzs5P9AE6WUKOX1m6qM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f23965369e2d3123b370cc3ba03be835b1e2f5db",
+        "rev": "bd4dffcdb7c577d74745bd1eff6230172bd176d5",
         "type": "github"
       },
       "original": {
diff --git a/home/default.nix b/home/default.nix
index 27cac71..89426b3 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -114,6 +114,13 @@
     enable = true;
   };
 
+  home.file.".pijulconfig".text = ''
+    [author]
+    name = "mat"
+    full_name = "mat ess"
+    email = "mat@mat.services"
+  '';
+
   # https://docs.haskellstack.org/en/stable/yaml_configuration/#non-project-specific-config
   # home.file.".stack/config.yaml".text = lib.generators.toYAML {} {
   #   templates = {
diff --git a/home/shells.nix b/home/shells.nix
index b5a2a80..b604cf4 100644
--- a/home/shells.nix
+++ b/home/shells.nix
@@ -20,20 +20,18 @@
     }
   ];
 
-  home.file = {
-    ".config/fish/fish_plugins".text = ''
-      jorgebucaran/autopair.fish
-      jorgebucaran/replay.fish
-      jorgebucaran/getopts.fish
-      americanhanko/fish-spin
-      joseluisq/gitnow
-      fishpkg/fish-humanize-duration
-      oh-my-fish/plugin-bang-bang
-      matthewess/fish-autovenv
-      jethrokuan/z
-      Gazorby/fish-abbreviation-tips
-    '';
-  };
+  home.file".config/fish/fish_plugins".text = ''
+    jorgebucaran/autopair.fish
+    jorgebucaran/replay.fish
+    jorgebucaran/getopts.fish
+    americanhanko/fish-spin
+    joseluisq/gitnow
+    fishpkg/fish-humanize-duration
+    oh-my-fish/plugin-bang-bang
+    matthewess/fish-autovenv
+    jethrokuan/z
+    Gazorby/fish-abbreviation-tips
+  '';
 
   # Fish functions ----------------------------------------------------------------------------- {{{
 
@@ -137,7 +135,7 @@
       drs = "darwin-rebuild switch --flake ${nixConfigDir}/";
       drc = "codium ${nixConfigDir}";
       drv = "vim ${nixConfigDir}";
-      flakeup = "nix flake update --recreate-lock-file ${nixConfigDir}/";
+      flakeup = "nix flake update ${nixConfigDir}/";
       nb = "nix build";
       nd = "nix develop";
       nf = "nix flake";
@@ -197,7 +195,9 @@
     # See docs here: https://starship.rs/config/
     # Symbols config configured in Flake.
 
-    battery.display.threshold = 25; # display battery information if charge is <= 25%
+    battery.display = [
+      { threshold = 25; } # display battery information if charge is <= 25%
+    ];
     directory.fish_style_pwd_dir_length = 1; # turn on fish directory truncation
     directory.truncation_length = 2; # number of directories not to truncate
     # hostname.style = "bold green"; # don't like the default