From 35955c7c171ca9c31dfdbb0940d8e030f0212101 Mon Sep 17 00:00:00 2001
From: Matthew Ess <mat@mat.services>
Date: Wed, 5 May 2021 20:17:42 -0400
Subject: [PATCH] More changes

---
 hm-configs/fish.nix     |  6 ++++++
 profiles/laptop.nix     |  5 +++--
 users/mat-hm-laptop.nix |  2 +-
 users/mat-hm.nix        | 27 ---------------------------
 4 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/hm-configs/fish.nix b/hm-configs/fish.nix
index d1d4787..ee6bee1 100644
--- a/hm-configs/fish.nix
+++ b/hm-configs/fish.nix
@@ -36,6 +36,12 @@
 
     alias nixops=~/dev/nixops/result/bin/nixops
 
+    alias sys="sudo systemctl"
+
+    alias rebuild="sudo nixos-rebuild switch"
+    alias rebuildd="sudo nixos-rebuild switch; and systemctl restart display-manager"
+    alias upgrade="sudo rm -rf /root/.cache/nix/tarballs; and sudo nix-channel --update; and sudo nixos-rebuild switch --upgrade"
+
     kitty + complete setup fish | source
   '';
 }
diff --git a/profiles/laptop.nix b/profiles/laptop.nix
index de5dce5..2903683 100644
--- a/profiles/laptop.nix
+++ b/profiles/laptop.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 {
 
@@ -7,7 +7,8 @@
   home-manager.useUserPackages = true;
   home-manager.useGlobalPkgs = true;
 
-  home-manager.users.mat = import ../users/mat-hm-laptop.nix { inherit pkgs; };
+  home-manager.users.mat =
+    import ../users/mat-hm-laptop.nix { inherit lib pkgs; };
 
   # enable power management
   powerManagement.enable = true;
diff --git a/users/mat-hm-laptop.nix b/users/mat-hm-laptop.nix
index f60b379..1369be0 100644
--- a/users/mat-hm-laptop.nix
+++ b/users/mat-hm-laptop.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
 let statusCmd = "i3status-rs ~/.config/i3status.toml";
 in {
   home = {
diff --git a/users/mat-hm.nix b/users/mat-hm.nix
index 0be0686..a8fef6b 100644
--- a/users/mat-hm.nix
+++ b/users/mat-hm.nix
@@ -53,12 +53,6 @@ in {
         alias ag=rg
         alias grep=rg
 
-        alias sys="sudo systemctl"
-
-        alias rebuild="sudo nixos-rebuild switch"
-        alias rebuildd="sudo nixos-rebuild switch; and systemctl restart display-manager"
-        alias upgrade="sudo rm -rf /root/.cache/nix/tarballs; and sudo nix-channel --update; and sudo nixos-rebuild switch --upgrade"
-
         bind \cr 'fzy_select_history (commandline -b)'
         bind -M insert \cr 'fzy_select_history (commandline -b)'
 
@@ -88,27 +82,6 @@ in {
       highlightBaseName = true;
     };
 
-    kakoune = {
-      enable = false;
-      config = {
-        numberLines = {
-          enable = true;
-          highlightCursor = true;
-          relative = true;
-        };
-        ui = {
-          enableMouse = true;
-          assistant = "cat";
-        };
-        wrapLines = {
-          enable = true;
-          indent = true;
-          marker = "⏎";
-          word = true;
-        };
-      };
-    };
-
     keychain = {
       enable = true;
       extraFlags = [ "--quiet" "--nogui" ];