From 57f5808ed2886dffd6f72e6a89c702efef5945e1 Mon Sep 17 00:00:00 2001
From: Felix Albrigtsen <felix@albrigtsen.it>
Date: Fri, 15 Sep 2023 17:04:17 +0200
Subject: [PATCH] Update flake, update edison-gui

---
 base.nix                 |  2 +-
 flake.lock               | 12 ++++++------
 home/neovim.nix          |  2 ++
 home/zsh.nix             |  1 -
 hosts/edison/desktop.nix | 17 +++++++++++++++++
 hosts/edison/home.nix    |  2 +-
 hosts/worf/home.nix      |  5 ++++-
 7 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/base.nix b/base.nix
index 92b0028..f53f1b7 100644
--- a/base.nix
+++ b/base.nix
@@ -75,7 +75,7 @@
     openssh.authorizedKeys.keys = [
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDKzPICGew7uN0cmvRmbwkwTCodTBUgEhkoftQnZuO4Q felixalbrigtsen@gmail.com"
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBTXSL0w7OUcz1LzEt1T3I3K5RgyNV+MYz0x/1RbpDHQ felixalb@worf"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHkLmJIkBM6AMbYM/hYm27Flgya81UiGqh9/owYWmrbZ home.feal.no"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFiPHhj0YbklJnJNcxD0IlzPxLTGfv095H5zyS/1Wb64 felixalb@edison.home.feal.no"
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH5M7hYl3saBNMAo6sczgfUvASEJWFHuERB7xvf4gxst nix-builder-voyager-worf"
     ];
     shell = pkgs.zsh;
diff --git a/flake.lock b/flake.lock
index 9dfaea6..f83338e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -62,11 +62,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1693953029,
-        "narHash": "sha256-1+28KQl4YC4IBzKo/epvEyK5KH4MlgoYueJ8YwLGbOc=",
+        "lastModified": 1694499547,
+        "narHash": "sha256-R7xMz1Iia6JthWRHDn36s/E248WB1/je62ovC/dUVKI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4077a0e4ac3356222bc1f0a070af7939c3098535",
+        "rev": "e5f018cf150e29aac26c61dac0790ea023c46b24",
         "type": "github"
       },
       "original": {
@@ -140,11 +140,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1693844670,
-        "narHash": "sha256-t69F2nBB8DNQUWHD809oJZJVE+23XBrth4QZuVd6IE0=",
+        "lastModified": 1694669921,
+        "narHash": "sha256-6ESpJ6FsftHV96JO/zn6je07tyV2dlLR7SdLsmkegTY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3c15feef7770eb5500a4b8792623e2d6f598c9c1",
+        "rev": "f2ea252d23ebc9a5336bf6a61e0644921f64e67c",
         "type": "github"
       },
       "original": {
diff --git a/home/neovim.nix b/home/neovim.nix
index 06d7cf9..96240d2 100644
--- a/home/neovim.nix
+++ b/home/neovim.nix
@@ -31,6 +31,8 @@
       vim-nix
     ];
 
+    withNodeJs = true;
+
     extraConfig = ''
       let mapleader = ','
       set number
diff --git a/home/zsh.nix b/home/zsh.nix
index f7ba0d1..dae2cdf 100644
--- a/home/zsh.nix
+++ b/home/zsh.nix
@@ -24,7 +24,6 @@
           "directory"
           "spectrum"
           "utility"
-          "ssh"
           "completion"
           "git"
           "autosuggestions"
diff --git a/hosts/edison/desktop.nix b/hosts/edison/desktop.nix
index 6e3d853..b58cd83 100644
--- a/hosts/edison/desktop.nix
+++ b/hosts/edison/desktop.nix
@@ -8,4 +8,21 @@
   };
   services.picom.enable = true;
   hardware.opengl.enable = true;
+
+  fonts = {
+    fontDir.enable = true;
+    fonts = with pkgs; [
+      noto-fonts
+      noto-fonts-emoji
+      noto-fonts-cjk-sans
+      font-awesome
+      fira-code
+      hack-font
+      (nerdfonts.override {
+        fonts = [
+          "Hack"
+        ];
+      })
+    ];
+  };
 }
diff --git a/hosts/edison/home.nix b/hosts/edison/home.nix
index 1a52d12..7a2f874 100644
--- a/hosts/edison/home.nix
+++ b/hosts/edison/home.nix
@@ -16,7 +16,7 @@
     alacritty.enable = true;
     firefox.enable = true;
     rofi.enable = true;
-    zsh.shellAliases."rebuild" = "nixos-rebuild switch --flake /config";
+    zsh.shellAliases."rebuild" = "sudo nixos-rebuild switch --flake /config";
   };
 
   home.stateVersion = "23.05";
diff --git a/hosts/worf/home.nix b/hosts/worf/home.nix
index e42061d..19a521f 100644
--- a/hosts/worf/home.nix
+++ b/hosts/worf/home.nix
@@ -26,7 +26,10 @@
     vscode
   ];
 
-  programs.zsh.shellAliases."rebuild" = "darwin-rebuild switch --flake /Users/felixalb/nix";
+  programs.zsh = {
+    shellAliases."rebuild" = "darwin-rebuild switch --flake /Users/felixalb/nix";
+    prezto.pmodules = [ "ssh" ];
+  }
 
   # Copy Applications to ~/Applications to allow them to be launched from Spotlight
   disabledModules = [ "targets/darwin/linkapps.nix" ];