[nb] Commit

.index

@@ -9,3 +9,4 @@ README.md
 
 todos
 
+justfile

flake.lock

@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1705677747,
+        "lastModified": 1707092692,
-        "narHash": "sha256-eyM3okYtMgYDgmYukoUzrmuoY4xl4FUujnsv/P6I/zI=",
+        "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bbe7d8f876fbbe7c959c90ba2ae2852220573261",
+        "rev": "faf912b086576fd1a15fca610166c98d47bc667e",
         "type": "github"
       },
       "original": {

home-manager/cli.nix

@@ -55,7 +55,7 @@
       extraConfig = ''
         syntax enable
         set wrap
-        set spell spelllang=en_us
+        set nospell
         set linebreak
         set number
         set relativenumber

home-manager/dots/bash.nix

@@ -1,6 +1,9 @@
 { pkgs, config, user, ... }:
 {
-  home.file = {
+  home = {
+    sessionVariables = {
+    };
+    file = {
       ".bash_login" = {
         enable = true;
         text = ''
@@ -62,7 +65,8 @@
           # Environmental Variables
           # Uncomment the following line if you don't like systemctl's auto-paging feature:
           export SYSTEMD_PAGER=
-        export PS1='\n\u@\h:\w (\j)\n$? \$ '
+          export PS1="\n\u@\h:\w (\j)\n$? \$ "
+          export LIBSEAT_BACKEND=logind
           export BEMENU_OPTS="--fn 'Comic Mono 12'\
            --tb '#6272a4'\
            --tf '#f8f8f2'\
@@ -84,4 +88,5 @@
         '';
       };
     };
+  };
 }

home-manager/dots/mako.nix

@@ -6,8 +6,9 @@
     borderColor = "#BD93F9";
     borderRadius = 5;
     borderSize = 2;
+    margin = "20";
     textColor = "#F8F8F2";
-    anchor = "top-right";
+    anchor = "bottom-right";
     layer = "overlay";
     maxVisible = 5;
     font = "Comic Mono 12";

home-manager/dots/tmux.nix

@@ -43,11 +43,9 @@
       # Set status bar postition
       set -g status-position top
   
-      setw -g window-status-current-format "[#I:#W#F]"
       setw -g window-status-format "#I:#W#F"
     '';
     plugins = with pkgs.tmuxPlugins; [
-      dracula
       urlview
     ];
   };

home-manager/dots/waybar.nix

@@ -5,76 +5,21 @@
       enable = true;
       executable = false;
       text = ''
-        {
+        [{
         	"exclusive": false,
-        	"position": "bottom",
+        	"position": "top",
         	"height": 22,
         	"spacing": 16,
         	"fixed-center": false,
             "modules-left": [
-        		"user",
+                "user"
-        		"cpu",
-        		"memory",
-        		"network",
-        		"disk#root",
-        		"disk#home",
-        		"river/mode",
             ],
         	"modules-right": [
-        		"tray",
         		"clock"
         	],
         	"user": {
-        		"format": " {work_d}:{work_H}:{work_M}:{work_S} uptime",
+        		"format": "{work_d}:{work_H}:{work_M}:{work_S}",
-        		"interval": 1,
+        		"interval": 1
-        	},
-        	"cpu": {
-        		"interval": 1,
-        		"format": "cpu {load} {icon0}{icon1}{icon2}{icon3}{icon4}{icon5}{icon6}{icon7}{icon8}{icon9}{icon10}{icon11}{icon12}{icon13}{icon14}{icon15}{icon16}{icon17}{icon18}{icon19}{icon20}{icon21}{icon22}{icon23}",
-        		"format-icons": [
-        			"<span color='#69ff94'>▁</span>", // green
-        			"<span color='#2aa9ff'>▂</span>", // blue
-        			"<span color='#f8f8f2'>▃</span>", // white
-        			"<span color='#f8f8f2'>▄</span>", // white
-        			"<span color='#ffffa5'>▅</span>", // yellow
-        			"<span color='#ffffa5'>▆</span>", // yellow
-        			"<span color='#ff9977'>▇</span>", // orange
-        			"<span color='#dd532e'>█</span>"  // red
-            	]
-        	},
-        	"memory": {
-        		"interval": 30,
-        		"format": "mem {used:0.1f}G / {total:0.1f}G",
-        	},
-        	"network": {
-        		"interval": 10,
-        		"interface": "enp4s0",
-        		"format": "{ifname} {bandwidthUpBits} up / {bandwidthDownBits} down",
-        		"format-disconnected": "",
-        		"tooltip-format": "{ipaddr}/{cidr} via {gwaddr}"
-        	},
-        	"disk#root": {
-        		"interval": 60,
-        		"format": "{free} free on {path}",
-        		"path": "/"
-        	},
-        	"disk#home": {
-        		"interval": 60,
-        		"format": "{free} free on {path}",
-        		"path": "/home"
-        	},
-        	"systemd-failed-units": {
-        		"hide-on-ok": false, // Do not hide if there is zero failed units.
-        		"format": "✗ {nr_failed}",
-        		"format-ok": "✓",
-        		"system": true, // Monitor failed systemwide units.
-        		"user": false // Ignore failed user units.
-        	},
-        	"river/mode": {
-        	},
-        	"tray": {
-        		"icon-size": 18,
-        		"spacing": 4
         	},
         	"clock": {
         		"format": "{:%H:%M:%S}",
@@ -82,6 +27,67 @@
                 "format-alt": "{:%Y-%m-%d}",
         		"interval": 1
             }
+        },
+        {
+        	"exclusive": false,
+        	"position": "bottom",
+        	"height": 22,
+        	"spacing": 16,
+        	"fixed-center": false,
+            "modules-left": [
+                "river/mode"
+            ],
+        	"modules-right": [
+        		"tray"
+        	],
+        	"tray": {
+        		"icon-size": 18,
+                "spacing": 4,
+                "show-passive-items": true,
+                "reverse-direction": true
+        	}
+        }]
+      '';
+    };
+    "waybar/style.css" = {
+      enable = true;
+      executable = false;
+      text = ''
+        * {
+          background: transparent;
+          color: #F2F2F8;
+        }
+        #user {
+          background: #282A36;
+          border-style: solid;
+          border-bottom-right-radius: 5px;
+          border-width: 0 2 2 0;
+          border-color: #44475A;
+          padding: 0 8 0 8;
+        }
+        #clock {
+          background: #282A36;
+          border-style: solid;
+          border-bottom-left-radius: 5px;
+          border-width: 0 0 2 2;
+          border-color: #44475A;
+          padding: 0 8 0 8;
+        }
+        #mode {
+          background: #282A36;
+          border-style: solid;
+          border-top-right-radius: 5px;
+          border-width: 2 2 0 0;
+          border-color: #44475A;
+          padding: 0 8 0 8;
+        }
+        #tray {
+          background: #282A36;
+          border-style: solid;
+          border-top-left-radius: 5px;
+          border-width: 2 0 0 2;
+          border-color: #44475A;
+          padding: 0 4 0 8;
         }
       '';
     };

home-manager/dots/waybar.nix.bak

@@ -0,0 +1,77 @@
+{ pkgs, config, ... }:
+{
+  programs.waybar = {
+    enable = true;
+    settings = [{
+      topBar = {
+        exclusive = false;
+        position = "top";
+        height = 22;
+        spacing = 16;
+        modules-left = [ "user" ];
+        modules-right = [ "clock" ];
+        "user" = {
+          format = "{work_d}:{work_H}:{work_M}:{work_S}";
+          interval = 1;
+        };
+        "clock" = {
+          format = "{:%H:%M:%S}";
+          tooltip-format = "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>";
+          format-alt = "{:%Y-%m-%d}";
+          interval = 1;
+        };
+      };
+      bottomBar = {
+        exclusive = false;
+        position = "bottom";
+        height = 22;
+        spacing = 16;
+        fixed-center = false;
+        modules-left = [ "river/mode" ];
+        modules-right = [ "tray" ];
+        "tray" = {
+        	icon-size = 18;
+        	spacing = 4;
+        };
+      };
+    }];
+    style = ''
+      * {
+        background: transparent;
+        color: #F2F2F8;
+      }
+      #user {
+        background: #282A36;
+        border-style: solid;
+        border-bottom-right-radius: 5px;
+        border-width: 0 2 2 0;
+        border-color: #BD93F9;
+        padding: 0 8 0 8;
+      }
+      #clock {
+        background: #282A36;
+        border-style: solid;
+        border-bottom-left-radius: 5px;
+        border-width: 0 0 2 2;
+        border-color: #BD93F9;
+        padding: 0 8 0 8;
+      }
+      #mode {
+        background: #282A36;
+        border-style: solid;
+        border-top-right-radius: 5px;
+        border-width: 2 2 0 0;
+        border-color: #BD93F9;
+        padding: 0 8 0 8;
+      }
+      #tray {
+        background: #282A36;
+        border-style: solid;
+        border-top-left-radius: 5px;
+        border-width: 2 0 0 2;
+        border-color: #BD93F9;
+        padding: 0 4 0 8;
+      }
+    '';
+  };
+}

hosts/buckwheat/configuration.nix

@@ -79,8 +79,8 @@ in
   users.users.${user.name} = {
     extraGroups = [ "davfs2" "libvirtd" "transmission" ];
     packages = with pkgs; [
-      mixxx
+      python311Packages.eyeD3
-      polychromatic
+      tagutil
     ];
   };
 }

justfile

@@ -0,0 +1,17 @@
+recipe-name:
+	grep "description" "./flake.nix"
+
+default:
+	just --list
+
+debug:
+  nixos-rebuild switch --flake . --use-remote-sudo --show-trace --verbose
+
+test:
+	nixos-rebuild test --flake ".#$(hostname)" --use-remote-sudo
+
+switch:
+	nixos-rebuild switch --flake ".#$(hostname)" --use-remote-sudo
+
+update:
+	nixos-rebuild switch --flake --update-input nixpkgs ".#$(hostname)"

nixos/cli.nix

@@ -103,7 +103,9 @@
     jo
     john
     jq
+    just
     killall
+    lavat
     lynis
     mdp
     mediainfo

nixos/collections/office.nix

@@ -7,6 +7,7 @@
     #obsidian
     pandoc
     pdftk
+    qcal
     #sc-im
     thunderbird
   ];

nixos/collections/pentest.nix

@@ -6,6 +6,7 @@
   };
   users.users.${user.name}.packages = with pkgs; [
     burpsuite
+    httpie
     metasploit
     nikto
     sherlock

nixos/gui.nix

@@ -44,6 +44,7 @@
   };
   users.users.${user.name}.packages = with pkgs; [
     ani-cli
+    bitwarden
     glib
     gparted
     lagrange
@@ -54,6 +55,7 @@
     mupdf
     #onionshare-gui
     signal-desktop
+    simplex-chat-desktop
     tor-browser-bundle-bin
     #urlview
     ytfzf

nixos/wayland.nix

@@ -22,6 +22,9 @@
       ];
     };
   };
+  services = {
+    seatd.enable = true;
+  };
   environment.systemPackages = with pkgs; [
     bemenu
     bemoji
@@ -42,8 +45,4 @@
     wl-clipboard
     wtype
   ];
-  programs.xwayland = {
-      enable = true;
-    };
-  };
 }