flake.lock: Add

Flake lock file updates:

• Added input 'crane':
    'github:ipetkov/crane/ef80ead953c1b28316cc3f8613904edc2eb90c28' (2024-11-08)
• Added input 'fenix':
    'github:nix-community/fenix/87e4581cdfecbac602220fe76c67b37d2d1ee995' (2024-11-09)
• Added input 'fenix/nixpkgs':
    follows 'nixpkgs'
• Added input 'fenix/rust-analyzer-src':
    'github:rust-lang/rust-analyzer/dd9cd22514cb1001a0a2374b36a85eb75245f27b' (2024-11-08)
• Added input 'helix-inline-diags':
    'github:helix-editor/helix/b53dafe326d51b7f64a1c52379e3d4150cd2991e' (2024-11-05)
• Added input 'helix-inline-diags/crane':
    follows 'crane'
• Added input 'helix-inline-diags/flake-utils':
    'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a' (2024-09-17)
• Added input 'helix-inline-diags/flake-utils/systems':
    'github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e' (2023-04-09)
• Added input 'helix-inline-diags/nixpkgs':
    follows 'nixpkgs'
• Added input 'helix-inline-diags/rust-overlay':
    'github:oxalica/rust-overlay/25685cc2c7054efc31351c172ae77b21814f2d42' (2024-10-07)
• Added input 'helix-inline-diags/rust-overlay/nixpkgs':
    follows 'helix-inline-diags/nixpkgs'
• Added input 'home-manager':
    'github:nix-community/home-manager/2f607e07f3ac7e53541120536708e824acccfaa8' (2024-11-05)
• Added input 'home-manager/nixpkgs':
    follows 'nixpkgs'
• Added input 'lix-module':
    'git+https://git.lix.systems/lix-project/nixos-module?ref=refs/heads/main&rev=691193879d96bdfd1e6ab5ebcca2fadc7604cf34' (2024-11-09)
• Added input 'lix-module/flake-utils':
    'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a' (2024-09-17)
• Added input 'lix-module/flake-utils/systems':
    'github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e' (2023-04-09)
• Added input 'lix-module/flakey-profile':
    'github:lf-/flakey-profile/243c903fd8eadc0f63d205665a92d4df91d42d9d' (2024-04-12)
• Added input 'lix-module/lix':
    'b967f1d5fe.tar.gz?narHash=sha256-WnT6MpgrMKgqV2Rs%2BMfU88%2BKO%2B/njELPOtGoNhoX2oA%3D&rev=b967f1d5fe9d1bf58e6159e9b426c5b341489397' (2024-11-09)
• Added input 'lix-module/nixpkgs':
    follows 'nixpkgs'
• Added input 'mac-brcm-fw':
    'path:/home/jade/nix-configs/mac-brcm-fw?lastModified=1727366922&narHash=sha256-%2BkW8ogc6DykjMVlrr%2B3vWKs9ZUdJ9EW72LbY7k/Qvh4%3D' (2024-09-26)
• Added input 'nixos-hardware':
    'github:networkException/nixos-hardware/8e28b9ee431b265d1fc74b8b819ea0816344c4a1' (2023-06-27)
• Added input 'nixpkgs':
    'github:NixOS/nixpkgs/4aa36568d413aca0ea84a1684d2d46f55dbabad7' (2024-11-05)
• Added input 'nixpkgs-stable':
    'github:NixOS/nixpkgs/205fd4226592cc83fd4c0885a3e4c9c400efabb5' (2024-07-09)
• Added input 'nixpkgs-unstable-small':
    'github:NixOS/nixpkgs/4a2c7def574d031cbf3d7110969f2ca5f38f8ed7' (2024-11-09)

common.nix

@@ -42,6 +42,9 @@ with builtins; {
 
   environment = {
     systemPackages = with pkgs; [
+      overskride
+      pulsemixer
+
       htmlq
 
       prusa-slicer

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "crane": {
       "locked": {
-        "lastModified": 1729273024,
-        "narHash": "sha256-Mb5SemVsootkn4Q2IiY0rr9vrXdCCpQ9HnZeD/J3uXs=",
+        "lastModified": 1731098351,
+        "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "fa8b7445ddadc37850ed222718ca86622be01967",
+        "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28",
         "type": "github"
       },
       "original": {
@@ -23,11 +23,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1729578683,
-        "narHash": "sha256-h0Wmvrkadbyi3IJXFLPi+QyYjCAKDr2xQ6dLxlQ8cXY=",
+        "lastModified": 1731133750,
+        "narHash": "sha256-gZ3m8e176ai+akwiayg7Mve73rcUCD0+l6OMMFhGEYI=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "d66cda53e8193a878742dcadb5bb75f4df7c3c0a",
+        "rev": "87e4581cdfecbac602220fe76c67b37d2d1ee995",
         "type": "github"
       },
       "original": {
@@ -99,11 +99,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1729477666,
-        "narHash": "sha256-ri40XjKyZIMH5wBCFNa50dq5wTBPF5qH/NVDo+syhNM=",
+        "lastModified": 1730790589,
+        "narHash": "sha256-xJ6bQ4VmdTB7A+dMbmOMaZ8a6erB6rkZkB+yzqD7gd4=",
         "owner": "helix-editor",
         "repo": "helix",
-        "rev": "6d64e6288add793caf1c841ea295518414c04ea0",
+        "rev": "b53dafe326d51b7f64a1c52379e3d4150cd2991e",
         "type": "github"
       },
       "original": {
@@ -119,11 +119,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1729551526,
-        "narHash": "sha256-7LAGY32Xl14OVQp3y6M43/0AtHYYvV6pdyBcp3eoz0s=",
+        "lastModified": 1730837930,
+        "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "5ec753a1fc4454df9285d8b3ec0809234defb975",
+        "rev": "2f607e07f3ac7e53541120536708e824acccfaa8",
         "type": "github"
       },
       "original": {
@@ -135,11 +135,11 @@
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1727712632,
-        "narHash": "sha256-7kaZRZCWG8PmxwIDTVKjJo3VtAGDun7mqfAMlucQbdQ=",
-        "rev": "a16ceb9411c57993d811c6bebb517742fe3d34e3",
+        "lastModified": 1731164513,
+        "narHash": "sha256-WnT6MpgrMKgqV2Rs+MfU88+KO+/njELPOtGoNhoX2oA=",
+        "rev": "b967f1d5fe9d1bf58e6159e9b426c5b341489397",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/a16ceb9411c57993d811c6bebb517742fe3d34e3.tar.gz?rev=a16ceb9411c57993d811c6bebb517742fe3d34e3"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/b967f1d5fe9d1bf58e6159e9b426c5b341489397.tar.gz?rev=b967f1d5fe9d1bf58e6159e9b426c5b341489397"
       },
       "original": {
         "type": "tarball",
@@ -156,11 +156,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727752861,
-        "narHash": "sha256-jowmo2aEzrEpPSM96IWtajuogdJm7DjAWxFTEb7Ct0s=",
+        "lastModified": 1731185731,
+        "narHash": "sha256-RNaIu43b9PoXEhW4OqXUNZKY/jezQyCYWwdv1M0VjsA=",
         "ref": "refs/heads/main",
-        "rev": "fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d",
-        "revCount": 116,
+        "rev": "691193879d96bdfd1e6ab5ebcca2fadc7604cf34",
+        "revCount": 117,
         "type": "git",
         "url": "https://git.lix.systems/lix-project/nixos-module"
       },
@@ -172,7 +172,7 @@
     "mac-brcm-fw": {
       "flake": false,
       "locked": {
-        "lastModified": 1709065070,
+        "lastModified": 1727366922,
         "narHash": "sha256-+kW8ogc6DykjMVlrr+3vWKs9ZUdJ9EW72LbY7k/Qvh4=",
         "path": "/home/jade/nix-configs/mac-brcm-fw",
         "type": "path"
@@ -200,11 +200,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1729413321,
-        "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=",
+        "lastModified": 1730785428,
+        "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26",
+        "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
         "type": "github"
       },
       "original": {
@@ -230,11 +230,11 @@
     },
     "nixpkgs-unstable-small": {
       "locked": {
-        "lastModified": 1729577921,
-        "narHash": "sha256-bxktXyAj3818+okqwaR9L/F4UREnry0OEjnYqwYVdkc=",
+        "lastModified": 1731136819,
+        "narHash": "sha256-qGmBFnq3/9AiiLZUOVxDsU5j6ysL3PXA8KRp7muJWMs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "29dccd64f527eebafce219e7ca2bfda5fee75456",
+        "rev": "4a2c7def574d031cbf3d7110969f2ca5f38f8ed7",
         "type": "github"
       },
       "original": {
@@ -260,11 +260,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1729533545,
-        "narHash": "sha256-A/AuEWcGwwjpfBCZqWDNNg5GwYrJduzLvlMe+A7xG5U=",
+        "lastModified": 1731056261,
+        "narHash": "sha256-TPeXChHVcaCBAoE349K7OZH4We5/2ys1GgG4IiwjwOs=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "de2ff17bc513807412d7bbaba1d995a774938583",
+        "rev": "dd9cd22514cb1001a0a2374b36a85eb75245f27b",
         "type": "github"
       },
       "original": {

hosts/monosodium-glutamate-g/configuration.nix

@@ -82,23 +82,7 @@
   # networking.firewall.allowedTCPPorts = [ 4713 ];
   systemd.services."NetworkManager-wait-online".enable = false;
 
-  systemd.services = {
-    create-swapfile = {
-      serviceConfig.Type = "oneshot";
-      wantedBy = ["swap-swapfile.swap"];
-      script = ''
-        swapfile="/swap/swapfile"
-        if [[ -f "$swapfile" ]]; then
-          echo "Swap file $swapfile already exists, taking no action"
-        else
-          echo "Setting up swap file $swapfile"
-          ${pkgs.coreutils}/bin/truncate -s 0 "$swapfile"
-          ${pkgs.e2fsprogs}/bin/chattr +C "$swapfile"
-        fi
-      '';
-    };
-  };
+  swapDevices = [{device = "/swap/swapfile";}];
 
-  # release channel
-  system.stateVersion = "22.05"; # Did you read the comment?
+  system.stateVersion = "24.05"; # Did you read the comment?
 }

hosts/monosodium-glutamate-g/hardware-configuration.nix

@@ -12,34 +12,32 @@
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"];
+  boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "uas" "usbhid" "sd_mod"];
   boot.initrd.kernelModules = [];
   boot.kernelModules = ["kvm-amd"];
   boot.extraModulePackages = [];
 
   fileSystems."/" = {
-    device = "/dev/disk/by-uuid/72ffbc9d-a319-42d7-8d26-13c921a679db";
+    device = "/dev/disk/by-uuid/efb8f256-5b14-4b52-a2d9-ae4b91ecb711";
     fsType = "btrfs";
-    options = ["subvol=@root" "compress=zstd:3"];
+    options = ["subvol=@"];
   };
 
-  fileSystems."/home" = {
-    device = "/dev/disk/by-uuid/72ffbc9d-a319-42d7-8d26-13c921a679db";
-    fsType = "btrfs";
-    options = ["subvol=@home" "compress=zstd:3"];
-  };
+  boot.initrd.luks.devices."luks-919f9b8b-2804-447a-97e0-f7f515d0be56".device = "/dev/disk/by-uuid/919f9b8b-2804-447a-97e0-f7f515d0be56";
 
   fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/D63E-18C9";
+    device = "/dev/disk/by-uuid/3FAD-A6B4";
     fsType = "vfat";
+    options = ["fmask=0077" "dmask=0077"];
   };
 
-  swapDevices = [
-    {
-      device = "/swap/swapfile";
-      size = (1024 * 64) + (1024 * 8); # 72G
-    }
-  ];
+  fileSystems."/swap" = {
+    device = "/dev/disk/by-uuid/efb8f256-5b14-4b52-a2d9-ae4b91ecb711";
+    fsType = "btrfs";
+    options = ["subvol=swap"];
+  };
+
+  swapDevices = [];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
@@ -47,7 +45,9 @@
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
   # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp9s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wg0-mullvad.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp6s0.useDHCP = lib.mkDefault true;
 
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

hosts/monosodium-glutamate-g/modules/default.nix

@@ -1,4 +1,4 @@
-{}: {
+{...}: {
   imports = [
     ./graphics.nix
   ];

modules/desktop/default.nix

@@ -28,6 +28,7 @@ in
       ./fonts.nix
       ./firefox.nix
       ./x.nix
+      ./obs.nix
     ];
 
     programs.seahorse.enable = true;

modules/desktop/obs.nix

@@ -0,0 +1,23 @@
+{
+  pkgs,
+  config,
+  ...
+}: {
+  environment.systemPackages = [
+    (pkgs.wrapOBS {
+      plugins = with pkgs.obs-studio-plugins; [
+        wlrobs
+        obs-backgroundremoval
+        obs-pipewire-audio-capture
+      ];
+    })
+  ];
+
+  boot.extraModulePackages = with config.boot.kernelPackages; [
+    v4l2loopback
+  ];
+  boot.extraModprobeConfig = ''
+    options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1
+  '';
+  security.polkit.enable = true;
+}