Update config

7 files changed, 63 insertions, 20 deletions

diff --git a/home.nix b/home.nix
index 82a2aee..d75b3c2 100644
--- a/home.nix
+++ b/home.nix
@@ -41,6 +41,7 @@ in
     ./programs/zsh
     ./programs/newsboat
     ./programs/git.nix
+    ./programs/sent
   ] ++ platformSetup;
 
   home.packages = with pkgs; [
@@ -57,10 +58,11 @@ in
     minecraft
 
     # Misc
-    irssi
+    teams
+    zoom-us
+    weechat
     todoist
     browserpass
-    spotifyd
     spotify-tui
     # gimp
     slack-dark
diff --git a/overlays.nix b/overlays.nix
index 56da0df..87042fc 100644
--- a/overlays.nix
+++ b/overlays.nix
@@ -1,16 +1,27 @@
 [
   (self: super:
-let rev1 = "bd7360b";
-in {
-  neovim-unwrapped = super.neovim-unwrapped.overrideAttrs (oldAttrs: rec {
-    version = "nightly-${rev1}";
-    src = super.fetchFromGitHub rec {
-      name = "source-${oldAttrs.pname}-${version}-${rev1}";
-      owner = "neovim";
-      repo = "neovim";
-      rev = rev1;
-      sha256 = "0lg9hwvcaiwj9z6wp9rw80czfs7l3bwvcc916fz87jxafp683m37";
-    };
-  });
-})
+  let rev1 = "bd7360b";
+  in {
+    neovim-unwrapped = super.neovim-unwrapped.overrideAttrs (oldAttrs: rec {
+      version = "nightly-${rev1}";
+      src = super.fetchFromGitHub rec {
+        name = "source-${oldAttrs.pname}-${version}-${rev1}";
+        owner = "neovim";
+        repo = "neovim";
+        rev = rev1;
+        sha256 = "0lg9hwvcaiwj9z6wp9rw80czfs7l3bwvcc916fz87jxafp683m37";
+      };
+    });
+    teams = super.teams.overrideAttrs (oldAttrs: rec {
+      installPhase = ''
+        mkdir -p $out/{opt,bin}
+        rm share/teams/resources/app.asar.unpacked/node_modules/slimcore/bin/rect-overlay
+        mv share/teams $out/opt/
+        mv share $out/share
+        substituteInPlace $out/share/applications/teams.desktop \
+        --replace /usr/bin/ $out/bin/
+        ln -s $out/opt/teams/teams $out/bin/
+      '';
+    });
+  })
 ]
diff --git a/platforms/linux/configuration.nix b/platforms/linux/configuration.nix
index 0ae0f61..c74d03d 100644
--- a/platforms/linux/configuration.nix
+++ b/platforms/linux/configuration.nix
@@ -121,7 +121,7 @@
     # UI apps
     zathura ncmpcpp brave sxiv pulsemixer
     lynx lf nur.repos.pn.st arandr wpa_supplicant_gui
-    system-config-printer libreoffice teams
+    system-config-printer libreoffice
     vscodium abook
 
     # Audio/Video
diff --git a/platforms/linux/xorg/config.h b/platforms/linux/xorg/config.h
index a7a8226..dd7c1a2 100644
--- a/platforms/linux/xorg/config.h
+++ b/platforms/linux/xorg/config.h
@@ -18,7 +18,7 @@ static const unsigned int gappov    = 20;       /* vert outer gap between window
 static const int swallowfloating    = 0;        /* 1 means swallow floating windows by default */
 static const int smartgaps          = 0;        /* 1 means no outer gap when there is only one window */
 static const int showbar            = 1;        /* 0 means no bar */
-static const int topbar             = 0;        /* 0 means bottom bar */
+static const int topbar             = 1;        /* 0 means bottom bar */
 static const char *fonts[]          = { "monospace:size=10", "JoyPixels:pixelsize=10:antialias=true:autohint=true"  };
 static char dmenufont[]             = "monospace:size=10";
 static char normbgcolor[]           = "#222222";
@@ -164,7 +164,7 @@ static Key keys[] = {
 	{ MODKEY,			XK_bracketright,	spawn,		SHCMD("mpc seek +10") },
 	{ MODKEY|ShiftMask,		XK_bracketright,	spawn,		SHCMD("mpc seek +60") },
 	{ MODKEY,			XK_backslash,		spawn,		SHCMD("telegram-desktop") },
-	/* { MODKEY|ShiftMask,		XK_backslash,		spawn,		SHCMD("") }, */
+	{ MODKEY|ShiftMask,		XK_backslash,		spawn,		SHCMD("passmenu") },
 
 	{ MODKEY,			XK_a,		spawn,	SHCMD(TERMINAL " -e amfora") },
 	{ MODKEY|ShiftMask,		XK_a,		defaultgaps,	{0} },
diff --git a/programs/newsboat/urls b/programs/newsboat/urls
index 07d823c..15af148 100644
--- a/programs/newsboat/urls
+++ b/programs/newsboat/urls
@@ -11,13 +11,14 @@ personal "~## PERSONAL ##"
 #https://bridge.suumitsu.eu/?action=display&bridge=Facebook&context=Group&g=EarthshipPolska&limit=-1&format=Atom "~Earthship Polska (FB)" "personal"
 https://www.poznan.pl/mim/feeds/rss.xml "~Poznań"
 #https://tvn24.pl/najwazniejsze.xml "~Polska"
+https://portal.mozz.us/gemini/cetacean.club/journal/atom.xml "~Christine Dodrill journal"
 
 ## Tech
 tech "~## TECH ##"
 https://github.com/pniedzwiedzinski.private.atom?token=AESSVFF6BRN4OM6S2436XX5475TTA "~GitHub" "tech"
 https://weekly.nixos.org/feeds/all.rss.xml "~NixOS Weekly" "tech"
-https://christine.website/blog.rss "~Christine Dodrill"
-https://portal.mozz.us/gemini/makeworld.gq/gemlog/atom.xml?raw=1 "~makeworld"
+https://christine.website/blog.rss "~Christine Dodrill" "tech"
+https://portal.mozz.us/gemini/makeworld.gq/gemlog/atom.xml?raw=1 "~makeworld" "tech"
 
 ## Youtube
 yt "~## YOUTUBE ##"
@@ -29,6 +30,7 @@ https://www.youtube.com/feeds/videos.xml?channel_id=UCkPjHTuNd_ycm__29dXM3Nw "~G
 https://www.youtube.com/feeds/videos.xml?channel_id=UCpPndhUatYo4NLn3fleQ2Fw "~HRejterzy" "yt"
 https://www.youtube.com/feeds/videos.xml?channel_id=UCMGoHTJH-ZjsKLfpWON8Q1g "~Earthship" "yt"
 https://www.youtube.com/feeds/videos.xml?channel_id=UCFzGyNKXPAglNq28qWYTDFA "~Kai Hendry" "yt"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCTdPpKcVp03tjGhMWyKtIFQ "~Tin Can Bros" "yt"
 
 ## Luke Smith
 luke "~## LUKE SMITH ##"
diff --git a/programs/sent/default.nix b/programs/sent/default.nix
new file mode 100644
index 0000000..e4f5a3d
--- /dev/null
+++ b/programs/sent/default.nix
@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+
+let
+  sent = pkgs.sent.override {
+    patches = [
+      ./gruvbox.patch
+    ];
+  };
+in {
+  home.packages = [
+    sent
+  ];
+}
diff --git a/programs/sent/gruvbox.patch b/programs/sent/gruvbox.patch
new file mode 100644
index 0000000..cc86ddf
--- /dev/null
+++ b/programs/sent/gruvbox.patch
@@ -0,0 +1,15 @@
+diff --git a/config.def.h b/config.def.h
+index 60eb376..64e7f05 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -9,8 +9,8 @@ static char *fontfallbacks[] = {
+ #define FONTSZ(x) ((int)(10.0 * powf(1.1288, (x)))) /* x in [0, NUMFONTSCALES-1] */
+ 
+ static const char *colors[] = {
+-	"#000000", /* foreground color */
+-	"#FFFFFF", /* background color */
++	"#8ec07c", /* foreground color */
++	"#282828", /* background color */
+ };
+ 
+ static const float linespacing = 1.4;