Compact xmobar (still ugly)

flake.lock

@@ -4,15 +4,14 @@
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
-        ],
+        ]
-        "utils": "utils"
       },
       "locked": {
-        "lastModified": 1671459164,
+        "lastModified": 1694643239,
-        "narHash": "sha256-RbkDnvLV7WjbiF4Dpiezrf8kXxwieQXAVtY8ciRQj6Q=",
+        "narHash": "sha256-pv2k/5FvyirDE8g4TNehzwZ0T4UOMMmqWSQnM/luRtE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e7eba9cc46547ae86642ad3c6a9a4fb22c07bc26",
+        "rev": "d9b88b43524db1591fb3d9410a21428198d75d49",
         "type": "github"
       },
       "original": {
@@ -23,11 +22,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1671467847,
+        "lastModified": 1694681873,
-        "narHash": "sha256-eIeZIQbbW0QYDW0nhDaieokw6VakPO3TyJ3RmxqGHOs=",
+        "narHash": "sha256-ajOF6dGmJ+CRKxIHvtcVW9Xh0C6FWmN/crlq1sa4qhU=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "25010a042c23695ae457a97aad60e9b1d49f2ecc",
+        "rev": "850b04d59cbc003158b5258932dab6e26ed0b388",
         "type": "github"
       },
       "original": {
@@ -38,11 +37,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1669833724,
+        "lastModified": 1694690970,
-        "narHash": "sha256-/HEZNyGbnQecrgJnfE8d0WC5c1xuPSD2LUpB6YXlg4c=",
+        "narHash": "sha256-4ssL7MYCHkaCUE4uSMbPWXGYJIjt9eUgGxU8YxeQWuY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "4d2b37a84fad1091b9de401eb450aae66f1a741e",
+        "rev": "afdd9aa4962abe0feefc8a8c3a08618e07ff4cd6",
         "type": "github"
       },
       "original": {
@@ -53,16 +52,16 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1671459584,
+        "lastModified": 1693675694,
-        "narHash": "sha256-6wRK7xmeHfClJ0ICOkax1avLZVGTDqBodQlkl/opccY=",
+        "narHash": "sha256-2pIOyQwGyy2FtFAUIb8YeKVmOCcPOTVphbAvmshudLE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "87b58217c9a05edcf7630b9be32570f889217aef",
+        "rev": "5601118d39ca9105f8e7b39d4c221d3388c0419d",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "release-22.11",
+        "ref": "release-23.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -83,11 +82,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1671472949,
+        "lastModified": 1694495315,
-        "narHash": "sha256-9iHSGpljCX+RypahQssBXPwkru9onfKfceCTeVrMpH4=",
+        "narHash": "sha256-sZEYXs9T1NVHZSSbMqBEtEm2PGa7dEDcx0ttQkArORc=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "32840f16ffa0856cdf9503a8658f2dd42bf70342",
+        "rev": "ea208e55f8742fdcc0986b256bdfa8986f5e4415",
         "type": "github"
       },
       "original": {
@@ -95,21 +94,6 @@
         "repo": "sops-nix",
         "type": "github"
       }
-    },
-    "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",

home/jacob.nix

@@ -244,8 +244,7 @@
     };
     zsh = {
       enable = true;
-      #syntaxHighlighting.enable = true;
+      syntaxHighlighting.enable = true;
-      enableSyntaxHighlighting = true;
       shellAliases = {
         lg = "lazygit";
         vim = "nvim";
@@ -301,6 +300,7 @@
       enable = true;
       verbose = true;
     };
+    network-manager-applet.enable = true;
     spotifyd = {
       enable = false;
       settings = {
@@ -315,7 +315,7 @@
       };
     };
     syncthing = {
-      enable = true;
+      enable = false;
       # cause the tray command to wait for the service and tray manager to start
       extraOptions = [ "--wait" ];
       tray.enable = true;

home/xmobarrc

@@ -34,12 +34,12 @@ Config { overrideRedirect = False
                         , "--"
                         , "--on", ""
                         ]
-                    , Run Memory ["--template", "Mem: <usedratio>%"] 10
+                    , Run Memory ["--template", "<usedratio>"] 10
                     , Run Swap [] 10
-                    , Run Date "%a %Y-%m-%d <fc=#8be9fd>%H:%M</fc>" "date" 10
+                    , Run Date "%Y%m%d <fc=#8be9fd>%H:%M</fc>" "date" 10
                     , Run XMonadLog
                     ]
        , sepChar  = "%"
        , alignSep = "}{"
-       , template = "%XMonadLog% }{ Sound: %alsa:default:Master% | %cpu% | %memory% * %swap% | BAT1: %battery% | %date% "
+       , template = "%XMonadLog% }{A%alsa:default:Master%M%memory%%cpu%B%battery% %date%"
        }

machines/buck/configuration.nix

@@ -165,12 +165,16 @@
       enable = true;
     };
 
+    rpcbind.enable = true;  # for NFS
+
     syncthing = import ./syncthing.nix;
 
     udev.extraRules = ''
     ACTION=="add", SUBSYSTEM=="backlight", KERNEL=="intel_backlight", MODE="0666", RUN+="${pkgs.coreutils}/bin/chmod a+w /sys/class/backlight/%k/brightness"
   '';
 
+    tailscale.enable = true;
+
     # Enable the X11 windowing system. services.xserver.enable = true;
     xserver = {
       enable = true;
@@ -209,6 +213,31 @@
   services.thermald.enable = true;
   services.fwupd.enable = true;
 
+  systemd.mounts = let
+    nfsOpts = {
+      type = "nfs";
+      mountConfig = {
+        Options = "noatime";
+      };
+    };
+    nas = "100.64.0.5";  # synnas over tailscale
+  in [
+    (nfsOpts // {
+      what = "${nas}:/homes/jacob/Photos";
+      where = "/nas/photos";
+    })
+  ];
+  systemd.automounts = let
+    autoMountOpts = {
+      wantedBy = [ "multi-user.target" ];
+      automountConfig = {
+        TimeoutIdleSec = "600";
+      };
+    };
+  in [
+    (autoMountOpts // { where = "/nas/photos"; })
+  ];
+
   # Enable the OpenSSH daemon.
   # services.openssh.enable = true;
 

machines/buck/hardware-configuration.nix

@@ -18,12 +18,13 @@
   boot.extraModulePackages = [];
 
   fileSystems."/" = {
-    device = "/dev/disk/by-uuid/cc13728f-a446-49db-98fc-51db875bba20";
+    #device = "/dev/disk/by-uuid/cc13728f-a446-49db-98fc-51db875bba20";
+    device = "/dev/disk/by-uuid/a04773e7-3ccd-4d10-908d-53896b910f61";
     fsType = "ext4";
   };
 
   fileSystems."/boot/efi" = {
-    device = "/dev/disk/by-uuid/164F-882B";
+    device = "/dev/disk/by-uuid/0EB1-1189";
     fsType = "vfat";
   };
 

machines/buck/syncthing.nix

@@ -1,5 +1,5 @@
 {
-  enable = true;
+  enable = false;
   user = "jacob";
   dataDir = "/home/jacob/Sync";
   #guiAddress = "0.0.0.0:8234";  # for headless