diff --git a/home/common/programs/default.nix b/home/common/programs/default.nix index 19dd8b0..e4c2704 100644 --- a/home/common/programs/default.nix +++ b/home/common/programs/default.nix @@ -6,6 +6,7 @@ ./rust.nix ./git ./solidity.nix + ./dev.nix ]; programs = { diff --git a/home/common/programs/dev.nix b/home/common/programs/dev.nix new file mode 100644 index 0000000..e6bc3fd --- /dev/null +++ b/home/common/programs/dev.nix @@ -0,0 +1,6 @@ +{ lib, config, ... }: +{ + programs = { + direnv.enable = true; + }; +} diff --git a/home/common/programs/rust.nix b/home/common/programs/rust.nix index 0bb5284..b07629f 100644 --- a/home/common/programs/rust.nix +++ b/home/common/programs/rust.nix @@ -3,6 +3,17 @@ home.packages = with pkgs; [ rustup bacon + openssl + openssl_3 + pkg-config + glib + glib.dev + gtk3 + libsoup + webkitgtk + dbus + librsvg ]; + home.sessionPath = [ "\${CARGO_HOME:-~/.cargo}/bin" ]; } diff --git a/hosts/arrakis/default.nix b/hosts/arrakis/default.nix index 5bd5e16..d512557 100644 --- a/hosts/arrakis/default.nix +++ b/hosts/arrakis/default.nix @@ -51,7 +51,7 @@ in let authorizedKeys = pkgs.fetchurl { url = "https://github.com/naps62.keys"; - sha256 = "sha256-dP8LjaburPwfIr2jhly9rMwOLJyUkQP7Em5IKH/qXbY="; + sha256 = "sha256-Y3/sfaV0ZJDs7g0xllMSUjP+n/CxbBjDBMXX4VVecoE="; }; in pkgs.lib.splitString "\n" (builtins.readFile authorizedKeys); diff --git a/hosts/arrakis/hardware-configuration.nix b/hosts/arrakis/hardware-configuration.nix index cf6b5aa..fbdfd40 100644 --- a/hosts/arrakis/hardware-configuration.nix +++ b/hosts/arrakis/hardware-configuration.nix @@ -1,34 +1,53 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = [ + "xhci_pci" + "thunderbolt" + "vmd" + "nvme" + "usb_storage" + "sd_mod" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/a9390fca-9ec2-4248-b003-a6ce47ad4fab"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/a9390fca-9ec2-4248-b003-a6ce47ad4fab"; + fsType = "ext4"; + }; - boot.initrd.luks.devices."luks-aa168861-6ecf-4fcc-8a0d-6e1555892747".device = "/dev/disk/by-uuid/aa168861-6ecf-4fcc-8a0d-6e1555892747"; + boot.initrd.luks.devices = { + "luks-aa168861-6ecf-4fcc-8a0d-6e1555892747".device = "/dev/disk/by-uuid/aa168861-6ecf-4fcc-8a0d-6e1555892747"; + "luks-92db61c9-eb4c-4cde-bd08-7042ff8db4ad".device = "/dev/disk/by-uuid/92db61c9-eb4c-4cde-bd08-7042ff8db4ad"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/90C1-FFCD"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/a3d4d835-23fe-4e63-9c4e-887bd4f21592"; } + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/90C1-FFCD"; + fsType = "vfat"; + options = [ + "fmask=0077" + "dmask=0077" ]; + }; + + swapDevices = [ + { device = "/dev/mapper/luks-92db61c9-eb4c-4cde-bd08-7042ff8db4ad"; } + ]; # 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