update flake and move to gobar

flake.lock

@@ -5,11 +5,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1639891275,
+        "lastModified": 1640417317,
-        "narHash": "sha256-2IMLVTtOHV9kBsirGPRpo8NE48Mjq20iXN7l7uy0YjE=",
+        "narHash": "sha256-jT2uMARXs0Xm65ccroFsKyr4LTHSecw+9HAnmBdJO8U=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3db603677509eb0b8c396a3234b1d4b70d023894",
+        "rev": "48f2b381dd397ec88040d3354ac9c036739ba139",
         "type": "github"
       },
       "original": {
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1640012693,
+        "lastModified": 1640328990,
-        "narHash": "sha256-D07/CBpeqsbXKb96NQliVqgB3ytLL3XfBGBrm/eaUxU=",
+        "narHash": "sha256-KQbvJx4qO9bo04tfTZuISyY4vRC5k3ZB3lyLS21XWIw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7dcb25726b3a5ed3896fe38362f631ca5bed4a6e",
+        "rev": "ab93217a2b74a1c36bc892c14f44ee5959c33f12",
         "type": "github"
       },
       "original": {
@@ -34,11 +34,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1639966735,
+        "lastModified": 1640319671,
-        "narHash": "sha256-FmVGFiyqE+pjQUTCTY0H75hqrnBnbEf3VVRB4dsd4KI=",
+        "narHash": "sha256-ZkKmakwaOaLiZOpIZWbeJZwap5CzJ30s4UJTfydYIYc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d87b72206aadebe6722944f541f55d33fd7046fb",
+        "rev": "eac07edbd20ed4908b98790ba299250b5527ecdf",
         "type": "github"
       },
       "original": {

home/sway/sway.nix

@@ -18,6 +18,7 @@
     wmctrl
     libnotify
     light
+    gobar
   ];
 
   programs.zsh.profileExtra = ''
@@ -56,9 +57,13 @@
             position = "top";
             fonts = {
               names = [ "Comic Code" ];
-              size = 18.0;
+              size = 14.0;
             };
-            statusCommand = "${pkgs.zar}/bin/zar";
+            statusCommand = lib.escapeShellArgs [
+              #"/home/chaoticryptidz/Projects/gobar/gobar "
+              "${pkgs.gobar}/bin/gobar"
+              "cpu\\|mem\\|weather\\(Leighton\\ Buzzard\\)\\|bat\\(BAT0\\)\\|time"
+            ];
           }
         ];
 
@@ -145,20 +150,6 @@
       bindswitch --reload --locked lid:off output eDP-1 enable
     '';
   };
-  programs.waybar = {
-    enable = true;
-    style = ''
-      * {
-        font-family: "Comic Code";
-        font-size: 20px;
-      }
-    '';
-    settings = [{
-      modules-left = [ "sway/workspaces" "sway/mode" ];
-      modules-center = [ "sway/window" ];
-      modules-right = [ "pulseaudio" "battery" "clock" "tray" ];
-    }];
-  };
 }
 
 

overlay/default.nix

@@ -1,4 +1,5 @@
 final: prev: {
   comic-code = final.callPackage ./comic-code { };
   zar = final.callPackage ./zar { };
+  gobar = final.callPackage ./gobar { };
 }

overlay/gobar/default.nix

@@ -0,0 +1,20 @@
+{ stdenv, fetchFromGitLab, buildGoModule, lib, go }: buildGoModule rec {
+  pname = "gobar";
+  version = "latest-1";
+
+  src = fetchFromGitLab {
+    owner = "ChaotiCryptidz";
+    repo = "gobar";
+    rev = "91fc4594aa3c2689fc099d1a9944d63eb1954368";
+    sha256 = "sha256-lj5Brztxh69xOHN+WMn8Ti0Zg+gI/NeuE9NezcSYFRA=";
+    #sha256 = lib.fakeSha256;
+  };
+
+  runVend = false;
+  vendorSha256 = "sha256-37QYc+gLzCW1jefAQNy4AbabckJ4jO1sDOiUZTsLgWo=";
+  #vendorSha256 = lib.fakeSha256;
+
+  preBuild = ''
+    export HOME=$TMPDIR
+  '';
+}

overlay/zar/default.nix

@@ -5,8 +5,8 @@
   src = fetchFromGitLab {
     owner = "ChaotiCryptidz";
     repo = "zar";
-    rev = "719ea5667d889245f842aa02f9046263f08052f0";
+    rev = "5f2d473ef89c0cbf77c2a66a22ba457fe4390dd9";
-    sha256 = "sha256-Z2mjyJTsc7B9tIkufrFAfA4rp0cCON3G2mPGrfrh3HA=";
+    sha256 = "sha256-w0qXFJEL+Zbmsl9vUmrnG2P59zVo7RQdi+Fbvb3ucgw=";
     #sha256 = lib.fakeSha256;
     fetchSubmodules = true;
   };
@@ -18,6 +18,6 @@
   '';
 
   installPhase = ''
-    zig build -Drelease-safe -Dweather_location="Leighton Buzzard" --prefix $out install
+    zig build -Drelease-safe --prefix $out install
   '';
 }

profiles/dev/default.nix

@@ -20,5 +20,11 @@
     rsync
     tmux
     socat
+    gdb
+    lldb
+    go 
+    gopls
+    go-outline
+    goimports
   ];
 }