From 94c61311f252d115f260172508cfd6efa8177ca5 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 4 Oct 2024 13:22:45 -0400 Subject: [PATCH] cleanup --- etcnixos/flake.lock | 36 +++++++++++++------------- etcnixos/hardware_laptop.nix | 6 ++--- etcnixos/system-mreow.nix | 2 +- home-manager/flake.lock | 24 ++++++++--------- home-manager/progs/gpt4all/gpt4all.nix | 16 ------------ 5 files changed, 33 insertions(+), 51 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 06ab548..626d04e 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1727734424, - "narHash": "sha256-COHPdJb8goIemave9L8kBKkQKEPHuilXZqR3nIBcQsM=", + "lastModified": 1728001451, + "narHash": "sha256-Ost5YHSZZE4ZIKBcWsXC1c7g7n3kIqaNNjs5ula/lAI=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "fed2d39a7c4614311e25a4281d056a7a2d36a6c8", + "rev": "25f420d9cf70929455ba14642b92ae715ae8d792", "type": "github" }, "original": { @@ -116,11 +116,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1727591515, - "narHash": "sha256-ar9oGR8kT3S5K3b0EJrcZp1LjfYQdzWl/bBLCp2o50Y=", + "lastModified": 1727937235, + "narHash": "sha256-Ih4RD65WZZDgtla9Uh8zm6gQJ1zgkXkiU4HKtEwQjvI=", "owner": "nix-community", "repo": "fenix", - "rev": "c31647aab5e8a16087da6283ef9b2e6a9aae6772", + "rev": "381781f96b880c2ced9019a9e2406b31ccea82b4", "type": "github" }, "original": { @@ -231,11 +231,11 @@ ] }, "locked": { - "lastModified": 1727383923, - "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", + "lastModified": 1727817100, + "narHash": "sha256-dlyV9/eiWkm/Y/t2+k4CFZ29tBvCANmJogEYaHeAOTw=", "owner": "nix-community", "repo": "home-manager", - "rev": "ffe2d07e771580a005e675108212597e5b367d2d", + "rev": "437ec62009fa8ceb684eb447d455ffba25911cf9", "type": "github" }, "original": { @@ -253,11 +253,11 @@ ] }, "locked": { - "lastModified": 1727453186, - "narHash": "sha256-nZRCfVEZ9osWXsCD0xCpU66M8JkabMTukBzPRrD/CTA=", + "lastModified": 1727865565, + "narHash": "sha256-SBcqfosxb0XlKdIz6QGXCnK4W/TEVHLDZHkRHZ8Me60=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "3390ff2632d0d8a14c92473db60fa52bf881f979", + "rev": "703c0ac8432f3758987e0788248ddc1a8e0bf412", "type": "github" }, "original": { @@ -316,11 +316,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1727665282, - "narHash": "sha256-oKtfbQB1MBypqIyzkC8QCQcVGOa1soaXaGgcBIoh14o=", + "lastModified": 1728056216, + "narHash": "sha256-IrO06gFUDTrTlIP3Sz+mRB6WUoO2YsgMtOD3zi0VEt0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "11c43c830e533dad1be527ecce379fcf994fbbb5", + "rev": "b7ca02c7565fbf6d27ff20dd6dbd49c5b82eef28", "type": "github" }, "original": { @@ -402,11 +402,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1727465975, - "narHash": "sha256-jrr8r2CT9jsi6XDTTX+E39/CakTcQ9RYRp6rWGzLkk0=", + "lastModified": 1727778987, + "narHash": "sha256-OTI1eKQ3WIkj6q8PROpPY1vhaxYRdiS1btSfBowQPps=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "546339a7be357b3e95fc4b79a8816dce540d477b", + "rev": "e1a76671af2fbc74c84c18ba18fcda5e653d7531", "type": "github" }, "original": { diff --git a/etcnixos/hardware_laptop.nix b/etcnixos/hardware_laptop.nix index 17a48a2..a83a530 100644 --- a/etcnixos/hardware_laptop.nix +++ b/etcnixos/hardware_laptop.nix @@ -6,10 +6,6 @@ ... }: { - imports = [ - #if this is removed, then niri doesn't start, TODO! look into wtf this does - (modulesPath + "/installer/scan/not-detected.nix") - ]; boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" @@ -49,5 +45,7 @@ # networking.interfaces.wlp166s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + + hardware.enableRedistributableFirmware = true; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index 5ba9d3e..c0cf093 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -51,7 +51,7 @@ settings = { default_session = { command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd niri-session"; - user = "${username}"; + user = username; }; }; }; diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 7ab71b4..bec1a73 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -111,11 +111,11 @@ ] }, "locked": { - "lastModified": 1727817100, - "narHash": "sha256-dlyV9/eiWkm/Y/t2+k4CFZ29tBvCANmJogEYaHeAOTw=", + "lastModified": 1728041527, + "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=", "owner": "nix-community", "repo": "home-manager", - "rev": "437ec62009fa8ceb684eb447d455ffba25911cf9", + "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e", "type": "github" }, "original": { @@ -137,11 +137,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1727886705, - "narHash": "sha256-MFZm6b3CcRiLjQ6MxtKu2rDu+KUBkr/R0kOSXoS2eG4=", + "lastModified": 1727997983, + "narHash": "sha256-t085RwS6OzkTco7VBU8MJRPcV9cSFeVkeI8ecfrSFZg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "6384dde52d929f500ec75172ebfc26e8d009dbd3", + "rev": "5309bc679bdba91798076ed3676bff3d12db0d97", "type": "github" }, "original": { @@ -213,11 +213,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1727672256, - "narHash": "sha256-9/79hjQc9+xyH+QxeMcRsA6hDyw6Z9Eo1/oxjvwirLk=", + "lastModified": 1727907660, + "narHash": "sha256-QftbyPoieM5M50WKUMzQmWtBWib/ZJbHo7mhj5riQec=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1719f27dd95fd4206afb9cec9f415b539978827e", + "rev": "5966581aa04be7eff830b9e1457d56dc70a0b798", "type": "github" }, "original": { @@ -245,11 +245,11 @@ ] }, "locked": { - "lastModified": 1727922550, - "narHash": "sha256-pJoN5Qd83coaoEJmpkxw+cuh89IJORvLm8qyw3GMLIQ=", + "lastModified": 1728008962, + "narHash": "sha256-MjGMCVKqafsrqLQYJHHKXJkvocTjkxKjadBfN952/Zw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "5e3eee4bc42a2504653bedfe95bceda9a1e85ae7", + "rev": "862d0c1e5fe2348a22044f225afef39b75df8cf0", "type": "github" }, "original": { diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index b0e2623..ab1f81d 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -73,22 +73,6 @@ let sha256 = "vzAfWLyljR0Cg6pCeeyQJZNeOJh5xOILlbJnwDWu62o="; }; - cmakeFlags = old.cmakeFlags ++ [ - "-DGGML_VULKAN=ON" - "-DGGML_KOMPUTE=ON" - "-DGGML_BLAS=ON" - "-DGGML_VENDOR=Intel" - ]; - - nativeBuildInputs = old.nativeBuildInputs ++ [ - pkgs.pkg-config - ]; - - buildInputs = old.buildInputs ++ [ - pkgs.mkl - pkgs.blas - ]; - patches = old.patches ++ [ ./gpt4all-HEAD-disable-settings-err.patch ];