From 2a6d8527bfb72a3de076e98e97d242a542ac9e73 Mon Sep 17 00:00:00 2001
From: Fabian Hauser <fabian@fh2.ch>
Date: Thu, 26 Sep 2024 15:23:01 +0300
Subject: [PATCH] Update inputs and config

---
 flake.lock                         | 43 +++++++++++++++---------------
 home/fhauser/applications/git.nix  |  5 +++-
 home/fhauser/applications/sway.nix |  8 ------
 3 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/flake.lock b/flake.lock
index 8119aaf..9d1759c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "catppuccin": {
       "locked": {
-        "lastModified": 1724469296,
-        "narHash": "sha256-p3R4LUNk6gC+fTKRUm9ByXaoRIocnQMwVuJSIxECQ8o=",
+        "lastModified": 1726952185,
+        "narHash": "sha256-l/HbsQjJMT6tlf8KCooFYi3J6wjIips3n6/aWAoLY4g=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "874e668ddaf3687e8d38ccd0188a641ffefe1cfb",
+        "rev": "630b559cc1cb4c0bdd525af506935323e4ccd5d1",
         "type": "github"
       },
       "original": {
@@ -204,11 +204,11 @@
         "unionmount": "unionmount_2"
       },
       "locked": {
-        "lastModified": 1725314969,
-        "narHash": "sha256-5ur6rsukYxP3yTfLz1YCd1jxWWGMRWT4K7OJA+25mRA=",
+        "lastModified": 1727131729,
+        "narHash": "sha256-jZmKq9XLM+rWz3kAq8p3cPm1r768s+Y9lrZdEXEwXxQ=",
         "owner": "srid",
         "repo": "emanote",
-        "rev": "0e61263fadead77a7ffbcd1eeedf64ac60049a80",
+        "rev": "40607a267c4c78b6a5a513b2c9b620faf1b6c201",
         "type": "github"
       },
       "original": {
@@ -269,11 +269,10 @@
         ]
       },
       "locked": {
+        "dirtyRev": "18db2b965924207f14d3e5da2512f95f1464cf03-dirty",
+        "dirtyShortRev": "18db2b9-dirty",
         "lastModified": 1670075202,
-        "narHash": "sha256-LX//k01Y+eyDeBtlgWUwEDUn0eoNst6+rmiXP8x9Q/U=",
-        "ref": "18db2b965924207f14d3e5da2512f95f1464cf03",
-        "rev": "18db2b965924207f14d3e5da2512f95f1464cf03",
-        "revCount": 3,
+        "narHash": "sha256-NY1i1boNgAKTbD3g1byHap79eVWUk2ZQuSqYkmM+/o0=",
         "type": "git",
         "url": "file:///etc/nixos/fcc-unlock"
       },
@@ -494,11 +493,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725180166,
-        "narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=",
+        "lastModified": 1727346017,
+        "narHash": "sha256-z7OCFXXxIseJhEHiCkkUOkYxD9jtLU8Kf5Q9WC0SjJ8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb",
+        "rev": "c124568e1054a62c20fbe036155cc99237633327",
         "type": "github"
       },
       "original": {
@@ -554,11 +553,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1724878143,
-        "narHash": "sha256-UjpKo92iZ25M05kgSOw/Ti6VZwpgdlOa73zHj8OcaDk=",
+        "lastModified": 1727040444,
+        "narHash": "sha256-19FNN5QT9Z11ZUMfftRplyNN+2PgcHKb3oq8KMW/hDA=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "95c3dfe6ef2e96ddc1ccdd7194e3cda02ca9a8ef",
+        "rev": "d0cb432a9d28218df11cbd77d984a2a46caeb5ac",
         "type": "github"
       },
       "original": {
@@ -631,11 +630,11 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1725103162,
-        "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
+        "lastModified": 1727122398,
+        "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
+        "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093",
         "type": "github"
       },
       "original": {
@@ -647,11 +646,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1725103162,
-        "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
+        "lastModified": 1727122398,
+        "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
+        "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093",
         "type": "github"
       },
       "original": {
diff --git a/home/fhauser/applications/git.nix b/home/fhauser/applications/git.nix
index 95f01f9..82e29de 100644
--- a/home/fhauser/applications/git.nix
+++ b/home/fhauser/applications/git.nix
@@ -1,7 +1,10 @@
 { pkgs, ... }:
 {
 
-  home.packages = [ pkgs.git-absorb ];
+  home.packages = with pkgs; [
+    git-absorb
+    git-trim
+  ];
   programs.git = {
     enable = true;
     package = pkgs.gitAndTools.gitFull;
diff --git a/home/fhauser/applications/sway.nix b/home/fhauser/applications/sway.nix
index ef2c721..6740dc9 100644
--- a/home/fhauser/applications/sway.nix
+++ b/home/fhauser/applications/sway.nix
@@ -150,14 +150,6 @@ rec {
       Environment = lib.mkForce "PATH=${config.home.profileDirectory}/bin XDG_CURRENT_DESKTOP=Unity";
     };
   };
-  systemd.user.services.owncloud-client = adhereTheSwayTarget // {
-    # For trayicon to work:
-    Unit.After = lib.mkForce [ "waybar.service" ];
-    Service = {
-      ExecStartPre = "${pkgs.coreutils}/bin/sleep 3";
-      Environment = lib.mkForce "PATH=${config.home.profileDirectory}/bin XDG_CURRENT_DESKTOP=Unity";
-    };
-  };
   systemd.user.services.pasystray = adhereTheSwayTarget;
 
   gtk = {