home/jacob.nix

@@ -47,7 +47,6 @@
       #openscad
       #pandoc
       pavucontrol
-      qalculate-qt
       ripgrep
       rofi
       scli
@@ -205,7 +204,39 @@
       enable = true;
       settings.email = "jacob.hinkle@gmail.com";
     };
-    ssh = import ./ssh.nix;
+    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;
+        };
+      };
+    };
     tmux = import ./tmux.nix;
     xmobar = {
       enable = true;

home/ssh.nix

@@ -1,34 +0,0 @@
-{
-  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,29 +78,28 @@ myXmobarPP = def
     { ppSep             = magenta " • "
     , ppTitleSanitize   = xmobarStrip
     , ppCurrent         = wrap " " "" . xmobarBorder "Top" "#8be9fd" 2
-    , ppHidden          = lightGreen . wrap " " ""
+    , ppHidden          = white . wrap " " ""
-    , ppHiddenNoWindows = gray . wrap " " ""
+    , ppHiddenNoWindows = lowWhite . 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 (gray "[") (gray "]") . blue    . ppWindow
+    formatUnfocused = wrap (lowWhite "[") (lowWhite "]") . 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, gray, magenta, lightGreen, red, white, yellow :: String -> String
+    blue, lowWhite, magenta, red, white, yellow :: String -> String
     magenta  = xmobarColor "#ff79c6" ""
-    lightGreen = xmobarColor "#bbffbb" ""
+    blue     = xmobarColor "#bd93f9" ""
-    blue     = xmobarColor "#bdbdf9" ""
     white    = xmobarColor "#f8f8f2" ""
     yellow   = xmobarColor "#f1fa8c" ""
     red      = xmobarColor "#ff5555" ""
-    gray = xmobarColor "#888888" ""
+    lowWhite = xmobarColor "#bbbbbb" ""
 
 addlWorkspaces :: [String]
 addlWorkspaces = ["0", "-", "=", "i"]

machines/cj/configuration.nix

@@ -132,14 +132,12 @@
 
   virtualisation.oci-containers.containers = let
     ips = {
-      # tailscale IP for IPV4 services
+      serverIP = "192.168.88.21";  # v4 address
-      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
     };