From d76e388c3adef206e892ca2d48a79f4a08145c43 Mon Sep 17 00:00:00 2001
From: Tristan Druyen <tristan@vault81.de>
Date: Tue, 3 Oct 2023 20:10:02 +0200
Subject: [PATCH] WIP

- add lorri
- add virtiofsd
- add fwupd
- add inkscape
- remove uneeded nodejs
---
 configuration.nix |  3 +++
 flake.lock        | 36 ++++++++++++++++++------------------
 home.nix          | 13 +++++++++++--
 3 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 72a71b1..61076b5 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -78,6 +78,8 @@
     "2a07:a8c1::#921984.dns.nextdns.io"
   ];
 
+  services.fwupd.enable = true;
+
   services.resolved = {
     enable = true;
     dnssec = "true";
@@ -174,6 +176,7 @@
     neovim
     veracrypt
     vim
+    virtiofsd
     virt-manager
     virt-viewer
     virt-top
diff --git a/flake.lock b/flake.lock
index 814e754..5a930cd 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1695864092,
-        "narHash": "sha256-Hu1SkFPqO7ND95AOzBkZE2jGXSYhfZ965C03O72Kbu8=",
+        "lastModified": 1696266752,
+        "narHash": "sha256-wJnMDFM21+xXdsXSs6pXMElbv4YfqmQslcPApRuaYKs=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "19b62324663b6b9859caf7f335d232cf4f1f6a32",
+        "rev": "646ee25c25fffee122a66282861f5f56ad3e0fd9",
         "type": "github"
       },
       "original": {
@@ -29,11 +29,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1695978843,
-        "narHash": "sha256-xeKBrbNT5dQK3ZkZWrji7/mqRJNf+Avbz93zR67t+XQ=",
+        "lastModified": 1696328081,
+        "narHash": "sha256-bLByhTgLUi5VNwagMyHtG2+wJ7HDjf8rNjokDgN3wCw=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "ec14828ed25f48db0c94f49d29ebe1a455a5a58c",
+        "rev": "a202ec0db49962241a811481ba15ac7e98ebad04",
         "type": "github"
       },
       "original": {
@@ -157,11 +157,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1695526222,
-        "narHash": "sha256-/NwZz3QcVplrfiDKk1thYg1EIHLSNucVHNUi2uwO3RI=",
+        "lastModified": 1696131323,
+        "narHash": "sha256-Y47r8Jo+9rs+XUWHcDPZtkQs6wFeZ24L4CQTfVwE+vY=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "25d6369c232bbea1ec1f90226fd17982e7a0a647",
+        "rev": "031d4b22505fdea47bd53bfafad517cd03c26a4f",
         "type": "github"
       },
       "original": {
@@ -194,11 +194,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1695825837,
-        "narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=",
+        "lastModified": 1696039360,
+        "narHash": "sha256-g7nIUV4uq1TOVeVIDEZLb005suTWCUjSY0zYOlSBsyE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e",
+        "rev": "32dcb45f66c0487e92db8303a798ebc548cadedc",
         "type": "github"
       },
       "original": {
@@ -210,11 +210,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1695825837,
-        "narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=",
+        "lastModified": 1696039360,
+        "narHash": "sha256-g7nIUV4uq1TOVeVIDEZLb005suTWCUjSY0zYOlSBsyE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e",
+        "rev": "32dcb45f66c0487e92db8303a798ebc548cadedc",
         "type": "github"
       },
       "original": {
@@ -258,11 +258,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1695988627,
-        "narHash": "sha256-2okyXjZ1LjHJgX4wJXcH34dxFAieZ7hNNkBXmoRH1Mw=",
+        "lastModified": 1696351685,
+        "narHash": "sha256-lSNGQttwfSm9G3gEo8Pc5dZdUfMxKKIyUKts/J+UxT4=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "b286ae7094de09e613dab025dbc48e27af03ed5a",
+        "rev": "8d2064f5786202d354d073cb30336386fe7fc19b",
         "type": "github"
       },
       "original": {
diff --git a/home.nix b/home.nix
index 5352fe9..2d86979 100644
--- a/home.nix
+++ b/home.nix
@@ -36,6 +36,7 @@ in {
     };
   };
 
+  services.lorri.enable = true;
   services.emacs = {
     enable = true;
     defaultEditor = true;
@@ -50,6 +51,13 @@ in {
   programs.fish = {
     enable = true;
 
+    interactiveShellInit = ''
+      direnv hook fish | source
+    '';
+    loginShellInit = ''
+      direnv hook fish | source
+    '';
+
     functions = {
       ec = "emacsclient $argv";
       ecc = "emacsclient -c $argv";
@@ -316,6 +324,7 @@ in {
   home.file.".background".source = wallpaperPath;
 
   home.packages = with pkgs; [
+    cavalier
     alejandra
     atool
     alacritty
@@ -328,18 +337,18 @@ in {
     binutils
     brave
     btop
-    direnv
     cmake
     customPkgs.emacs-unstable-pgtk
     firefox
+    inkscape
     jellyfin-media-player
     neofetch
     nextcloud-client
     onlyoffice-bin
-    nodejs_20
     kate
     rcm
     rustup
+    direnv
     rust-motd
     (ripgrep.override {withPCRE2 = true;})
     gnutls