From e63c95d319472a9963b3c95d1ed12f7d0b6c2d9d Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 30 Sep 2024 10:38:37 -0400 Subject: [PATCH] cachyos again + cleanup --- etcnixos/common.nix | 6 +-- etcnixos/flake.lock | 6 +-- etcnixos/system-nixos.nix | 3 ++ home-manager/flake.lock | 51 +++++++------------ home-manager/flake.nix | 11 +--- .../gpt4all-HEAD-disable-settings-err.patch | 19 ------- home-manager/system-mreow.nix | 3 -- 7 files changed, 26 insertions(+), 73 deletions(-) delete mode 100644 home-manager/progs/gpt4all-HEAD-disable-settings-err.patch diff --git a/etcnixos/common.nix b/etcnixos/common.nix index ce980bf..8d73567 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -31,10 +31,8 @@ #kernel options boot = { - # kernelPackages = pkgs.linuxPackages_cachyos-lto; - kernelPackages = pkgs.linuxPackages_6_10; - - supportedFilesystems = [ "zfs" ]; + kernelPackages = pkgs.linuxPackages_cachyos-lto; + # kernelPackages = pkgs.linuxPackages_6_10; kernel.sysctl = { #for profiling diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index bdc5d3a..df4f8c8 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -316,11 +316,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1727613673, - "narHash": "sha256-qqIffTQfxMYo3MKQ9BoY2s2mdKZNnUiksdnxv81js9U=", + "lastModified": 1727665282, + "narHash": "sha256-oKtfbQB1MBypqIyzkC8QCQcVGOa1soaXaGgcBIoh14o=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f5c239fa9acb27f0a5326ba2949c00fada89ca9f", + "rev": "11c43c830e533dad1be527ecce379fcf994fbbb5", "type": "github" }, "original": { diff --git a/etcnixos/system-nixos.nix b/etcnixos/system-nixos.nix index 5d2971f..1005cf6 100644 --- a/etcnixos/system-nixos.nix +++ b/etcnixos/system-nixos.nix @@ -15,6 +15,9 @@ ]; boot = { + kernelPackages = pkgs.linuxPackages_6_10; + supportedFilesystems = [ "zfs" ]; + kernelPatches = [ #for making ALVR support better :) { diff --git a/home-manager/flake.lock b/home-manager/flake.lock index bbbb0a1..c45c323 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -33,11 +33,11 @@ ] }, "locked": { - "lastModified": 1727595111, - "narHash": "sha256-i9Pz4vOnBdn1nqJmOL1+gP+A3nrK2WkOR8AO6RoIkQg=", + "lastModified": 1727688294, + "narHash": "sha256-bbisTJPMAObX/GD6tXjR1+4F/ED/jZgiZnFcXjnLC7k=", "owner": "orhun", "repo": "binsider", - "rev": "b1116e6118d3b6c481d9d99b25c23e2155260b97", + "rev": "3f4f742cfc759425ef767605417ff19d257023f9", "type": "github" }, "original": { @@ -68,22 +68,6 @@ "type": "github" } }, - "firefox-mod-theme": { - "flake": false, - "locked": { - "lastModified": 1727035403, - "narHash": "sha256-xkVZOZRGrL5YKEXb0R701F71vGJ+K5BFpugtqPwf4XQ=", - "owner": "datguypiko", - "repo": "Firefox-Mod-Blur", - "rev": "694566afa267fe6d5eb5c97a87e116ba794ea293", - "type": "github" - }, - "original": { - "owner": "datguypiko", - "repo": "Firefox-Mod-Blur", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -153,11 +137,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1727573335, - "narHash": "sha256-RCcDnBgJpP8GVdIrmS7IFhpUCWQjaYS4j7NBT6cbZ3s=", + "lastModified": 1727701561, + "narHash": "sha256-WY8hXcI5835QYQL7aSo2N2mpzt7iZzmt+I+//zqLNcA=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "415bbec6b9482afa0605682cf31064964ae705c6", + "rev": "31730f5948bdcbe2f909feb414912f0abdc1fbd7", "type": "github" }, "original": { @@ -186,11 +170,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1727525902, - "narHash": "sha256-NUsPodaJn384rLdPawH1u1cxHzE25EdrXMLkpRTkGFA=", + "lastModified": 1727699256, + "narHash": "sha256-/8+/LrIClf0ME2sC1R25p7JXT7n17xHDElCd8I/VOoc=", "owner": "YaLTeR", "repo": "niri", - "rev": "c04ccafd0a2cb26c1f6a4835f4cbb01ffdb926a6", + "rev": "b501a9b303d9722173565d4b8f7f044a38cbc099", "type": "github" }, "original": { @@ -264,7 +248,6 @@ "inputs": { "agenix": "agenix", "binsider": "binsider", - "firefox-mod-theme": "firefox-mod-theme", "home-manager": "home-manager", "niri": "niri", "nixpkgs": "nixpkgs", @@ -281,11 +264,11 @@ ] }, "locked": { - "lastModified": 1727577080, - "narHash": "sha256-2LPT76Acp6ebt7fCt90eq/M8T2+X09s/yTVgfVFrtno=", + "lastModified": 1727663505, + "narHash": "sha256-83j/GrHsx8GFUcQofKh+PRPz6pz8sxAsZyT/HCNdey8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "73a833855442ce8cee710cf4d8d054fea1c81196", + "rev": "c2099c6c7599ea1980151b8b6247a8f93e1806ee", "type": "github" }, "original": { @@ -381,15 +364,15 @@ ] }, "locked": { - "lastModified": 1727287465, - "narHash": "sha256-XQAf5M593WmxgaXagtkci/H9DA3jSVx1TJk6F3X5VQo=", - "owner": "MarceColl", + "lastModified": 1727680504, + "narHash": "sha256-QYlWZwUSwrM7BuO+dXclZIwoPvBIuJr6GpFKv9XKFPI=", + "owner": "ch4og", "repo": "zen-browser-flake", - "rev": "96f1b5d80bf7360cb77c9b521f388324f18383a0", + "rev": "a026029bd9c953559a6990a5c0c80e355ed8a9dc", "type": "github" }, "original": { - "owner": "MarceColl", + "owner": "ch4og", "repo": "zen-browser-flake", "type": "github" } diff --git a/home-manager/flake.nix b/home-manager/flake.nix index 6bba1fd..09cf59d 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -31,7 +31,7 @@ }; zen-browser = { - url = "github:MarceColl/zen-browser-flake"; + url = "github:ch4og/zen-browser-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -46,12 +46,6 @@ url = "github:Matoking/vdf/support_new_bvdf"; flake = false; }; - - firefox-mod-theme = { - url = "github:datguypiko/Firefox-Mod-Blur"; - flake = false; - }; - }; outputs = @@ -71,7 +65,6 @@ pkgs = import nixpkgs { }; in { - homeConfigurations.${username} = home-manager.lib.homeManagerConfiguration { inherit pkgs; extraSpecialArgs = { @@ -82,13 +75,11 @@ niri.homeModules.config agenix.homeManagerModules.age - # add declarative rust modules ( { pkgs, ... }: { nixpkgs.overlays = [ rust-overlay.overlays.default - niri.overlays.niri ]; # home-manager stuff diff --git a/home-manager/progs/gpt4all-HEAD-disable-settings-err.patch b/home-manager/progs/gpt4all-HEAD-disable-settings-err.patch deleted file mode 100644 index a6911ab..0000000 --- a/home-manager/progs/gpt4all-HEAD-disable-settings-err.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/main.qml b/main.qml -index 1e685385..7c747eba 100644 ---- a/main.qml -+++ b/main.qml -@@ -72,12 +72,14 @@ Window { - return; - } - -+ /* - // check if we have access to settings and if not show an error - if (!hasShownSettingsAccess && !LLM.hasSettingsAccess()) { - errorSettingsAccess.open(); - hasShownSettingsAccess = true; - return; - } -+ */ - - // check for first time start of this version - if (!hasCheckedFirstStart) { diff --git a/home-manager/system-mreow.nix b/home-manager/system-mreow.nix index c042439..b68dab0 100644 --- a/home-manager/system-mreow.nix +++ b/home-manager/system-mreow.nix @@ -15,8 +15,6 @@ #manage bluetooth devices blueman - - niri-unstable ]; #bluetooth manager @@ -30,7 +28,6 @@ #window manager programs.niri = { - package = pkgs.niri-unstable; settings = import ./progs/niri.nix { inherit config pkgs homeDirectory; }; };