From fb2ccf201f7fd34a9857ac5ca4ab826aa5af1f3b Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Fri, 8 Dec 2023 16:39:57 +0100 Subject: [PATCH] Add nix-ld-rs --- flake.lock | 74 +++++++++++++++++++++++++++++++- flake.nix | 5 +++ machines/mimir/configuration.nix | 74 ++++++++++++++++++++++++++++---- 3 files changed, 143 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 6f24a7d..69d8c8b 100644 --- a/flake.lock +++ b/flake.lock @@ -175,6 +175,22 @@ } }, "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1673956053, @@ -247,6 +263,24 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -388,6 +422,28 @@ "type": "github" } }, + "nix-ld-rs": { + "inputs": { + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1699781621, + "narHash": "sha256-l8OMloSbDyjIb9yVeD10M7aK7qDCVMt3huBztihrbwM=", + "owner": "nix-community", + "repo": "nix-ld-rs", + "rev": "5806f307048a9ae9e3e88cc48006d4d0b2df4410", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-ld-rs", + "type": "github" + } + }, "nixinate": { "inputs": { "nixpkgs": [ @@ -535,7 +591,7 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "flake-utils": [ "flake-utils" ], @@ -573,6 +629,7 @@ "microvm": "microvm", "naersk": "naersk", "nil": "nil", + "nix-ld-rs": "nix-ld-rs", "nixinate": "nixinate", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", @@ -690,6 +747,21 @@ "repo": "default", "type": "github" } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index ecf4a65..e62141c 100644 --- a/flake.nix +++ b/flake.nix @@ -91,6 +91,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + nix-ld-rs = { + url = "github:nix-community/nix-ld-rs"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + caddy-with-plugins = { url = "github:eboskma/caddy-with-plugins"; inputs = { diff --git a/machines/mimir/configuration.nix b/machines/mimir/configuration.nix index 299e15a..c5f7dec 100644 --- a/machines/mimir/configuration.nix +++ b/machines/mimir/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ nixos-hardware, microvm, ... }: +{ nixos-hardware, microvm, nix-ld-rs, ... }: { pkgs, config, ... }: { imports = @@ -15,7 +15,7 @@ microvm.nixosModules.host - ./outline.nix + # ./outline.nix ../../users/erwin ../../users/root @@ -68,9 +68,9 @@ }; input = { "1241:662:USB-HID_Keyboard" = { - xkb_layout = "us,us"; - xkb_variant = "colemak,"; - xkb_options = "lv3:ralt_switch,eurosign:5,caps:backspace,ctrl:nocaps,grp:sclk_toggle,grp_led:scroll"; + xkb_layout = "us"; + xkb_variant = ""; + xkb_options = "lv3:ralt_switch,eurosign:5,caps:backspace,ctrl:nocaps"; xkb_numlock = "enabled"; }; "1133:49257:Logitech_USB_Laser_Mouse" = { @@ -80,7 +80,7 @@ }; }; kanata = { - enable = false; + enable = true; devices = [ "/dev/input/by-id/usb-04d9_USB-HID_Keyboard-event-kbd" ]; @@ -284,6 +284,62 @@ # programs.ssh.startAgent = true; programs = { gnome-disks.enable = true; + nix-ld = { + enable = true; + package = nix-ld-rs.packages.${pkgs.hostPlatform.system}.nix-ld-rs; + libraries = with pkgs; [ + alsa-lib + at-spi2-atk + at-spi2-core + atk + cairo + cups + curl + dbus + expat + fontconfig + freetype + fuse3 + gdk-pixbuf + glib + gtk3 + icu + libGL + libappindicator-gtk3 + libdrm + libglvnd + libnotify + libpulseaudio + libunwind + libusb1 + libuuid + libxkbcommon + mesa + nspr + nss + openssl + pango + pipewire + stdenv.cc.cc + systemd + vulkan-loader + xorg.libX11 + xorg.libXScrnSaver + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXtst + xorg.libxcb + xorg.libxkbfile + xorg.libxshmfence + zlib + ]; + }; }; services = { @@ -350,9 +406,9 @@ defaultSopsFile = ./secrets.yaml; secrets = { - outline-keycloak-secret = { - owner = "outline"; - }; + # outline-keycloak-secret = { + # owner = "outline"; + # }; }; };