common/disko/single_uefi_btrfs.nix

@@ -1,4 +1,6 @@
 {
+  pkgs,
+  lib,
   config,
   ...
 }:

cranberry/default.nix

@@ -1,4 +1,6 @@
 {
+  pkgs,
+  lib,
   config,
   ...
 }:

cranberry/features.nix

@@ -5,6 +5,8 @@
       desktop.xorg = true;
       dev = {
         "3d" = true;
+        c = true;
+        vm = true;
       };
       extra = true;
     };

cranberry/hardware.nix

@@ -1,5 +1,7 @@
 {
   pkgs,
+  lib,
+  config,
   nixos-hardware,
   ...
 }:

curacao/dedup/default.nix

@@ -1,4 +1,7 @@
 {
+  pkgs,
+  lib,
+  config,
   ...
 }:
 {

curacao/default.nix

@@ -1,4 +1,7 @@
 {
+  pkgs,
+  lib,
+  config,
   ...
 }:
 {

curacao/disko.nix

@@ -1,4 +1,6 @@
 {
+  pkgs,
+  lib,
   config,
   ...
 }:

curacao/homeautomation/default.nix

@@ -1,4 +1,7 @@
 {
+  pkgs,
+  lib,
+  config,
   ...
 }:
 {

curacao/usb.nix

@@ -1,4 +1,6 @@
 {
+  pkgs,
+  lib,
   config,
   ...
 }:

curacao/webcam/default.nix

@@ -1,5 +1,7 @@
 {
   pkgs,
+  lib,
+  config,
   ...
 }:
 {

flake.nix

@@ -132,7 +132,6 @@
                   # We don't do an overlay for the whole system because lix is not binary compatible.
                   overlays = [
                     (self: super: { nix = super.lix; })
-                    (import ./common/update-local-flakes/overlay.nix)
                   ];
                 }
               );

hm/accounts/default.nix

@@ -1,4 +1,5 @@
 {
+  pkgs,
   config,
   lib,
   ...

hm/desktop/background/default.nix

@@ -1,6 +1,7 @@
 {
   pkgs,
   config,
+  lib,
   ...
 }:
 {

hm/desktop/lock/default.nix

@@ -24,7 +24,7 @@ let
 in
 {
   config = lib.mkIf config.frogeye.desktop.xorg {
-    home.packages = [
+    home.packages = with pkgs; [
       (pkgs.writeShellApplication {
         name = "xlock";
         text = ''

hm/desktop/presentation/default.nix

@@ -3,6 +3,7 @@
 # Config mentions pdfpc, although the last thing I used was Impressive, even made patches to it.
 # UPST Add Impressive to nixpkgs
 {
+  pkgs,
   lib,
   config,
   ...

hm/dev/3d.nix

@@ -14,22 +14,9 @@
       ];
     };
     programs.nixvim.plugins = {
-      # openscad.enable = true; # Doesn't do anything besides annoying popups
+      # TODO Neither seem to do anything...
+      # openscad.enable = true;
       lsp.servers.openscad_lsp.enable = true;
     };
-    xdg.dataFile = {
-      "OpenSCAD/libraries/BOSL2".source = pkgs.fetchFromGitHub {
-        owner = "BelfrySCAD";
-        repo = "BOSL2";
-        rev = "ff7e8b8611022b1ce58ea2a1e076028d3d7d40ff"; # no tags, no release
-        hash = "sha256-esKgXyKLudDfWT2pxOjltZsQ9N6Whlf4zhxd071COzQ=";
-      };
-      "OpenSCAD/libraries/MCAD".source = pkgs.fetchFromGitHub {
-        owner = "openscad";
-        repo = "MCAD";
-        rev = "bd0a7ba3f042bfbced5ca1894b236cea08904e26"; # no tags, no release
-        hash = "sha256-rnrapCe5BkdibbCYVyGZi0l1/8DZxoDnulK37fwZbqo=";
-      };
-    };
   };
 }

hm/dev/common.nix

@@ -37,12 +37,33 @@
         # Network
         wireshark-qt
 
+        # Ansible
+      ]
+      ++ lib.optionals config.frogeye.dev.ansible [
+        ansible
+        ansible-lint
+
         # Docker
       ]
       ++ lib.optionals config.frogeye.dev.docker [
         docker
         docker-compose
 
+        # FPGA
+      ]
+      ++ lib.optionals config.frogeye.dev.fpga [
+        verilog
+
+      ]
+      ++ lib.optionals (config.frogeye.dev.fpga && pkgs.stdenv.isx86_64) [
+        ghdl
+
+        # FPGA (graphical)
+      ]
+      ++ lib.optionals (config.frogeye.desktop.xorg && config.frogeye.dev.fpga) [
+        yosys
+        gtkwave
+
         # VM (graphical)
       ]
       ++ lib.optionals (config.frogeye.desktop.xorg && config.frogeye.dev.vm) [

hm/dev/default.nix

@@ -1,6 +1,4 @@
-{
-  ...
-}:
+{ pkgs, config, ... }:
 {
   imports = [
     ./3d.nix

hm/dev/node.nix

@@ -1,5 +1,6 @@
 # Untested post-nix
 {
+  pkgs,
   lib,
   config,
   ...

hm/extra/default.nix

@@ -40,24 +40,38 @@
 
           # documents
           visidata
+          # texlive.combined.scheme-full
+          # TODO Convert existing LaTeX documents into using Nix build system
+          # texlive is big and not that much used, sooo
           pdftk
           pdfgrep
 
           # Misc
           haskellPackages.dice
+          rustdesk-flutter
 
         ]
         ++ lib.optionals config.frogeye.desktop.xorg [
 
           # multimedia editors
+          darktable
           puddletag
+          audacity
           xournalpp
+          krita
 
           # downloading
           transmission_4-qt
+          # wine only makes sense on x86_64
+        ]
+        ++ lib.optionals pkgs.stdenv.isx86_64 [
+          wine
+          # TODO wine-gecko wine-mono lib32-libpulse (?)
 
-          # Misc
-          rustdesk-flutter
+        ]
+        ++ lib.optionals (!stdenv.isAarch64) [
+          # Musescore is broken on aarch64
+          musescore
         ]
       );
   };

hm/git/default.nix

@@ -105,7 +105,7 @@ in
             diff-editor = "meld-3";
             merge-editor = "meld";
           };
-          signing = lib.mkIf (!builtins.isNull cfg.signing) {
+          signing = {
             sign-all = true;
             backend = "gpg";
             inherit (cfg.signing) key;

hm/monitoring/default.nix

@@ -1,5 +1,6 @@
 {
   pkgs,
+  lib,
   config,
   ...
 }:

hm/nix/default.nix

@@ -1,6 +1,7 @@
 {
   pkgs,
   lib,
+  config,
   ...
 }:
 {

hm/shell/atuin.nix

@@ -1,4 +1,7 @@
 {
+  pkgs,
+  lib,
+  config,
   ...
 }:
 {

hm/shell/default.nix

@@ -1,5 +1,6 @@
 {
   pkgs,
+  lib,
   config,
   ...
 }:

hm/ssh.nix

@@ -1,5 +1,7 @@
 {
   pkgs,
+  lib,
+  config,
   ...
 }:
 {

hm/theme/default.nix

@@ -1,6 +1,7 @@
 {
   pkgs,
   config,
+  lib,
   stylix,
   ...
 }:

hm/vim/code.nix

@@ -1,5 +1,7 @@
 {
   pkgs,
+  lib,
+  config,
   ...
 }:
 let
@@ -30,7 +32,7 @@ in
 {
   config = {
     programs.nixvim = {
-      extraPlugins = [
+      extraPlugins = with pkgs.vimPlugins; [
         # f/F mode
         vim-shot-f # Highlight relevant characters for f/F/t/T modes
         quick-scope # Highlight relevant characters for f/F modes one per word but always

hm/vim/completion.nix

@@ -1,5 +1,7 @@
 {
   pkgs,
+  lib,
+  config,
   ...
 }:
 {

hm/vim/git.nix

@@ -1,4 +1,7 @@
 {
+  pkgs,
+  lib,
+  config,
   ...
 }:
 {

hm/vim/lsp.nix

@@ -1,5 +1,7 @@
 {
   pkgs,
+  lib,
+  config,
   ...
 }:
 {

options.nix

@@ -68,6 +68,7 @@ in
       ansible = lib.mkEnableOption "Ansible dev stuff";
       c = lib.mkEnableOption "C/C++ dev stuff";
       docker = lib.mkEnableOption "Docker dev stuff";
+      fpga = lib.mkEnableOption "FPGA dev stuff";
       go = lib.mkEnableOption "Go dev stuff";
       node = lib.mkEnableOption "NodeJS dev stuff";
       perl = lib.mkEnableOption "Perl dev stuff";

os/boot/default.nix

@@ -1,4 +1,6 @@
 {
+  pkgs,
+  lib,
   config,
   ...
 }:

os/common.nix

@@ -1,5 +1,6 @@
 {
   pkgs,
+  lib,
   config,
   ...
 }:

os/cuda/default.nix

@@ -1,5 +1,6 @@
 # Need nvidia proprietary drivers to work
 {
+  pkgs,
   nixpkgs,
   config,
   lib,

os/desktop/autorandr.nix

@@ -4,26 +4,25 @@
   config,
   ...
 }:
+let
+  setupScript = "${
+    pkgs.writeShellApplication {
+      name = "greeter-setup-script";
+      runtimeInputs = [ pkgs.autorandr ];
+      text = ''
+        autorandr --change
+      '';
+    }
+  }/bin/greeter-setup-script";
+in
 {
-  config = lib.mkIf (builtins.length config.frogeye.desktop.x11_screens > 1) {
+  config = {
     services = {
       autorandr.enable = true;
-      xserver.displayManager.lightdm.extraConfig =
-        let
-          setupScript = "${
-            pkgs.writeShellApplication {
-              name = "greeter-setup-script";
-              runtimeInputs = [ pkgs.autorandr ];
-              text = ''
-                autorandr --change
-              '';
-            }
-          }/bin/greeter-setup-script";
-        in
-        ''
-          [Seat:*]
-          display-setup-script = ${setupScript}
-        '';
+      xserver.displayManager.lightdm.extraConfig = ''
+        [Seat:*]
+        display-setup-script = ${setupScript}
+      '';
     };
   };
 }

os/style/default.nix

@@ -1,5 +1,6 @@
 {
   pkgs,
+  lib,
   config,
   stylix,
   ...

os/wireless/default.nix

@@ -1,6 +1,7 @@
 {
   pkgs,
   lib,
+  config,
   ...
 }:
 let

pindakaas/default.nix

@@ -1,4 +1,6 @@
 {
+  pkgs,
+  lib,
   config,
   ...
 }:

pindakaas/features.nix

@@ -1,4 +1,7 @@
 {
+  pkgs,
+  lib,
+  config,
   ...
 }:
 {

pindakaas/hardware.nix

@@ -1,6 +1,7 @@
 {
   pkgs,
   lib,
+  config,
   nixos-hardware,
   ...
 }:

pindakaas/sd.nix

@@ -1,4 +1,6 @@
 {
+  pkgs,
+  lib,
   config,
   ...
 }: