bump

augh
oh there we go
2026-03-06 14:08:25 -07:00 · 2026-03-06 00:13:14 -07:00 · 2026-03-06 05:47:42 +00:00 · 2026-03-05 22:29:29 -07:00 · 2026-03-03 16:29:36 -07:00 · 2026-03-01 21:12:54 -07:00
14 changed files with 377 additions and 378 deletions
--- a/configuration-cross.nix
+++ b/configuration-cross.nix
@ -54,27 +54,6 @@
      };
    };

-    systemd.services.nvim-server = {
-      enable = false;
-      wantedBy = [ "multi-user.target" ];
-      description = "Neovim Server";
-      script = ''
-        export PATH="/run/current-system/sw/bin:/run/wrappers/bin:$PATH"
-        nvim --listen /tmp/nvim.sock --headless
-      '';
-      serviceConfig = {
-        User = "audrey";
-        Type = "simple";
-        Restart = "always";
-      };
-      environment = {
-        LOG_CHANNEL_ID = "532689319350108160";
-        CHANNEL_COUNT = "4";
-        DELAY_SECONDS = "5";
-        DEBUG = "0";
-      };
-    };
-
  }) (lib.mkIf (pkgs.stdenv.buildPlatform != pkgs.stdenv.hostPlatform) {
      programs.vim = {
        enable = true;
--- a/configuration-desktop.nix
+++ b/configuration-desktop.nix
@ -4,7 +4,7 @@
  ...
 }:
 {
-  networking.networkmanager.enable = true;
+  #networking.networkmanager.enable = true;

  fonts.packages = builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);

@ -28,7 +28,7 @@

    libinput.enable = true;

-    blueman.enable = true;
+    #blueman.enable = true;
  };

  audrey-sway = {
@ -89,15 +89,15 @@
    mode = "0700";
    age = "1d";
  };
-  systemd.services.sysfs-settings = {
-    description = "Set desktop sysfs tunables";
-    script = ''
-      # https://bugzilla.kernel.org/show_bug.cgi?id=219112
-      test "$(cat /sys/module/kvm/parameters/nx_huge_pages)" = "never" && exit 0 || true
-      echo "never" | tee /sys/module/kvm/parameters/nx_huge_pages
-    '';
-    before = [ "boot-complete.target" ];
-  };
+  #systemd.services.sysfs-settings = {
+  #  description = "Set desktop sysfs tunables";
+  #  script = ''
+  #    # https://bugzilla.kernel.org/show_bug.cgi?id=219112
+  #    test "$(cat /sys/module/kvm/parameters/nx_huge_pages)" = "never" && exit 0 || true
+  #    echo "never" | tee /sys/module/kvm/parameters/nx_huge_pages
+  #  '';
+  #  before = [ "boot-complete.target" ];
+  #};

  hardware.keyboard.qmk.enable = true;
  services.udev.packages = [ pkgs.via ];
--- a/configuration-nixbsd.nix
+++ b/configuration-nixbsd.nix
@ -2,8 +2,6 @@
 let
  nixKey = "/var/lib/nix/binary-cache-key" ;
 in {
-  # it's already default
-  lix.enable = false;
  init.services.nix-key-setup = {
    description = "Generate a nix build signing key";
    startType = "oneshot";
--- a/configuration-nixos.nix
+++ b/configuration-nixos.nix
@ -22,7 +22,7 @@ in {

  console = {
    font = "Lat2-Terminus16";
-    #keyMap = "us";
+    keyMap = "us";
    useXkbConfig = true; # use xkb.options in tty.
  };

--- a/configuration.nix
+++ b/configuration.nix
@ -8,11 +8,11 @@ in {
      description = "python packages (p: with p; [ x ]) to include in the global python environment";
    };
  };
-  imports = [ ./overlays/packages.nix ./overlays/lix.nix ./configuration-cross.nix ];
+  imports = [ ./overlays/packages.nix ./configuration-cross.nix ];
  config = {
    nixpkgs.config.allowUnfree = true;

-    nix.settings.extra-experimental-features = "nix-command flakes pipe-operator";
+    nix.settings.extra-experimental-features = "nix-command flakes pipe-operators";
    nix.settings.trusted-users = [ "audrey" ];
    nix.settings.max-jobs = 1;
    nix.settings.cores = 0;
@ -41,11 +41,11 @@ in {
      man-pages-posix
      gnumake
      wget
-      moor
+      #moor
      ripgrep
      fd
      curl
-      btop
+      #btop
      file
      nettools
      psmisc
@ -53,27 +53,27 @@ in {
      units-desktop
      patchelf
      gdb
-      kubectl
+      #kubectl
      p7zip
      unzip
      zip
-      foremost
-      binwalk
+      #foremost
+      #binwalk
      jq
      socat
-      nix-index
+      #nix-index
      openssl
-      wireguard-tools
-      cached-nix-shell
+      #wireguard-tools
+      #cached-nix-shell
      tcpdump
      sqlite
-      cronie
+      #cronie
      editorconfig-core-c
      (python3.withPackages (p: lib.concatMap (pl: pl p) rhelmot.globalPythonPackages))
    ];

    rhelmot.globalPythonPackages = [ (p: with p; [
-      virtualenvwrapper
+      #virtualenvwrapper
      pylint
      pytest
      ipdb
@ -133,7 +133,7 @@ in {
      htop.enable = true;
      git = {
        enable = true;
-        lfs.enable = true;
+        #lfs.enable = true;
        config = {
          user.email = "audrey@rhelmot.io";
          user.name = "Audrey Dutcher";
@ -143,19 +143,19 @@ in {
          url."ssh://git@".insteadOf = "git://";
        };
      };
-      bat = {
-        enable = true;
-        extraPackages = with pkgs.bat-extras; [
-          batdiff
-          batman
-          prettybat
-        ];
-        settings = {
-          italic-text = "always";
-          wrap = "never";
-          style = "plain";
-        };
-      };
+      #bat = {
+      #  enable = true;
+      #  extraPackages = with pkgs.bat-extras; [
+      #    batdiff
+      #    batman
+      #    prettybat
+      #  ];
+      #  settings = {
+      #    italic-text = "always";
+      #    wrap = "never";
+      #    style = "plain";
+      #  };
+      #};
    };
    environment.etc."zshrc.local".source = ./dotfiles/zsh-final.sh;

@ -169,64 +169,6 @@ in {
    services.openssh.enable = true;

    
-    services.sanoid = lib.mkIf config.boot.zfs.enabled {
-      enable = true;
-      datasets."system/home" = {
-        autosnap = true;
-        autoprune = true;
-        recursive = true;
-        processChildrenOnly = false;
-        yearly = 0;
-        monthly = 2;
-        daily = 7;
-        hourly = 24;
-      };
-      datasets."system/local/var" = {
-        autosnap = true;
-        autoprune = true;
-        recursive = true;
-        processChildrenOnly = false;
-        yearly = 0;
-        monthly = 2;
-        daily = 7;
-        hourly = 24;
-      };
-      datasets."system/local/root" = {
-        autosnap = true;
-        autoprune = true;
-        recursive = true;
-        processChildrenOnly = false;
-        yearly = 0;
-        monthly = 2;
-        daily = 7;
-        hourly = 24;
-      };
-      datasets."system/local/var/lib_docker" = {
-        autosnap = false;
-        recursive = true;
-      };
-    };
-
-    services.syncoid = lib.mkIf config.boot.zfs.enabled {
-      enable = true;
-      # offset 30min from sanoid to reduce I/O spikes and give sanoid a chance to snapshot before we
-      # back up
-      interval = "00/1:30";
-      service = {
-        serviceConfig = {
-          ExecCondition = "+${lib.getExe pkgs.condition-unmetered-network}";
-        };
-      };
-      sshKey = "/var/lib/syncoid/.ssh/id_ed25519";
-      commands."system" = {
-        source = "system";
-        target = "buser@home.rhelmot.io:main/backup/${config.networking.hostName}/system";
-        # xeni note - option w is weeeeeeeird but the only consequnce is a lack of encryption
-        #sendOptions = "w";
-        recursive = true;
-        extraArgs = ["--skip-parent" "--sshport" "2252"];
-      };
-    };
  };
 }

--- a/dotfiles/sway/config
+++ b/dotfiles/sway/config
@ -8,8 +8,12 @@
 ## Environment sync with uwsm and restart daemons
 #

-exec_always 'UWSM_FINALIZE_VARNAMES="${UWSM_FINALIZE_VARNAMES}${UWSM_FINALIZE_VARNAMES:+ }PAM_KWALLET5_LOGIN" uwsm finalize && systemctl --user restart graphical-environment.target'
+#exec_always 'UWSM_FINALIZE_VARNAMES="${UWSM_FINALIZE_VARNAMES}${UWSM_FINALIZE_VARNAMES:+ }PAM_KWALLET5_LOGIN" uwsm finalize'
 exec_always '/etc/sway/generate_palette >~/.cache/sway_palette.json'
+exec waybar
+exec swaync
+exec foot --server
+exec kanshi

 #
 ## Variables
@ -22,8 +26,7 @@ set $down j
 set $up k
 set $right l
 set $term footclient
-set $prelaunch uwsm app --
-set $menu fuzzel "--launch-prefix=$prelaunch"
+set $menu fuzzel
 set $swaylock swaylock -c 1a1b26

 #
@ -31,7 +34,7 @@ set $swaylock swaylock -c 1a1b26
 #

 # Support legacy X11 apps
-xwayland enable
+#xwayland enable
 # Move containers to scratchpad when they try to minimize
 scratchpad_minimize enable
 # Move the mouse to a container when it focuses
@ -79,7 +82,7 @@ bindsym $mod+Return exec $menu
 ### Command Palette
 bindsym $mod+Ctrl+Return exec /etc/sway/palette
 ### Terminal
-bindsym $mod+t exec $prelaunch $term    
+bindsym $mod+t exec $term    

 #
 ## Special keys
--- a/dotfiles/waybar/config.jsonc
+++ b/dotfiles/waybar/config.jsonc
@ -10,7 +10,7 @@
    "custom/launcher": {
        "format": "",
        "tooltip-format": "",
-        "on-click": "fuzzel --launch-prefix=\"uwsm app --\" --no-exit-on-keyboard-focus-loss",
+        "on-click": "fuzzel --no-exit-on-keyboard-focus-loss",
    },
    "systemd-failed-units": {
        "format": "󱗗",
--- a/dotfiles/zsh-init.sh
+++ b/dotfiles/zsh-init.sh
@ -7,7 +7,7 @@ unsetopt beep nomatch
 # Aliases
 #

-eval "$(batman --export-env)"
+#eval "$(batman --export-env)"

 # standard functions

--- a/flake.lock
+++ b/flake.lock
@ -2,11 +2,11 @@
  "nodes": {
    "bingosync": {
      "locked": {
-        "lastModified": 1765872749,
-        "narHash": "sha256-ueriWIOHdyMaVFyqQJVSVxsjhoebX5szbPrL67GBQF4=",
+        "lastModified": 1769710902,
+        "narHash": "sha256-cNkfwDSPOew7CPnkEBfVxZl8tMZDAhD7MQP5AKSCEKE=",
        "owner": "rhelmot",
        "repo": "bingosync",
-        "rev": "e94c3ff624b843fd4c02afbdbf22338b1d9c4650",
+        "rev": "7fd458dfb54ff88bc1744223bd6b6f3576bd85da",
        "type": "github"
      },
      "original": {
@ -58,63 +58,118 @@
        "type": "github"
      }
    },
+    "cppnix": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "flake-parts": "flake-parts",
+        "git-hooks-nix": "git-hooks-nix",
+        "nixpkgs": [
+          "nixbsd",
+          "nixpkgs"
+        ],
+        "nixpkgs-23-11": "nixpkgs-23-11",
+        "nixpkgs-regression": "nixpkgs-regression"
+      },
+      "locked": {
+        "lastModified": 1772745693,
+        "narHash": "sha256-4d0xSh/Vy2xI5jqCKmw/Yuo18uAUtnqvBrllNcmXvqU=",
+        "owner": "rhelmot",
+        "repo": "nix",
+        "rev": "38517c6967041d60e469383bc4ce3c0b4adf00ae",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rhelmot",
+        "ref": "freebsd-safe",
+        "repo": "nix",
+        "type": "github"
+      }
+    },
    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1733328505,
+        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_2": {
      "locked": {
        "lastModified": 1733328505,
        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
        "revCount": 69,
        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz"
+        "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz?rev=ff81ac966bb2cae68946d5ed5fc4994f96d0ffec&revCount=69"
      },
      "original": {
        "type": "tarball",
        "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
      }
    },
-    "flake-compat_2": {
-      "flake": false,
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "nixbsd",
+          "cppnix",
+          "nixpkgs"
+        ]
+      },
      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "lastModified": 1733312601,
+        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
        "type": "github"
      },
      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
        "type": "github"
      }
    },
-    "lix": {
+    "git-hooks-nix": {
      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "nix2container": "nix2container",
+        "flake-compat": [
+          "nixbsd",
+          "cppnix"
+        ],
+        "gitignore": [
+          "nixbsd",
+          "cppnix"
+        ],
        "nixpkgs": [
          "nixbsd",
+          "cppnix",
          "nixpkgs"
        ],
-        "nixpkgs-regression": [
+        "nixpkgs-stable": [
          "nixbsd",
+          "cppnix",
          "nixpkgs"
-        ],
-        "pre-commit-hooks": "pre-commit-hooks"
+        ]
      },
      "locked": {
-        "lastModified": 1732339771,
-        "narHash": "sha256-/ViH3RRdFm9R9WN4szwdwMSbnDnRzNqgkFNR5dBh+Og=",
-        "ref": "freebsd-build",
-        "rev": "a26c6228c31cc66b31a75f24a95f420952a6cbb2",
-        "revCount": 16516,
-        "type": "git",
-        "url": "https://git.lix.systems/artemist/lix.git"
+        "lastModified": 1734279981,
+        "narHash": "sha256-NdaCraHPp8iYMWzdXAt5Nv6sA3MUzlCiGiR586TCwo0=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "aa9f40c906904ebd83da78e7f328cd8aeaeae785",
+        "type": "github"
      },
      "original": {
-        "ref": "freebsd-build",
-        "type": "git",
-        "url": "https://git.lix.systems/artemist/lix.git"
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
      }
    },
    "mini-tmpfiles": {
@ -125,11 +180,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1741473245,
-        "narHash": "sha256-32ekQLovnjpb1NBvt1/WCEn98khSGljX+QkS+SLSNpM=",
+        "lastModified": 1742754557,
+        "narHash": "sha256-nGxgiNhA94eSl8jcQwCboJ5Ed132z8yrFdOoT+rf8bE=",
        "owner": "nixos-bsd",
        "repo": "mini-tmpfiles",
-        "rev": "1ff4fc98963421e0e6b099ccda721d5a1ca4c887",
+        "rev": "534ee577692c7092fdcd035f89bc29b663c6f9ca",
        "type": "github"
      },
      "original": {
@ -138,89 +193,75 @@
        "type": "github"
      }
    },
-    "nix2container": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1724996935,
-        "narHash": "sha256-njRK9vvZ1JJsP8oV2OgkBrpJhgQezI03S7gzskCcHos=",
-        "owner": "nlewo",
-        "repo": "nix2container",
-        "rev": "fa6bb0a1159f55d071ba99331355955ae30b3401",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nlewo",
-        "repo": "nix2container",
-        "type": "github"
-      }
-    },
    "nixbsd": {
      "inputs": {
-        "flake-compat": "flake-compat",
-        "lix": "lix",
+        "cppnix": "cppnix",
+        "flake-compat": "flake-compat_2",
        "mini-tmpfiles": "mini-tmpfiles",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
      },
      "locked": {
-        "lastModified": 1743152305,
-        "narHash": "sha256-jLO2QaCoEqSVF5+UOPAQKE74U4CAlc/5huuaT7I6RL4=",
+        "lastModified": 1772769953,
+        "narHash": "sha256-3NRnNY5L8dm3bc12nr3wk4sMOWbvO1m5s7/wWXXwx2Q=",
        "owner": "nixos-bsd",
        "repo": "nixbsd",
-        "rev": "79c61bb25529d19cc1e6922b499162b5dda54268",
+        "rev": "87787927615d57969df3faf3cdeeb1bf1f3e1576",
        "type": "github"
      },
      "original": {
        "owner": "nixos-bsd",
-        "ref": "main",
+        "ref": "nixbsd-demo",
        "repo": "nixbsd",
        "type": "github"
      }
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1741684394,
-        "narHash": "sha256-6G65wM+dJUgt0RfzxbN08OnhdY+YiYFdEpExFvPU6yg=",
-        "owner": "nixos-bsd",
+        "lastModified": 1772828289,
+        "narHash": "sha256-rNKF1bFtrV+1Lable7vVxw53W0EM0qCOXW+TfL6wwQs=",
+        "owner": "rhelmot",
        "repo": "nixpkgs",
-        "rev": "30f30c8fdf82dfcbceb0c4e1dafda15e6faaa76d",
+        "rev": "c6b65605b4caf622440e7287e0394a789def6729",
        "type": "github"
      },
      "original": {
-        "owner": "nixos-bsd",
-        "ref": "nixbsd-dev-new",
+        "owner": "rhelmot",
+        "ref": "freebsd-graphical-wip",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
-    "nixpkgs_2": {
+    "nixpkgs-23-11": {
      "locked": {
-        "lastModified": 1770617025,
-        "narHash": "sha256-1jZvgZoAagZZB6NwGRv2T2ezPy+X6EFDsJm+YSlsvEs=",
+        "lastModified": 1717159533,
+        "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "2db38e08fdadcc0ce3232f7279bab59a15b94482",
+        "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "nixos-25.11",
        "repo": "nixpkgs",
+        "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
        "type": "github"
      }
    },
-    "pre-commit-hooks": {
-      "flake": false,
+    "nixpkgs-regression": {
      "locked": {
-        "lastModified": 1726745158,
-        "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=",
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74",
+        "lastModified": 1643052045,
+        "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
        "type": "github"
      },
      "original": {
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
        "type": "github"
      }
    },
@ -229,7 +270,7 @@
        "bingosync": "bingosync",
        "blog-rhelmot-io": "blog-rhelmot-io",
        "nixbsd": "nixbsd",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs"
      }
    },
    "systems": {
--- a/flake.nix
+++ b/flake.nix
@ -1,8 +1,9 @@
 {
  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
+    nixpkgs.url = "github:rhelmot/nixpkgs/freebsd-graphical-wip";
    #nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
-    nixbsd.url = "github:nixos-bsd/nixbsd/main";
+    nixbsd.url = "github:nixos-bsd/nixbsd/nixbsd-demo";
+    nixbsd.inputs.nixpkgs.follows = "nixpkgs";

    bingosync.url = "github:rhelmot/bingosync";
    blog-rhelmot-io.url = "git+https://git.lain.faith/rhelmot/blog.rhelmot.io";
@ -28,15 +29,15 @@
          ./sites/${name}/configuration.nix
          { nixpkgs.buildPlatform = platform; }
          self.modules.audrey-sway
-          self.modules.mobile-timezone
+          #self.modules.mobile-timezone
          self.modules.kakoune
          self.modules.zfs-module
-          self.modules.syncthing-cluster
-          {
-            services.syncthing-cluster.deviceIds = ./keys/syncthing;
-            services.syncthing-cluster.coordinator = "hydrangea";
-          }
-          bingosync.nixosModules.default
+          #self.modules.syncthing-cluster
+          #{
+          #  services.syncthing-cluster.deviceIds = ./keys/syncthing;
+          #  services.syncthing-cluster.coordinator = "hydrangea";
+          #}
+          #bingosync.nixosModules.default
          #nixos-defcon.nixosModules.pkgsOverlay
          #nixos-defcon.nixosModules.tulip
          #nixos-defcon.nixosModules.noscope
--- a/keys/nix
+++ b/keys/nix
@ -1,2 +1,2 @@
-clove:UVUGJicEY/PmVWqi4dlqmsNIglGFAsJzgLLsgVrMKsM=
+clove:WbMoKN9/WvTS/tCNa2+75MImjZuqX8X094i5vT0dKTU=
 daisy:HU3mg1KY/sGYVZk243dgJRDLKHASRmu8/IXeGI/sdE8=
--- a/modules/audrey-sway.nix
+++ b/modules/audrey-sway.nix
@ -42,69 +42,69 @@ in
    };

    config = lib.mkIf cfg.enable {
-      programs.regreet.enable = true;
-      services.greetd.settings = {
-        default_session.command = "${pkgs.dbus}/bin/dbus-run-session ${lib.getExe config.programs.sway.package} -c /etc/sway/greeter-config";
-      };
-      programs.regreet.settings = {
-        background.fit = "Fill";
-        GTK.application_prefer_dark_theme = true;
-      };
+      #programs.regreet.enable = true;
+      #services.greetd.settings = {
+      #  default_session.command = "${pkgs.dbus}/bin/dbus-run-session ${lib.getExe config.programs.sway.package} -c /etc/sway/greeter-config";
+      #};
+      #programs.regreet.settings = {
+      #  background.fit = "Fill";
+      #  GTK.application_prefer_dark_theme = true;
+      #};
      environment.etc."sway/config".source = lib.mkForce ../dotfiles/sway/config;
      environment.etc."sway/sws".source = ../dotfiles/sway/sws.sh;
      environment.etc."sway/generate_palette".source = ../dotfiles/sway/generate_palette.sh;
      environment.etc."sway/palette".source = ../dotfiles/sway/palette.sh;
      environment.etc."sway/bg".source = cfg.background;
-      environment.etc."sway/greeter-config".source = lib.mkForce (pkgs.writeText "sway-greeter-config" ''
-        exec "${lib.getExe config.programs.regreet.package}; swaymsg exit"
-        output * scale 2
-        input type:keyboard {
-            xkb_options "caps:escape"
-        }
-        input type:touchpad {
-            dwt enabled
-            dwtp enabled
-            tap enabled
-            tap_button_map lrm
-            natural_scroll enabled
-        }
+      #environment.etc."sway/greeter-config".source = lib.mkForce (pkgs.writeText "sway-greeter-config" ''
+      #  exec "${lib.getExe config.programs.regreet.package}; swaymsg exit"
+      #  output * scale 2
+      #  input type:keyboard {
+      #      xkb_options "caps:escape"
+      #  }
+      #  input type:touchpad {
+      #      dwt enabled
+      #      dwtp enabled
+      #      tap enabled
+      #      tap_button_map lrm
+      #      natural_scroll enabled
+      #  }

-        # Brightness
-        bindsym --locked XF86MonBrightnessDown exec light -U 10
-        bindsym --locked XF86MonBrightnessUp exec light -A 10
+      #  # Brightness
+      #  bindsym --locked XF86MonBrightnessDown exec light -U 10
+      #  bindsym --locked XF86MonBrightnessUp exec light -A 10

-        blur enable
-        corner_radius 8
-        shadows enable
-        shadow_blur_radius 8
-      '');
+      #  blur enable
+      #  corner_radius 8
+      #  shadows enable
+      #  shadow_blur_radius 8
+      #'');
      environment.etc."xdg/waybar".source = ../dotfiles/waybar;
      environment.etc."xdg/swayr".source = ../dotfiles/swayr;
      environment.etc."xdg/fuzzel".source = ../dotfiles/fuzzel;
      environment.etc."xdg/foot".source = ../dotfiles/foot;
      environment.etc."xdg/xdg-desktop-portal-wlr/config".source = ../dotfiles/xdg-desktop-portal-wlr;

-      programs.uwsm = {
-        enable = true;
-        waylandCompositors.sway = {
-          prettyName = "Sway";
-          binPath = "/run/current-system/sw/bin/sway";
-        };
-      };
+      #programs.uwsm = {
+      #  enable = true;
+      #  waylandCompositors.sway = {
+      #    prettyName = "Sway";
+      #    binPath = "/run/current-system/sw/bin/sway";
+      #  };
+      #};
      programs.sway = {
        enable = true;
        package = pkgs.swayfx;
        wrapperFeatures.gtk = true;
-        xwayland.enable = true;
+        #xwayland.enable = true;
        extraPackages = with pkgs; [
          swaylock
          swaynotificationcenter
-          swayr
-          pavucontrol
-          pulseaudio
+          #swayr
+          #pavucontrol
+          #pulseaudio
          libnotify
          wdisplays
-          playerctl
+          #playerctl
          grim
          slurp
          swayidle
@ -115,10 +115,11 @@ in
          fuzzel
          gsettings-desktop-schemas
          glib
-          kdePackages.kwallet
-          networkmanagerapplet
+          kanshi
+          #kdePackages.kwallet
+          #networkmanagerapplet
          adwaita-icon-theme
-          reversal-icon-theme
+          #reversal-icon-theme
          whitesur-icon-theme
          xdg-user-dirs
        ];
@ -131,113 +132,114 @@ in
      };
      environment.pathsToLink = [ "/share/gsettings-schemas" ];
      #environment.sessionVariables.XDG_DATA_DIRS = [ "/run/current-system/sw/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}" ];
-      programs.light.enable = true;
+      #programs.light.enable = true;
      security.pam.services.swaylock = {};
      security.pam.loginLimits = [
        { domain = "@users"; item = "rtprio"; type = "-"; value = 1; }
      ];
      security.pam.services = {
-        greetd.kwallet = {
-          enable = true;
-          package = pkgs.kdePackages.kwallet-pam;
-          forceRun = true;
+        #greetd.kwallet = {
+        #  enable = true;
+        #  package = pkgs.kdePackages.kwallet-pam;
+        #  forceRun = true;
+        #};
+        #greetd.rules.session.kwallet.settings.auto_start = true;
      };
-        greetd.rules.session.kwallet.settings.auto_start = true;
-      };
-      security.polkit.enable = true;
+      security.polkit.enable = lib.mkForce false;
+      programs.xwayland.enable = false;
      programs.dconf.enable = true;
-      services.power-profiles-daemon.enable = true;
-      systemd.user.targets.graphical-environment = { };
-      systemd.user.services.kanshi = {
-        description = "Monitor hotswap daemon";
-        serviceConfig = {
-          Type = "simple";
-          ExecStart = lib.getExe pkgs.kanshi;
-        };
-        partOf = [ "graphical-environment.target" ];
-        wantedBy = [ "graphical-environment.target" ];
-      };
-      systemd.user.services.swayidle = {
-        description = "Idle lock + sleep manager";
-        serviceConfig = {
-          Type = "simple";
-          ExecStart = ''
-            ${lib.getExe pkgs.swayidle} -w \
-              timeout 300 'swaymsg "output * power off"' \
-                  resume 'swaymsg "output * power on"' \
-              timeout 360 '${swaylockCmd} -f' \
-              timeout 600 'systemctl suspend' \
-              before-sleep '${swaylockCmd} -f'
-          '';
-        };
-        path = [ "/run/current-system/sw" ];
-        partOf = [ "graphical-environment.target" ];
-        wantedBy = [ "graphical-environment.target" ];
-      };
-      systemd.user.services.waybar = {
-        description = "Desktop status bar";
-        serviceConfig = {
-          Type = "simple";
-          ExecStart = lib.getExe pkgs.waybar;
-        };
-        path = [ "/run/current-system/sw" ];
-        partOf = [ "graphical-environment.target" ];
-        wantedBy = [ "graphical-environment.target" ];
-      };
-      systemd.user.services.networkmanagerapplet = {
-        description = "Networkmanager applet";
-        serviceConfig = {
-          Type = "simple";
-          ExecStart = lib.getExe pkgs.networkmanagerapplet;
-        };
-        path = [ "/run/current-system/sw" ];
-        partOf = [ "graphical-environment.target" ];
-        wantedBy = [ "graphical-environment.target" ];
-      };
-      systemd.user.services.pasystray = {
-        description = "Pulseaudio system tray icon";
-        serviceConfig = {
-          Type = "simple";
-          ExecStart = "${lib.getExe pkgs.pasystray} --notify source --notify sink -m 100";
-        };
-        path = [ "/run/current-system/sw" ];
-        partOf = [ "graphical-environment.target" ];
-        wantedBy = [ "graphical-environment.target" ];
-      };
-      systemd.user.services.kdeconnect-indicator = {
-        description = "KDE connect indicator";
-        serviceConfig = {
-          Type = "simple";
-          ExecStart = "${lib.getBin pkgs.kdePackages.kdeconnect-kde}/bin/kdeconnect-indicator";
-        };
-        path = [ "/run/current-system/sw" ];
-        partOf = [ "graphical-environment.target" ];
-        wantedBy = [ "graphical-environment.target" ];
-      };
-      systemd.user.services.swayr = {
-        description = "Sway MRU window switcher";
-        serviceConfig = {
-          Type = "simple";
-          ExecStart = "${lib.getBin pkgs.swayr}/bin/swayrd";
-        };
-        path = [ "/run/current-system/sw" ];
-        partOf = [ "graphical-environment.target" ];
-        wantedBy = [ "graphical-environment.target" ];
-      };
-      systemd.user.services.polkit-gnome-authentication-agent-1 = {
-        description = "polkit-gnome-authentication-agent-1";
-        partOf = [ "graphical-environment.target" ];
-        wantedBy = [ "graphical-environment.target" ];
-        serviceConfig = {
-          Type = "simple";
-          ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
-          Restart = "on-failure";
-          RestartSec = 1;
-          TimeoutStopSec = 10;
-        };
-      };
-      systemd.packages = [ pkgs.foot ];
-      systemd.user.sockets.foot-server.wantedBy = [ "graphical-environment.target" ];
+      #services.power-profiles-daemon.enable = true;
+      #systemd.user.targets.graphical-environment = { };
+      #systemd.user.services.kanshi = {
+      #  description = "Monitor hotswap daemon";
+      #  serviceConfig = {
+      #    Type = "simple";
+      #    ExecStart = lib.getExe pkgs.kanshi;
+      #  };
+      #  partOf = [ "graphical-environment.target" ];
+      #  wantedBy = [ "graphical-environment.target" ];
+      #};
+      #systemd.user.services.swayidle = {
+      #  description = "Idle lock + sleep manager";
+      #  serviceConfig = {
+      #    Type = "simple";
+      #    ExecStart = ''
+      #      ${lib.getExe pkgs.swayidle} -w \
+      #        timeout 300 'swaymsg "output * power off"' \
+      #            resume 'swaymsg "output * power on"' \
+      #        timeout 360 '${swaylockCmd} -f' \
+      #        timeout 600 'systemctl suspend' \
+      #        before-sleep '${swaylockCmd} -f'
+      #    '';
+      #  };
+      #  path = [ "/run/current-system/sw" ];
+      #  partOf = [ "graphical-environment.target" ];
+      #  wantedBy = [ "graphical-environment.target" ];
+      #};
+      #systemd.user.services.waybar = {
+      #  description = "Desktop status bar";
+      #  serviceConfig = {
+      #    Type = "simple";
+      #    ExecStart = lib.getExe pkgs.waybar;
+      #  };
+      #  path = [ "/run/current-system/sw" ];
+      #  partOf = [ "graphical-environment.target" ];
+      #  wantedBy = [ "graphical-environment.target" ];
+      #};
+      #systemd.user.services.networkmanagerapplet = {
+      #  description = "Networkmanager applet";
+      #  serviceConfig = {
+      #    Type = "simple";
+      #    ExecStart = lib.getExe pkgs.networkmanagerapplet;
+      #  };
+      #  path = [ "/run/current-system/sw" ];
+      #  partOf = [ "graphical-environment.target" ];
+      #  wantedBy = [ "graphical-environment.target" ];
+      #};
+      #systemd.user.services.pasystray = {
+      #  description = "Pulseaudio system tray icon";
+      #  serviceConfig = {
+      #    Type = "simple";
+      #    ExecStart = "${lib.getExe pkgs.pasystray} --notify source --notify sink -m 100";
+      #  };
+      #  path = [ "/run/current-system/sw" ];
+      #  partOf = [ "graphical-environment.target" ];
+      #  wantedBy = [ "graphical-environment.target" ];
+      #};
+      #systemd.user.services.kdeconnect-indicator = {
+      #  description = "KDE connect indicator";
+      #  serviceConfig = {
+      #    Type = "simple";
+      #    ExecStart = "${lib.getBin pkgs.kdePackages.kdeconnect-kde}/bin/kdeconnect-indicator";
+      #  };
+      #  path = [ "/run/current-system/sw" ];
+      #  partOf = [ "graphical-environment.target" ];
+      #  wantedBy = [ "graphical-environment.target" ];
+      #};
+      #systemd.user.services.swayr = {
+      #  description = "Sway MRU window switcher";
+      #  serviceConfig = {
+      #    Type = "simple";
+      #    ExecStart = "${lib.getBin pkgs.swayr}/bin/swayrd";
+      #  };
+      #  path = [ "/run/current-system/sw" ];
+      #  partOf = [ "graphical-environment.target" ];
+      #  wantedBy = [ "graphical-environment.target" ];
+      #};
+      #systemd.user.services.polkit-gnome-authentication-agent-1 = {
+      #  description = "polkit-gnome-authentication-agent-1";
+      #  partOf = [ "graphical-environment.target" ];
+      #  wantedBy = [ "graphical-environment.target" ];
+      #  serviceConfig = {
+      #    Type = "simple";
+      #    ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
+      #    Restart = "on-failure";
+      #    RestartSec = 1;
+      #    TimeoutStopSec = 10;
+      #  };
+      #};
+      #systemd.packages = [ pkgs.foot ];
+      #systemd.user.sockets.foot-server.wantedBy = [ "graphical-environment.target" ];

      audrey-sway.extraPaletteEntries = [
          { name = "Command Palette"; }
--- a/sites/chrysanthemum/configuration.nix
+++ b/sites/chrysanthemum/configuration.nix
@ -4,22 +4,50 @@

  networking.hostName = "chrysanthemum";
  networking.hostId = "6bb591ac";
+  networking.dhcpcd.wait = "background";
+  networking.interfaces.wlan0.wlandev = "iwlwifi0";
+  services.wpa_supplicant.configFile = "/home/audrey/wpa_supplicant.conf";

-  system.stateVersion = "25.04";
+  system.stateVersion = "25.11";
  environment.etc.machine-id.text = "d3d521900f0e11f0af2b9d9b219a1c36\n";

  security.sudo.wheelNeedsPassword = false;
  hardware.opengl.enable = true;
  services.dbus.enable = true;
-  services.accounts-daemon.enable = true;
-  services.consolekit2.enable = true;
-  services.xserver = {
-    enable = true;
-    displayManager.lightdm.enable = true;
-    displayManager.defaultSession = "xfce";
-    desktopManager.xfce = {
-      enable = true;
-    };
-    exportConfiguration = true;
-  };
+  services.seatd.enable = true;
+  boot.extraModulePackages = [ pkgs.freebsd.wifi-firmware-kmod ];
+  users.users.audrey.extraGroups = [
+    "u2f"
+    "seat"
+    "_video"
+  ];
+  # boot.kernelEnvironment."hw.psm.synaptics_support" = "1";
+  boot.kernelEnvironment."compat.linuxkpi.iwlwifi_disable_11ac" = "0";
+  boot.kernelEnvironment."compat.linuxkpi.iwlwifi_11n_disable" = "0";
+  freebsd.rc.conf.kld_list = "i915kms";
+
+  audrey-sway.enable = true;
+  environment.systemPackages = with pkgs; [
+    firefox
+    foot
+    dino
+    fzf
+    (libinput.override { eventGUISupport = true; })
+    util-linuxMinimal
+  ];
+  fonts.packages = builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
+  services.powerd.enable = true;
+  hardware.bsdfan.enable = true;
+
+  #services.accounts-daemon.enable = true;
+  #services.consolekit2.enable = true;
+  #services.xserver = {
+  #  enable = true;
+  #  displayManager.lightdm.enable = true;
+  #  displayManager.defaultSession = "xfce";
+  #  desktopManager.xfce = {
+  #    enable = true;
+  #  };
+  #  exportConfiguration = true;
+  #};
 }
--- a/sites/chrysanthemum/hardware-configuration.nix
+++ b/sites/chrysanthemum/hardware-configuration.nix
@ -2,31 +2,36 @@

 {
  fileSystems."/" =
-    { device = "system/local/root";
-      fsType = "zfs";
-    };
-
-  fileSystems."/nix" =
-    { device = "system/local/nix";
+    { device = "system/tier1/root";
      fsType = "zfs";
    };

  fileSystems."/var" =
-    { device = "system/local/var";
+    { device = "system/tier1/var";
      fsType = "zfs";
    };

  fileSystems."/home" =
-    { device = "system/home";
+    { device = "system/tier1/home";
+      fsType = "zfs";
+    };
+
+  fileSystems."/nix" =
+    { device = "system/scratch/nix";
+      fsType = "zfs";
+    };
+
+  fileSystems."/tmp" =
+    { device = "system/scratch/tmp";
      fsType = "zfs";
    };

  fileSystems."/boot" =
-    { device = "/dev/gpt/ESP";
+    { device = "/dev/nda0p1";
      fsType = "msdos";
    };

-  swapDevices = [ { device = "/dev/gpt/swap"; } ];
+  #swapDevices = [ { device = "/dev/gpt/swap"; } ];

  nixpkgs.hostPlatform = lib.mkDefault "x86_64-freebsd";
 }
Author	SHA1	Message	Date
Audrey	79f6995431	bump	2026-03-06 14:08:25 -07:00
Audrey	32301ed3d6	augh	2026-03-06 00:13:14 -07:00
Audrey	bc4205d3ee	oh there we go	2026-03-06 05:47:42 +00:00
Audrey	9fb72416ca	almost there	2026-03-05 22:29:29 -07:00
Audrey	7cf36bd2b5	rg good	2026-03-03 16:29:36 -07:00
Audrey	4a2f311176	more chrysanthemum	2026-03-01 21:12:54 -07:00
Audrey	32f224b494	oops	2026-02-25 05:12:58 -07:00
Audrey	52c8c73d9d	what	2026-02-25 05:09:19 -07:00
Audrey	ac0a851962	chrysanthemum attempt	2026-02-24 09:16:33 -07:00