Compare commits

...

4 commits

Author SHA1 Message Date
Geoffrey Frogeye e9e6265c41
Remove unused stuff
Evaluation on cranberry is sure does not leave much memory.
2025-02-25 17:06:14 +01:00
Geoffrey Frogeye dc52303eb7
Allow evaluating here 2025-02-25 16:13:10 +01:00
Geoffrey Frogeye 3dc42a7756
Fix update-local-flakes app 2025-02-25 15:44:14 +01:00
Geoffrey Frogeye 0478f00a58
OpenSCAD libraries 2025-02-25 14:56:57 +01:00
42 changed files with 41 additions and 119 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -132,6 +132,7 @@
# 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)
];
}
);

View file

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

View file

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

View file

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

View file

@ -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,
...

View file

@ -14,9 +14,22 @@
];
};
programs.nixvim.plugins = {
# TODO Neither seem to do anything...
# openscad.enable = true;
# openscad.enable = true; # Doesn't do anything besides annoying popups
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=";
};
};
};
}

View file

@ -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) [

View file

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

View file

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

View file

@ -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
]
);
};

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -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

View file

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

View file

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

View file

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

View file

@ -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";

View file

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

View file

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

View file

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

View file

@ -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}
'';
};
};
}

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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