flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1689825754,
+        "lastModified": 1689281837,
-        "narHash": "sha256-u3W3WGO3BA63nb+CeNLBajbJ/sl8tDXBHKxxeTOCxfo=",
+        "narHash": "sha256-msgwgot2/hxXzlpYltIZ7boAqBkN8XejNOhBJ07q3FY=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "531c3de7eccf95155828e0cd9f18c25e7f937777",
+        "rev": "c806a73609e77f0c446fdad5d3ea6ca3b7ae6e5f",
         "type": "github"
       },
       "original": {
@@ -27,11 +27,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1689802112,
+        "lastModified": 1689362769,
-        "narHash": "sha256-Se7oHV/L0dHTQ4xp8MvYafaVdkSzF04Hx5NeloUYHtM=",
+        "narHash": "sha256-5V7Z7T9019pGsFnYH6va5h6Wveq8FKmXa/xLfj0DhNI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0cb3ac57fca6b52c42e4c0f560185540ae1dfb6c",
+        "rev": "c1cdce3d89741d402d8fd2c93e3d2643ff85b053",
         "type": "github"
       },
       "original": {
@@ -42,11 +42,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1689752456,
+        "lastModified": 1689352711,
-        "narHash": "sha256-VOChdECcEI8ixz8QY+YC4JaNEFwQd1V8bA0G4B28Ki0=",
+        "narHash": "sha256-xWYFt8vWnstDIVsZ26y9mf6h3714lVmXd6l+hTQz6tw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7f256d7da238cb627ef189d56ed590739f42f13b",
+        "rev": "2047c642ce0f75307e8a0f2ec94715218c481184",
         "type": "github"
       },
       "original": {

maddie/common/python.nix

@@ -6,8 +6,6 @@ let
     pillow
     psycopg
     passlib
-    pyotp
-    aiosmtplib
     argon2_cffi
     python-dotenv
     python-lsp-server

maddie/common/shell.nix

@@ -25,7 +25,6 @@
       # System shortcuts
       heif-convert-dir = "for file in *.heic; do heif-convert -q 100 $file \${file/%.heic/.jpg}; done";
       unfuck-wifi = "doas systemctl restart wpa_supplicant.service";
-      search = "f=$(fzf) && cd \"$f\" 2>/dev/null || xdg-open \"$f\" >/dev/null 2>&1";
       cdt = "cd $(mktemp -d)";
       sx = "startx ~/.config/x11/xinitrc";
       sdn = "doas shutdown -h now";

maddie/nixos/awesome.nix

@@ -1,7 +0,0 @@
-{ config, ... }:
-
-{
-  xsession.windowManager.awesome = {
-    enable = true;
-  };
-}

maddie/nixos/dmenu/dmenu-code

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-st -e 'zsh' -c 'cd ~/Documents/Code/"$(exa -lh --icons ~/Documents/Code | tail -n +2 | dmenu -l 30 | sed "s|.* ||")"; zsh'

maddie/nixos/dmenu/dmenu-man

@@ -1,2 +0,0 @@
-#!/bin/sh
-man -t $(man -k . | dmenu -l 30 | awk '{print $1}') | ps2pdf - - | zathura -

maddie/nixos/xob.nix

@@ -0,0 +1,20 @@
+{ config, pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    xob
+  ];
+
+  home.file.".xinitrc".text = ''
+    # Create FIFO for xob
+    rm -rf /tmp/volume.fifo
+    mkfifo /tmp/volume.fifo
+
+    # Start xob
+    (tail -f /tmp/volume.fifo | xob) &
+  '';
+
+  xdg.configFile."xob" = {
+    source = ./xob;
+  };
+}

maddie/nixos/xob/styles.cfg

@@ -0,0 +1,35 @@
+default = {
+    x         = {relative = 1; offset = -48;};
+    y         = {relative = 0.5; offset = 0;};
+    length    = {relative = 0.3; offset = 0;};
+    thickness = 24;
+    outline   = 3;
+    border    = 4;
+    padding   = 3;
+    orientation = "vertical";
+
+    overflow = "proportional";
+
+    color = {
+        normal = {
+            fg     = "#ffffff";
+            bg     = "#00000090";
+            border = "#ffffff";
+        };
+        alt = {
+            fg     = "#555555";
+            bg     = "#00000090";
+            border = "#555555";
+        };
+        overflow = {
+            fg     = "#ff0000";
+            bg     = "#00000090";
+            border = "#ff0000";
+        };
+        altoverflow = {
+            fg     = "#550000";
+            bg     = "#00000090";
+            border = "#550000";
+        };
+    };
+};

maddie/nixos/xorg.nix

@@ -2,13 +2,13 @@
 
 {
   # Run startx on tty1
-  /* programs.zsh.profileExtra = ''
+  programs.zsh.profileExtra = ''
     # If on /dev/tty1 then run startx automatically
     if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then
       sleep 2
       exec ${pkgs.xorg.xinit}/bin/startx
     fi
-  ''; */
+  '';
 
   # Attempt to set keyboard layout
   home.keyboard = {
@@ -38,17 +38,12 @@
     libnotify
   ];
 
-  # Set global font
-  xresources.properties = {
-    "*.font" = "Iosevka:pixelsize=12:antialias=true:autohint=true";
-  };
-
   # Configure ~/.xinitrc
   programs.feh.enable = true;
   home.file.".xinitrc".text = ''
     # Monitor configuration
-    ${pkgs.xorg.xrandr}/bin/xrandr --output HDMI-0 --noprimary --mode 2560x1440 --pos 2560x0 --rotate right
     ${pkgs.xorg.xrandr}/bin/xrandr --output DP-0 --primary --mode 2560x1440 --pos 0x560
+    ${pkgs.xorg.xrandr}/bin/xrandr --output HDMI-0 --noprimary --mode 2560x1440 --pos 2560x0 --rotate right
 
     # Apply wallpaper
     ${pkgs.feh}/bin/feh --no-fehbg --bg-fill "$HOME/Pictures/Wallpapers/NixOS/nix-wallpaper-waterfall.png"
@@ -60,9 +55,13 @@
     ${pkgs.xorg.xset}/bin/xset r rate 300 50
 
     # Set keyboard map and remap caps to escape
-    ${pkgs.xorg.setxkbmap}/bin/setxkbmap -layout gb -option caps:escape
+    ${pkgs.xorg.setxkbmap}/bin/setxkbmap -layout gb --option caps:escape
 
     # Start the window manager
     ${pkgs.openssh}/bin/ssh-agent ${pkgs.dwm}/bin/dwm
   '';
+
+  xresources.properties = {
+    "*.font" = "Iosevka:pixelsize=14:antialias=true:autohint=true";
+  };
 }

overlays.nix

@@ -6,8 +6,8 @@
         domain = "git.spyhoodle.me";
         owner = "maddie";
         repo = "dwm";
-        rev = "a06076bfb9324af6c4122d9cc5b0904778013350";
+        rev = "dca69fedae1e29d946ece4c8325907732015f83f";
-        sha256 = "sha256-KGqbff/i9fG0B/gMrdnwevRElL6r8lbYCloWp/NPx+0=";
+        sha256 = "sha256-OezFDY2Gxu+qqT3hdGb+g+YyqV+8R8gSN3ux5+QvL4o=";
       };
     });
     st = prev.st.overrideAttrs (oldAttrs: {
@@ -25,8 +25,8 @@
         domain = "git.spyhoodle.me";
         owner = "maddie";
         repo = "dmenu";
-        rev = "1b12798a3762807697227e9e40be29408df59ee9";
+        rev = "82156146b3f3ab720ac752a953b952d638e1f935";
-        sha256 = "sha256-wnVNqNCUpJTqHXfst9DiBaq/gzVwhlq07VM9CixczRc=";
+        sha256 = "sha256-L6aqP7wmegl6Jv4ytMw/j1FwH5lXv8QjWOY5mHotkxI=";
       };
     });
     slstatus = prev.slstatus.overrideAttrs (oldAttrs: {

systems/mdesktop/man.nix

@@ -1,8 +0,0 @@
-{ config, ... }:
-
-{
-  documentation.man = {
-    enable = true;
-    generateCaches = true;
-  };
-}

systems/mdesktop/xorg.nix

@@ -13,13 +13,8 @@
       # Use startx for starting window managers
       startx.enable = true;
 
-      # Use sddm for starting KDE
+      # Use KDE Plasma 5
-      # sddm.enable = true;
+      # plasma5.enable = true;
     };
-
-    # Enable KDE Plasma 5
-    /* desktopManager = {
-      plasma5.enable = true;
-    }; */
   };
 }