This commit is contained in:
2024-10-04 13:22:45 -04:00
parent a5d96bd1a2
commit 94c61311f2
5 changed files with 33 additions and 51 deletions

36
etcnixos/flake.lock generated
View File

@@ -50,11 +50,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727734424, "lastModified": 1728001451,
"narHash": "sha256-COHPdJb8goIemave9L8kBKkQKEPHuilXZqR3nIBcQsM=", "narHash": "sha256-Ost5YHSZZE4ZIKBcWsXC1c7g7n3kIqaNNjs5ula/lAI=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "fed2d39a7c4614311e25a4281d056a7a2d36a6c8", "rev": "25f420d9cf70929455ba14642b92ae715ae8d792",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -116,11 +116,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1727591515, "lastModified": 1727937235,
"narHash": "sha256-ar9oGR8kT3S5K3b0EJrcZp1LjfYQdzWl/bBLCp2o50Y=", "narHash": "sha256-Ih4RD65WZZDgtla9Uh8zm6gQJ1zgkXkiU4HKtEwQjvI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "c31647aab5e8a16087da6283ef9b2e6a9aae6772", "rev": "381781f96b880c2ced9019a9e2406b31ccea82b4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -231,11 +231,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727383923, "lastModified": 1727817100,
"narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", "narHash": "sha256-dlyV9/eiWkm/Y/t2+k4CFZ29tBvCANmJogEYaHeAOTw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "ffe2d07e771580a005e675108212597e5b367d2d", "rev": "437ec62009fa8ceb684eb447d455ffba25911cf9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -253,11 +253,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727453186, "lastModified": 1727865565,
"narHash": "sha256-nZRCfVEZ9osWXsCD0xCpU66M8JkabMTukBzPRrD/CTA=", "narHash": "sha256-SBcqfosxb0XlKdIz6QGXCnK4W/TEVHLDZHkRHZ8Me60=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "3390ff2632d0d8a14c92473db60fa52bf881f979", "rev": "703c0ac8432f3758987e0788248ddc1a8e0bf412",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -316,11 +316,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1727665282, "lastModified": 1728056216,
"narHash": "sha256-oKtfbQB1MBypqIyzkC8QCQcVGOa1soaXaGgcBIoh14o=", "narHash": "sha256-IrO06gFUDTrTlIP3Sz+mRB6WUoO2YsgMtOD3zi0VEt0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "11c43c830e533dad1be527ecce379fcf994fbbb5", "rev": "b7ca02c7565fbf6d27ff20dd6dbd49c5b82eef28",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -402,11 +402,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1727465975, "lastModified": 1727778987,
"narHash": "sha256-jrr8r2CT9jsi6XDTTX+E39/CakTcQ9RYRp6rWGzLkk0=", "narHash": "sha256-OTI1eKQ3WIkj6q8PROpPY1vhaxYRdiS1btSfBowQPps=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "546339a7be357b3e95fc4b79a8816dce540d477b", "rev": "e1a76671af2fbc74c84c18ba18fcda5e653d7531",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -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 = [ boot.initrd.availableKernelModules = [
"xhci_pci" "xhci_pci"
"thunderbolt" "thunderbolt"
@@ -49,5 +45,7 @@
# networking.interfaces.wlp166s0.useDHCP = lib.mkDefault true; # networking.interfaces.wlp166s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.enableRedistributableFirmware = true;
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
} }

View File

@@ -51,7 +51,7 @@
settings = { settings = {
default_session = { default_session = {
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd niri-session"; command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd niri-session";
user = "${username}"; user = username;
}; };
}; };
}; };

View File

@@ -111,11 +111,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727817100, "lastModified": 1728041527,
"narHash": "sha256-dlyV9/eiWkm/Y/t2+k4CFZ29tBvCANmJogEYaHeAOTw=", "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "437ec62009fa8ceb684eb447d455ffba25911cf9", "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -137,11 +137,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1727886705, "lastModified": 1727997983,
"narHash": "sha256-MFZm6b3CcRiLjQ6MxtKu2rDu+KUBkr/R0kOSXoS2eG4=", "narHash": "sha256-t085RwS6OzkTco7VBU8MJRPcV9cSFeVkeI8ecfrSFZg=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "6384dde52d929f500ec75172ebfc26e8d009dbd3", "rev": "5309bc679bdba91798076ed3676bff3d12db0d97",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -213,11 +213,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1727672256, "lastModified": 1727907660,
"narHash": "sha256-9/79hjQc9+xyH+QxeMcRsA6hDyw6Z9Eo1/oxjvwirLk=", "narHash": "sha256-QftbyPoieM5M50WKUMzQmWtBWib/ZJbHo7mhj5riQec=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1719f27dd95fd4206afb9cec9f415b539978827e", "rev": "5966581aa04be7eff830b9e1457d56dc70a0b798",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -245,11 +245,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727922550, "lastModified": 1728008962,
"narHash": "sha256-pJoN5Qd83coaoEJmpkxw+cuh89IJORvLm8qyw3GMLIQ=", "narHash": "sha256-MjGMCVKqafsrqLQYJHHKXJkvocTjkxKjadBfN952/Zw=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "5e3eee4bc42a2504653bedfe95bceda9a1e85ae7", "rev": "862d0c1e5fe2348a22044f225afef39b75df8cf0",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -73,22 +73,6 @@ let
sha256 = "vzAfWLyljR0Cg6pCeeyQJZNeOJh5xOILlbJnwDWu62o="; 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 ++ [ patches = old.patches ++ [
./gpt4all-HEAD-disable-settings-err.patch ./gpt4all-HEAD-disable-settings-err.patch
]; ];