From 83ed8e6997b09a48f59209fcd44d8085c0bcad1b Mon Sep 17 00:00:00 2001
From: tristan <tristan@tristans.cloud>
Date: Fri, 14 Apr 2023 14:10:38 +0100
Subject: [PATCH] hm master branch, add more programs

---
 flake.lock               | 26 +++++--------------------
 flake.nix                |  2 +-
 system/configuration.nix |  7 +------
 users/tristan/home.nix   | 42 +++++++++++++++++++++++++++++++---------
 4 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/flake.lock b/flake.lock
index 69a5afd..6b239b6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -4,20 +4,19 @@
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
-        ],
-        "utils": "utils"
+        ]
       },
       "locked": {
-        "lastModified": 1680555990,
-        "narHash": "sha256-Tu/i5sd0hk4c4VtWO8XpY3c9KmHDcOWF5Y2GSCh3LXA=",
+        "lastModified": 1681468923,
+        "narHash": "sha256-+X2oO4juRVhQRs002mn8km6PODccIRiz09c2K1xtSpY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d6f3ba090ed090ae664ab5bac329654093aae725",
+        "rev": "17198cf5ae27af5b647c7dac58d935a7d0dbd189",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-22.11",
+        "ref": "master",
         "repo": "home-manager",
         "type": "github"
       }
@@ -42,21 +41,6 @@
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs"
       }
-    },
-    "utils": {
-      "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index b46bb3b..8db4b1c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,7 @@
 
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-unstable";
-    home-manager.url = "github:nix-community/home-manager/release-22.11";
+    home-manager.url = "github:nix-community/home-manager/master";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
   };
 
diff --git a/system/configuration.nix b/system/configuration.nix
index a424188..9151e5a 100644
--- a/system/configuration.nix
+++ b/system/configuration.nix
@@ -7,12 +7,6 @@
 { config, pkgs, ... }:
 {
 
-  #required for upgrade to unstable?
-  nixpkgs.overlays = [
-    (self: super: {fcitx-engines = pkgs.fcitx5;})
-  ];
-
-
   imports = [
     ./hardware-configuration.nix
   ];
@@ -107,6 +101,7 @@
     swaybg
     pcmanfm
     pavucontrol
+    trash-cli
     (neovim.override {
       vimAlias = true;
       configure = {
diff --git a/users/tristan/home.nix b/users/tristan/home.nix
index 79b8417..9dc23d7 100644
--- a/users/tristan/home.nix
+++ b/users/tristan/home.nix
@@ -8,19 +8,22 @@
   home.username = "tristan";
   home.homeDirectory = "/home/tristan";
 
+  xdg.userDirs.enable = true;
+
   home.packages = with pkgs; [
     gimp
     logseq
     quickemu
     exa
-    bitwarden-cli
     bitwarden
     playerctl
     nextcloud-client
-    lf
     du-dust
     godot_4
     ansible
+    ardour
+    blender
+    musescore
   ];
 
   programs.git = {
@@ -80,14 +83,14 @@
     ];
   };
   
-  # services.mako.enable = true;
+  services.mako.enable = true;
 
   programs.ncmpcpp.enable = true;
-  programs.ncmpcpp.settings.mpd_host = "192.168.1.2";
-  # services.mpd-mpris.enable = true;
-  # services.mpd-mpris.mpd = {
-  #   host = "192.168.1.2";
-  # };
+  programs.ncmpcpp.settings.mpd_host = "music.local";
+  services.mpd-mpris.enable = true;
+  services.mpd-mpris.mpd = {
+    host = "music.local";
+  };
 
   programs.mpv.enable = true;
   programs.mpv.bindings = {
@@ -108,6 +111,7 @@
   };
 
   programs.foot.enable = true;
+  programs.foot.server.enable = true;
   programs.foot.settings = {
     main = {
       term = "xterm-256color";
@@ -172,7 +176,12 @@
   };
 
   programs.notmuch.enable = true;
-  programs.neomutt.enable = true;
+  programs.neomutt = {
+    enable = true;
+    vimKeys = true;
+    sort = "reverse-date";
+    sidebar.enable = true;
+  };
   programs.mbsync.enable = true;
   services.mbsync.enable = true;
 
@@ -184,4 +193,19 @@
     };
   };
 
+  programs.ssh.enable = true;
+  programs.ssh.matchBlocks = {
+    "git.tristans.cloud" = {
+      user = "git";
+      port = 2222;
+    };
+  };
+
+  programs.neovim.defaultEditor = true;
+
+  programs.lf.enable = true;
+  programs.lf.keybindings = {
+    D = "trash";
+  };
+
 }