Add qalculate-qt

home/jacob.nix

@@ -47,6 +47,7 @@
       #openscad
       #pandoc
       pavucontrol
+      qalculate-qt
       ripgrep
       rofi
       scli
@@ -204,39 +205,7 @@
       enable = true;
       settings.email = "jacob.hinkle@gmail.com";
     };
-    ssh = {
-      enable = true;
-      matchBlocks = {
-        login1 = {
-          hostname = "login1.ornl.gov";
-          user = "4jh";
-        };
-        lucky = {
-          hostname = "lucky.ornl.gov";
-          user = "4jh";
-          proxyJump = "login1";
-        };
-        murdock = {
-          hostname = "murdock.ornl.gov";
-          user = "4jh";
-          proxyJump = "login1";
-        };
-        penny = {
-          hostname = "192.168.88.18";
-          user = "jhinkle";
-        };
-        dlcluster = {
-          hostname = "dlcluster.nvidia.com";
-          user = "jhinkle";
-          proxyJump = "penny";
-        };
-        router ={
-          hostname = "192.168.88.1";
-          user = "jacob";
-          port = 2200;
-        };
-      };
-    };
+    ssh = import ./ssh.nix;
     tmux = import ./tmux.nix;
     xmobar = {
       enable = true;

home/ssh.nix

@@ -0,0 +1,34 @@
+{
+  enable = true;
+  matchBlocks = {
+    login1 = {
+      hostname = "login1.ornl.gov";
+      user = "4jh";
+    };
+    lucky = {
+      hostname = "lucky.ornl.gov";
+      user = "4jh";
+      proxyJump = "login1";
+    };
+    murdock = {
+      hostname = "murdock.ornl.gov";
+      user = "4jh";
+      proxyJump = "login1";
+    };
+    penny = {
+      #hostname = "192.168.88.18";
+      hostname = "192.168.88.13";
+      user = "jhinkle";
+    };
+    dlcluster = {
+      hostname = "dlcluster.nvidia.com";
+      user = "jhinkle";
+      proxyJump = "penny";
+    };
+    router ={
+      hostname = "192.168.88.1";
+      user = "jacob";
+      port = 2200;
+    };
+  };
+}

home/xmonad.hs

@@ -78,28 +78,29 @@ myXmobarPP = def
     { ppSep             = magenta " • "
     , ppTitleSanitize   = xmobarStrip
     , ppCurrent         = wrap " " "" . xmobarBorder "Top" "#8be9fd" 2
-    , ppHidden          = white . wrap " " ""
-    , ppHiddenNoWindows = lowWhite . wrap " " ""
+    , ppHidden          = lightGreen . wrap " " ""
+    , ppHiddenNoWindows = gray . wrap " " ""
     , ppUrgent          = red . wrap (yellow "!") (yellow "!")
     , ppOrder           = \[ws, l, _, wins] -> [ws, l, wins]
     , ppExtras          = [logTitles formatFocused formatUnfocused]
     }
   where
     formatFocused   = wrap (white    "[") (white    "]") . magenta . ppWindow
-    formatUnfocused = wrap (lowWhite "[") (lowWhite "]") . blue    . ppWindow
+    formatUnfocused = wrap (gray "[") (gray "]") . blue    . ppWindow
 
     -- | Windows should have *some* title, which should not not exceed a
     -- sane length.
     ppWindow :: String -> String
     ppWindow = xmobarRaw . (\w -> if null w then "untitled" else w) . shorten 30
 
-    blue, lowWhite, magenta, red, white, yellow :: String -> String
+    blue, gray, magenta, lightGreen, red, white, yellow :: String -> String
     magenta  = xmobarColor "#ff79c6" ""
-    blue     = xmobarColor "#bd93f9" ""
+    lightGreen = xmobarColor "#bbffbb" ""
+    blue     = xmobarColor "#bdbdf9" ""
     white    = xmobarColor "#f8f8f2" ""
     yellow   = xmobarColor "#f1fa8c" ""
     red      = xmobarColor "#ff5555" ""
-    lowWhite = xmobarColor "#bbbbbb" ""
+    gray = xmobarColor "#888888" ""
 
 addlWorkspaces :: [String]
 addlWorkspaces = ["0", "-", "=", "i"]

machines/cj/configuration.nix

@@ -132,12 +132,14 @@
 
   virtualisation.oci-containers.containers = let
     ips = {
-      serverIP = "192.168.88.21";  # v4 address
+      # tailscale IP for IPV4 services
+      serverIP = "100.102.82.27";  # v4 address
 
       # link-local IP = fe80:${suffix}
       # external IP = ${externalprefix}:${suffix}
       #externalprefix = "2601:843:c200:20b";
       #ipv6suffix = "223:24ff:fea9:a97";
+      # IPV6 external IP should not need to use tailscale
       serverIP6 = "2601:843:c200:20b:223:24ff:fea9:a97";  # external IP
       #serverIP6 = "fe80::223:24ff:fea9:a97";  # link-local IP
     };