diff --git a/common/disko/single_uefi_btrfs.nix b/common/disko/single_uefi_btrfs.nix
index 1d434ac..b9a8952 100644
--- a/common/disko/single_uefi_btrfs.nix
+++ b/common/disko/single_uefi_btrfs.nix
@@ -1,6 +1,4 @@
{
- pkgs,
- lib,
config,
...
}:
diff --git a/cranberry/default.nix b/cranberry/default.nix
index 2715bd0..574d432 100644
--- a/cranberry/default.nix
+++ b/cranberry/default.nix
@@ -1,6 +1,4 @@
{
- pkgs,
- lib,
config,
...
}:
diff --git a/cranberry/features.nix b/cranberry/features.nix
index 6b73529..757ab05 100644
--- a/cranberry/features.nix
+++ b/cranberry/features.nix
@@ -5,8 +5,6 @@
desktop.xorg = true;
dev = {
"3d" = true;
- c = true;
- vm = true;
};
extra = true;
};
diff --git a/cranberry/hardware.nix b/cranberry/hardware.nix
index d311a36..44accc1 100644
--- a/cranberry/hardware.nix
+++ b/cranberry/hardware.nix
@@ -1,7 +1,5 @@
{
pkgs,
- lib,
- config,
nixos-hardware,
...
}:
diff --git a/curacao/dedup/default.nix b/curacao/dedup/default.nix
index ab46702..d40dea3 100644
--- a/curacao/dedup/default.nix
+++ b/curacao/dedup/default.nix
@@ -1,7 +1,4 @@
{
- pkgs,
- lib,
- config,
...
}:
{
diff --git a/curacao/default.nix b/curacao/default.nix
index d309b2c..1e3655e 100644
--- a/curacao/default.nix
+++ b/curacao/default.nix
@@ -1,7 +1,4 @@
{
- pkgs,
- lib,
- config,
...
}:
{
diff --git a/curacao/disko.nix b/curacao/disko.nix
index 4cbadd5..b8c9e26 100644
--- a/curacao/disko.nix
+++ b/curacao/disko.nix
@@ -1,6 +1,4 @@
{
- pkgs,
- lib,
config,
...
}:
diff --git a/curacao/homeautomation/default.nix b/curacao/homeautomation/default.nix
index 9929c23..9ad5773 100644
--- a/curacao/homeautomation/default.nix
+++ b/curacao/homeautomation/default.nix
@@ -1,7 +1,4 @@
{
- pkgs,
- lib,
- config,
...
}:
{
diff --git a/curacao/usb.nix b/curacao/usb.nix
index 76252af..a0907f9 100644
--- a/curacao/usb.nix
+++ b/curacao/usb.nix
@@ -1,6 +1,4 @@
{
- pkgs,
- lib,
config,
...
}:
diff --git a/curacao/webcam/default.nix b/curacao/webcam/default.nix
index 8a28499..7940cf5 100644
--- a/curacao/webcam/default.nix
+++ b/curacao/webcam/default.nix
@@ -1,7 +1,5 @@
{
pkgs,
- lib,
- config,
...
}:
{
diff --git a/hm/accounts/default.nix b/hm/accounts/default.nix
index 937d10d..2743141 100644
--- a/hm/accounts/default.nix
+++ b/hm/accounts/default.nix
@@ -1,5 +1,4 @@
{
- pkgs,
config,
lib,
...
diff --git a/hm/desktop/background/default.nix b/hm/desktop/background/default.nix
index f3c8993..e18e6d7 100644
--- a/hm/desktop/background/default.nix
+++ b/hm/desktop/background/default.nix
@@ -1,7 +1,6 @@
{
pkgs,
config,
- lib,
...
}:
{
diff --git a/hm/desktop/lock/default.nix b/hm/desktop/lock/default.nix
index 09e81b5..08807fb 100644
--- a/hm/desktop/lock/default.nix
+++ b/hm/desktop/lock/default.nix
@@ -24,7 +24,7 @@ let
in
{
config = lib.mkIf config.frogeye.desktop.xorg {
- home.packages = with pkgs; [
+ home.packages = [
(pkgs.writeShellApplication {
name = "xlock";
text = ''
diff --git a/hm/desktop/presentation/default.nix b/hm/desktop/presentation/default.nix
index 8600fe3..bcde39e 100644
--- a/hm/desktop/presentation/default.nix
+++ b/hm/desktop/presentation/default.nix
@@ -3,7 +3,6 @@
# Config mentions pdfpc, although the last thing I used was Impressive, even made patches to it.
# UPST Add Impressive to nixpkgs
{
- pkgs,
lib,
config,
...
diff --git a/hm/dev/common.nix b/hm/dev/common.nix
index 1cee8eb..9a07df6 100644
--- a/hm/dev/common.nix
+++ b/hm/dev/common.nix
@@ -37,33 +37,12 @@
# 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) [
diff --git a/hm/dev/default.nix b/hm/dev/default.nix
index 428fccf..2e92117 100644
--- a/hm/dev/default.nix
+++ b/hm/dev/default.nix
@@ -1,4 +1,6 @@
-{ pkgs, config, ... }:
+{
+ ...
+}:
{
imports = [
./3d.nix
diff --git a/hm/dev/node.nix b/hm/dev/node.nix
index f92417f..11a780a 100644
--- a/hm/dev/node.nix
+++ b/hm/dev/node.nix
@@ -1,6 +1,5 @@
# Untested post-nix
{
- pkgs,
lib,
config,
...
diff --git a/hm/extra/default.nix b/hm/extra/default.nix
index f791c81..b3df622 100644
--- a/hm/extra/default.nix
+++ b/hm/extra/default.nix
@@ -40,38 +40,24 @@
# 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 (?)
- ]
- ++ lib.optionals (!stdenv.isAarch64) [
- # Musescore is broken on aarch64
- musescore
+ # Misc
+ rustdesk-flutter
]
);
};
diff --git a/hm/monitoring/default.nix b/hm/monitoring/default.nix
index 96325e7..7c9fae0 100644
--- a/hm/monitoring/default.nix
+++ b/hm/monitoring/default.nix
@@ -1,6 +1,5 @@
{
pkgs,
- lib,
config,
...
}:
diff --git a/hm/nix/default.nix b/hm/nix/default.nix
index 178dad1..554eb29 100644
--- a/hm/nix/default.nix
+++ b/hm/nix/default.nix
@@ -1,7 +1,6 @@
{
pkgs,
lib,
- config,
...
}:
{
diff --git a/hm/shell/atuin.nix b/hm/shell/atuin.nix
index 134b1f3..22de481 100644
--- a/hm/shell/atuin.nix
+++ b/hm/shell/atuin.nix
@@ -1,7 +1,4 @@
{
- pkgs,
- lib,
- config,
...
}:
{
diff --git a/hm/shell/default.nix b/hm/shell/default.nix
index c25f32a..89c5667 100644
--- a/hm/shell/default.nix
+++ b/hm/shell/default.nix
@@ -1,6 +1,5 @@
{
pkgs,
- lib,
config,
...
}:
diff --git a/hm/ssh.nix b/hm/ssh.nix
index 6e96f55..03459e0 100644
--- a/hm/ssh.nix
+++ b/hm/ssh.nix
@@ -1,7 +1,5 @@
{
pkgs,
- lib,
- config,
...
}:
{
diff --git a/hm/theme/default.nix b/hm/theme/default.nix
index 2d510e4..9000a23 100644
--- a/hm/theme/default.nix
+++ b/hm/theme/default.nix
@@ -1,7 +1,6 @@
{
pkgs,
config,
- lib,
stylix,
...
}:
diff --git a/hm/vim/code.nix b/hm/vim/code.nix
index 3542ee2..e132a93 100644
--- a/hm/vim/code.nix
+++ b/hm/vim/code.nix
@@ -1,7 +1,5 @@
{
pkgs,
- lib,
- config,
...
}:
let
@@ -32,7 +30,7 @@ in
{
config = {
programs.nixvim = {
- extraPlugins = with pkgs.vimPlugins; [
+ extraPlugins = [
# 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
diff --git a/hm/vim/completion.nix b/hm/vim/completion.nix
index 64fa519..1f1b118 100644
--- a/hm/vim/completion.nix
+++ b/hm/vim/completion.nix
@@ -1,7 +1,5 @@
{
pkgs,
- lib,
- config,
...
}:
{
diff --git a/hm/vim/git.nix b/hm/vim/git.nix
index 352afd8..483ca38 100644
--- a/hm/vim/git.nix
+++ b/hm/vim/git.nix
@@ -1,7 +1,4 @@
{
- pkgs,
- lib,
- config,
...
}:
{
diff --git a/hm/vim/lsp.nix b/hm/vim/lsp.nix
index 9cbeef9..0943af4 100644
--- a/hm/vim/lsp.nix
+++ b/hm/vim/lsp.nix
@@ -1,7 +1,5 @@
{
pkgs,
- lib,
- config,
...
}:
{
diff --git a/options.nix b/options.nix
index c41f68e..706f5f6 100644
--- a/options.nix
+++ b/options.nix
@@ -68,7 +68,6 @@ 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";
diff --git a/os/boot/default.nix b/os/boot/default.nix
index 74a0b46..626cbf2 100644
--- a/os/boot/default.nix
+++ b/os/boot/default.nix
@@ -1,6 +1,4 @@
{
- pkgs,
- lib,
config,
...
}:
diff --git a/os/common.nix b/os/common.nix
index 0dc89c5..a0c8884 100644
--- a/os/common.nix
+++ b/os/common.nix
@@ -1,6 +1,5 @@
{
pkgs,
- lib,
config,
...
}:
diff --git a/os/cuda/default.nix b/os/cuda/default.nix
index f4b40f7..774bca4 100644
--- a/os/cuda/default.nix
+++ b/os/cuda/default.nix
@@ -1,6 +1,5 @@
# Need nvidia proprietary drivers to work
{
- pkgs,
nixpkgs,
config,
lib,
diff --git a/os/desktop/autorandr.nix b/os/desktop/autorandr.nix
index a26041c..78a2664 100644
--- a/os/desktop/autorandr.nix
+++ b/os/desktop/autorandr.nix
@@ -4,25 +4,26 @@
config,
...
}:
-let
- setupScript = "${
- pkgs.writeShellApplication {
- name = "greeter-setup-script";
- runtimeInputs = [ pkgs.autorandr ];
- text = ''
- autorandr --change
- '';
- }
- }/bin/greeter-setup-script";
-in
{
- config = {
+ config = lib.mkIf (builtins.length config.frogeye.desktop.x11_screens > 1) {
services = {
autorandr.enable = true;
- xserver.displayManager.lightdm.extraConfig = ''
- [Seat:*]
- display-setup-script = ${setupScript}
- '';
+ 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}
+ '';
};
};
}
diff --git a/os/style/default.nix b/os/style/default.nix
index fa8678b..2a92f79 100644
--- a/os/style/default.nix
+++ b/os/style/default.nix
@@ -1,6 +1,5 @@
{
pkgs,
- lib,
config,
stylix,
...
diff --git a/os/wireless/default.nix b/os/wireless/default.nix
index 31afc58..342d134 100644
--- a/os/wireless/default.nix
+++ b/os/wireless/default.nix
@@ -1,7 +1,6 @@
{
pkgs,
lib,
- config,
...
}:
let
diff --git a/pindakaas/default.nix b/pindakaas/default.nix
index 4fd4313..80dca28 100644
--- a/pindakaas/default.nix
+++ b/pindakaas/default.nix
@@ -1,6 +1,4 @@
{
- pkgs,
- lib,
config,
...
}:
diff --git a/pindakaas/features.nix b/pindakaas/features.nix
index 7146dc8..4bddb30 100644
--- a/pindakaas/features.nix
+++ b/pindakaas/features.nix
@@ -1,7 +1,4 @@
{
- pkgs,
- lib,
- config,
...
}:
{
diff --git a/pindakaas/hardware.nix b/pindakaas/hardware.nix
index 19d6551..94c0d23 100644
--- a/pindakaas/hardware.nix
+++ b/pindakaas/hardware.nix
@@ -1,7 +1,6 @@
{
pkgs,
lib,
- config,
nixos-hardware,
...
}:
diff --git a/pindakaas/sd.nix b/pindakaas/sd.nix
index d574229..89dce94 100644
--- a/pindakaas/sd.nix
+++ b/pindakaas/sd.nix
@@ -1,6 +1,4 @@
{
- pkgs,
- lib,
config,
...
}: