From b17874561150153f3b2e79cbe18a71a212a12dc7 Mon Sep 17 00:00:00 2001
From: Ricard Illa <rilla@monotremata.xyz>
Date: Sun, 6 Nov 2022 12:48:57 +0100
Subject: [PATCH] updated flake

---
 flake.lock                             | 30 +++++++++++++-------------
 home/desktop-xmonad/desktop_config.nix | 11 ++++++++--
 home/maker/default.nix                 |  2 +-
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/flake.lock b/flake.lock
index 90daf18..676cf42 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1666519227,
-        "narHash": "sha256-z74lSCJE5BzxCeE2r9FU4tvHkQXQyz70zmJ3coLP10w=",
+        "lastModified": 1667419884,
+        "narHash": "sha256-oLNw87ZI5NxTMlNQBv1wG2N27CUzo9admaFlnmavpiY=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "8be7f197120739b3ec15f994bdc48116726c6159",
+        "rev": "cfc0125eafadc9569d3d6a16ee928375b77e3100",
         "type": "github"
       },
       "original": {
@@ -29,11 +29,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1666463764,
-        "narHash": "sha256-NmayV9S0s7CgNEA2QbIxDU0VCIiX6bIHu8PCQPnYHDM=",
+        "lastModified": 1667708081,
+        "narHash": "sha256-FChEy05x4ed/pttjfTeKxjPCnHknMYrUtDyBiYbreT4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "69d19b9839638fc487b370e0600a03577a559081",
+        "rev": "1ef0da321217c6c19b7a30509631c080a19321e5",
         "type": "github"
       },
       "original": {
@@ -60,11 +60,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1665987993,
-        "narHash": "sha256-MvlaIYTRiqefG4dzI5p6vVCfl+9V8A1cPniUjcn6Ngc=",
+        "lastModified": 1667585378,
+        "narHash": "sha256-cvOwucrjBaAkaGk3FunG+MQiwiSBeIVTtO5n/YavpC0=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "0e6593630071440eb89cd97a52921497482b22c6",
+        "rev": "6b35a59c19ddbbeb229fcd1d3dcd422dcc0fa927",
         "type": "github"
       },
       "original": {
@@ -76,11 +76,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1666377499,
-        "narHash": "sha256-dZZCGvWcxc7oGnUgFVf0UeNHsJ4VhkTM0v5JRe8EwR8=",
+        "lastModified": 1667629849,
+        "narHash": "sha256-P+v+nDOFWicM4wziFK9S/ajF2lc0N2Rg9p6Y35uMoZI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "301aada7a64812853f2e2634a530ef5d34505048",
+        "rev": "3bacde6273b09a21a8ccfba15586fb165078fb62",
         "type": "github"
       },
       "original": {
@@ -116,11 +116,11 @@
     },
     "utils": {
       "locked": {
-        "lastModified": 1659877975,
-        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "lastModified": 1667395993,
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
         "type": "github"
       },
       "original": {
diff --git a/home/desktop-xmonad/desktop_config.nix b/home/desktop-xmonad/desktop_config.nix
index 96dbf80..e93bf75 100644
--- a/home/desktop-xmonad/desktop_config.nix
+++ b/home/desktop-xmonad/desktop_config.nix
@@ -127,8 +127,8 @@ in {
     enable = true;
     extraConfig = ''
       Config
-          { font = "xft:${font.name}:style=Regular:size=${font.size}"
-          , additionalFonts = ["xft:mplus Nerd Font:size=12"]
+          { font = "${font.name} ${font.size}"
+          , additionalFonts = ["mplus Nerd Font 12"]
           , bgColor = "${colors.bg}"
           , fgColor = "${colors.fg}"
           , alignSep = "}{"
@@ -147,6 +147,13 @@ in {
               , Run StdinReader
               ]
           }
+          , wmClass = "xmobar"
+          , wmName = "xmobar"
+          , border = NoBorder
+          , borderColor = "${colors.bg}"
+          , pickBroadest = False
+          , alpha = 255
+          , iconRoot = "."
     '';
   };
 
diff --git a/home/maker/default.nix b/home/maker/default.nix
index a9b7c4b..85c393a 100644
--- a/home/maker/default.nix
+++ b/home/maker/default.nix
@@ -2,7 +2,7 @@
 
 {
   home.packages = [
-    pkgs.esphome
+    # pkgs.esphome
     stablePkgs.freecad
     pkgs.kicad-small
     pkgs.meshlab