Snapshot for lab install

7 files changed, 17 insertions, 21 deletions

diff --git a/aerc/.config/aerc/aerc.conf b/aerc/.config/aerc/aerc.conf
index b40ad48..8644774 100644
--- a/aerc/.config/aerc/aerc.conf
+++ b/aerc/.config/aerc/aerc.conf
@@ -7,7 +7,7 @@
 # with mutt's printf-like syntax.
 #
 # Default: %D %-17.17n %Z %s
-index-format=%D %-15.15a %-1.1Z %s
+index-format=%D %-14.14a %-1.1Z %s
 
 #
 # See time.Time#Format at https://godoc.org/time#Time.Format
@@ -19,7 +19,7 @@ timestamp-format=2006-01-02T15:04
 # Width of the sidebar, including the border.
 #
 # Default: 20
-sidebar-width=20
+sidebar-width=15
 
 #
 # Message to display when viewing an empty folder.
diff --git a/awesome/.config/awesome/rc.lua b/awesome/.config/awesome/rc.lua
index faaef28..765c0c6 100644
--- a/awesome/.config/awesome/rc.lua
+++ b/awesome/.config/awesome/rc.lua
@@ -15,6 +15,7 @@ local freedesktop = require"freedesktop"
 
 -- System data library
 local vicious = require"vicious"
+vicious.contrib = require"vicious.contrib"
 
 local boardary = require"boardary"
 
@@ -267,15 +268,16 @@ myplayer:buttons(awful.util.table.join(
 
 -- Create a weather widget
 local myweather = wibox.widget.textbox()
-vicious.register(myweather, vicious.widgets.weather,
+vicious.register(myweather, vicious.contrib.openweather,
                  function (widget, args)
                    if args["{tempf}"] ~= "N/A" then
-                     return (" %s°C %s%%"):format(args["{tempc}"],
+                     return (" %s°C %s%%"):format(args["{temp c}"],
                                                   args["{humid}"])
                    else
                      return ""
                    end
-                 end, 61, "VVNB")
+                 end, 61, {city_id = "1833747",
+                           app_id = "0ac09b4d94a63088b670b6a5ecf6200a"})
 
 -- Create a wibox for each screen and add it
 local taglist_buttons = awful.util.table.join(
diff --git a/nix/awesome.nix b/nix/awesome.nix
index 9cc0076..d5375be 100644
--- a/nix/awesome.nix
+++ b/nix/awesome.nix
@@ -37,11 +37,11 @@
   };
 
   environment.systemPackages = with pkgs; [
-    gnome.adwaita-icon-theme networkmanagerapplet qt5ct
+    easyeffects gnome.adwaita-icon-theme networkmanagerapplet qt5ct
     clipbuzz keynav playerctl pulsemixer xclip xdotool xorg.xkill
     aerc amfora calcurse dante khard ncdu ranger ueberzug vim_configurable
-    arandr audacious keepassx liferea scrot rxvt-unicode zathura
-    firefox gajim libreoffice mepo nheko tor-browser-bundle-bin
+    arandr audacious liferea scrot rxvt-unicode zathura
+    firefox gajim libreoffice mepo nheko obs-studio tor-browser-bundle-bin
     nextcloud-client transmission-gtk
   ];
 
diff --git a/nix/configuration.nix b/nix/configuration.nix
index f81fccb..33b4ace 100644
--- a/nix/configuration.nix
+++ b/nix/configuration.nix
@@ -31,8 +31,6 @@
     nameservers = [ "9.9.9.11" "149.112.112.11" ];
     extraHosts = ''
       0.0.0.0 9gag.com
-      0.0.0.0 old.reddit.com
-      0.0.0.0 soap2day.md
     '';
     networkmanager.enable = true;
 
@@ -86,10 +84,6 @@
       alsa.enable = true;
       pulse.enable = true;
       # jack.enable = true;
-
-      # Use the example session manager (no others are packaged yet so this is
-      # enabled by default, no need to redefine it in your config for now)
-      # media-session.enable = true;
     };
 
     printing = {
diff --git a/nix/devel.nix b/nix/devel.nix
index d819def..cdf09a7 100644
--- a/nix/devel.nix
+++ b/nix/devel.nix
@@ -3,7 +3,7 @@
 {
   environment.systemPackages = with pkgs; [
     exa fd gitAndTools.gitFull glow jq minicom man-pages ripgrep rlwrap
-    gcc lua python3 rakudo zig
+    gcc lua python3 qbe rakudo zig
     bintools gdb gnumake luaPackages.luacheck mypy pkg-config
     plantuml texlive.combined.scheme-full
   ] ++ (with python3Packages; [ flit pip tox ]);
@@ -22,11 +22,11 @@
     };
 
     ipfs = {
-      enable = true;
       user = "sea";
       dataDir = "/home/sea/.ipfs";
       # autoMount = true;
       localDiscovery = true;
+      enableGC = true;
     };
   };
 }
diff --git a/nix/games.nix b/nix/games.nix
index 958a3df..0ef6905 100644
--- a/nix/games.nix
+++ b/nix/games.nix
@@ -2,16 +2,16 @@
 
 {
   environment.systemPackages = with pkgs; [
-    _20kly hedgewars globulation2 scorched3d teeworlds # strategy
+    hedgewars scorched3d teeworlds # _20kly strategy
     astromenace chromium-bsu # scrolling
     azimuth cdogs-sdl taisei # shmup
     bastet moon-buggy n2048 # text
     blackshades redeclipse xonotic-glx # fps
-    blobwars openclonk sienna superTux # platformer
+    blobwars openclonk superTux # platformer
     bonzomatic # engine
     extremetuxracer gl117 gltron superTuxKart # vehicle
     flare freedroidrpg hyperrogue # slash
-    frozen-bubble gnujump gtetrinet pinball xbill # coffeebreak
-    neverball orthorobot # puzzle
+    frozen-bubble pinball xbill # coffeebreak
+    orthorobot # neverball puzzle
   ];
 }
diff --git a/nix/hardware-configuration.nix b/nix/hardware-configuration.nix
index f514c1e..f957f2b 100644
--- a/nix/hardware-configuration.nix
+++ b/nix/hardware-configuration.nix
@@ -53,7 +53,7 @@
     "/home" = {
       device = "/dev/disk/by-uuid/c334d115-eda9-4470-8c28-b01c4628865b";
       fsType = "btrfs";
-      options = [ "subvol=home" "compress-force=zstd" ];
+      options = [ "subvol=home" "compress-force=zstd" "autodefrag" ];
     };
 
     "/var/log" = {