diff --git a/extra/kuwaitboat.jpg b/extra/kuwaitboat.jpg old mode 100755 new mode 100644 diff --git a/flake.lock b/flake.lock index d0c12ae..9b3f8d0 100644 --- a/flake.lock +++ b/flake.lock @@ -1,9 +1,68 @@ { "nodes": { + "edit": { + "inputs": { + "fenix": "fenix", + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1747936972, + "narHash": "sha256-MZUY92ZRyEsM6tfqFqbvqx8InwJ+jh7peYreR4bbsSQ=", + "path": "/home/alice/projects/edit", + "type": "path" + }, + "original": { + "path": "/home/alice/projects/edit", + "type": "path" + } + }, + "fenix": { + "inputs": { + "nixpkgs": [ + "edit", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1747392669, + "narHash": "sha256-zky3+lndxKRu98PAwVK8kXPdg+Q1NVAhaI7YGrboKYA=", + "owner": "nix-community", + "repo": "fenix", + "rev": "c3c27e603b0d9b5aac8a16236586696338856fbb", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, "locked": { "lastModified": 1726560853, "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", @@ -69,7 +128,7 @@ }, "lix-module": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "flakey-profile": "flakey-profile", "lix": "lix", "nixpkgs": [ @@ -121,12 +180,30 @@ }, "root": { "inputs": { + "edit": "edit", "home-manager": "home-manager", "lix-module": "lix-module", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs" } }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1747323949, + "narHash": "sha256-G4NwzhODScKnXqt2mEQtDFOnI0wU3L1WxsiHX3cID/0=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "f8e784353bde7cbf9a9046285c1caf41ac484ebe", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -141,6 +218,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 f612dcc..6b26849 100644 --- a/flake.nix +++ b/flake.nix @@ -15,6 +15,11 @@ nixos-hardware.url = "github:NixOS/nixos-hardware/master"; + edit = { + url = "path:/home/alice/projects/edit"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + }; outputs = { @@ -23,6 +28,7 @@ lix-module, home-manager, nixos-hardware, + edit }: let system = "x86_64-linux"; @@ -42,6 +48,7 @@ name = hostname; value = nixpkgs.lib.nixosSystem { inherit system; + # _module.args = { inherit edit; }; modules = defaultModules ++ modules; }; }; diff --git a/hosts/randolph/hardware-configuration.nix b/hosts/randolph/hardware-configuration.nix index 84c53b6..e319b99 100644 --- a/hosts/randolph/hardware-configuration.nix +++ b/hosts/randolph/hardware-configuration.nix @@ -8,23 +8,25 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "uas" "sd_mod" ]; + boot.initrd.kernelModules = [ "dm-snapshot" "cryptd" ]; + boot.initrd.luks.devices."cryptroot".device = "/dev/nvme0n1p2"; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/737c9ec6-588b-43b7-8966-811049b7e29a"; + { device = "/dev/lvmroot/root"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/E8A8-2706"; + { device = "/dev/disk/by-uuid/39B5-9DA9"; fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; }; swapDevices = - [ { device = "/dev/disk/by-uuid/3a01cccd-286b-47b4-9a4e-5a04d02a7184"; } + [ { device = "/dev/lvmroot/swap"; } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking @@ -35,5 +37,6 @@ # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.enableAllFirmware = true; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/hosts/randolph/home.nix b/hosts/randolph/home.nix index 9875f43..4c6e190 100644 --- a/hosts/randolph/home.nix +++ b/hosts/randolph/home.nix @@ -29,7 +29,7 @@ rec { (with pkgs; let archivo = callPackage ../../pkgs/archivo/archivo.nix { }; - highway-gothic = callPackage ../../pkgs/highway-gothic/highway-gothic.nix { }; + # highway-gothic = callPackage ../../pkgs/highway-gothic/highway-gothic.nix { }; in [ blueman @@ -73,7 +73,7 @@ rec { ibm-plex rubik archivo - highway-gothic + # highway-gothic merriweather-sans paratype-pt-sans paratype-pt-serif diff --git a/pkgs/edit/result b/pkgs/edit/result deleted file mode 120000 index 7cba96b..0000000 --- a/pkgs/edit/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/inr2b18j80dc17bkaz5xm7f20g0i3s0r-edit-1.0.0 \ No newline at end of file