From b5463871166fac98230cb3ddbd6628e2a4b80a59 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 7 Oct 2024 11:05:14 -0400 Subject: [PATCH] update stuff --- etcnixos/flake.lock | 6 +++--- etcnixos/system-mreow.nix | 18 ++++++------------ home-manager/flake.lock | 18 +++++++++--------- home-manager/gui.nix | 10 +++++++--- home-manager/progs/gpt4all/gpt4all.nix | 6 +++--- home-manager/system-nixos.nix | 2 ++ 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index d84f190..3c7f369 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -316,11 +316,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728056216, - "narHash": "sha256-IrO06gFUDTrTlIP3Sz+mRB6WUoO2YsgMtOD3zi0VEt0=", + "lastModified": 1728269138, + "narHash": "sha256-oKxDImsOvgUZMY4NwXVyUc/c1HiU2qInX+b5BU0yXls=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b7ca02c7565fbf6d27ff20dd6dbd49c5b82eef28", + "rev": "ecfcd787f373f43307d764762e139a7cdeb9c22b", "type": "github" }, "original": { diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index 5310d73..967e113 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -32,8 +32,6 @@ CPU_MAX_PERF_ON_BAT = 60; CPU_BOOST_ON_BAT = 0; - START_CHARGE_THRESH_BAT0 = 80; - STOP_CHARGE_THRESH_BAT0 = 90; RUNTIME_PM_ON_BAT = "auto"; }; }; @@ -100,15 +98,11 @@ system.activationScripts = { # extract all my secureboot keys - "secureboot-keys".text = - let - secureboot_path = "/etc/secureboot"; - in - '' - #!/bin/sh - rm -fr ${secureboot_path} || true - mkdir -p ${secureboot_path} - ${pkgs.gnutar}/bin/tar xf /etc/nixos/secrets/secureboot.tar -C ${secureboot_path} - ''; + "secureboot-keys".text = '' + #!/bin/sh + rm -fr ${config.boot.lanzaboote.pkiBundle} || true + mkdir -p ${config.boot.lanzaboote.pkiBundle} + ${pkgs.gnutar}/bin/tar xf /etc/nixos/secrets/secureboot.tar -C ${config.boot.lanzaboote.pkiBundle} + ''; }; } diff --git a/home-manager/flake.lock b/home-manager/flake.lock index ad2d4aa..5f72987 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -111,11 +111,11 @@ ] }, "locked": { - "lastModified": 1728041527, - "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=", + "lastModified": 1728306985, + "narHash": "sha256-l/KpcWTv2SjxCnqFs5GYhvjeVYd40WQV4/F2+w9btd4=", "owner": "nix-community", "repo": "home-manager", - "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e", + "rev": "3ac39b2a8b7cbfc0f96628d8a84867c885bc988b", "type": "github" }, "original": { @@ -137,11 +137,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1728240721, - "narHash": "sha256-kU1dKNIQI2Wue1d73D00OXX+dOFMpwLAq5CPvvCcdZk=", + "lastModified": 1728280052, + "narHash": "sha256-8gy3keN+6vKnn5nFDXib00bXFBUW+Xf+x6TKbTDl/x0=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "88749a1471ea2d707581bd0986fff9905d0eefbc", + "rev": "037bd7f67212127eaa52fee8199f951d19b7954a", "type": "github" }, "original": { @@ -170,11 +170,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1728236209, - "narHash": "sha256-Y8kOO0AiMsensF8JsleX2RD+6w4+Y3Kk42WsEveSH1I=", + "lastModified": 1728277759, + "narHash": "sha256-pMUMUo4vMcdjU4d8wuEHI5i8fW8SzYptR3GZPeDru1c=", "owner": "YaLTeR", "repo": "niri", - "rev": "66be00041060ea092d611e8f2506a6ed5b3f2327", + "rev": "03c603918d817762ee95d21ea15a854adf47886e", "type": "github" }, "original": { diff --git a/home-manager/gui.nix b/home-manager/gui.nix index c245018..e6d622b 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -69,22 +69,26 @@ #accounting gnucash + # image tools imagemagick inkscape nomacs - lrcget - + # partitioning utilities gparted gnome-disk-utility - #small nicities + # small nicities wl-clipboard # wl-copy & wl-paste libnotify # notifications library xdg-utils # xdg utils + # music tagging utility picard + # music lyric fetcher + lrcget + inputs.zen-browser.packages."${pkgs.system}".specific (factorio.override (import ./secrets/factorio.nix)) diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index d4635b9..929a20e 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -23,7 +23,7 @@ let in { NIX_CFLAGS_COMPILE = "${oldflags} ${newflags}"; - stdenv = pkgs.clang18Stdenv; + stdenv = pkgs.clangStdenv; } ); @@ -69,8 +69,8 @@ in home.file = lib.recursiveUpdate { ".config/nomic.ai/GPT4All.ini".text = let - system_prompt = "You are an expert LLM who is thoughtful and works step-by-step from first principles derive an answer to the user's prompt. For each step, title the step and begin showing your work, then decide if your work is comprehensive and if you're ready to provide your final answer. Make sure to exhaust ALL POSSIBILITIES before answering. While your reasoning is not shown to the user, it is under high levels of scrutiny to ensure high-quality reasoning. INTERNAL REASONING STEPS ARE NOT SHOWN TO THE USER, ONLY A \"Final Answer\" SECTION WILL BE SHOWN TO THE USER. -USE AS MANY REASONING STEPS AS POSSIBLE. AT LEAST 3. EXPLORE ALTERNATE ANSWERS AND CONSIDER THAT YOUR ANSWER MAY BE WRONG. IDENTIFY POSSIBLE ERRORS IN YOUR REASONING AND WHERE SUCH ERRORS MAY BE. FULLY TEST ALL OTHER POSSIBILITIES. YOU CAN BE WRONG. WHEN YOU SAY YOU ARE RE-EXAMINING, ACTUALLY RE-EXAMINE, AND USE ANOTHER APPROACH TO DO SO. BE VERBOSE IN YOUR REASONING AND RE-EXAMINING."; + system_prompt = "You are an expert LLM who is thoughtful and works step-by-step from first principles derive an answer to the user's prompt. For each step, title the step and begin showing your work, then decide if your work is comprehensive and if you're ready to provide your final answer. Make sure to exhaust ALL POSSIBILITIES before answering. INTERNAL REASONING STEPS ARE NOT SHOWN TO THE USER, ONLY A \"Final Answer\" SECTION WILL BE SHOWN TO THE USER. +USE AS MANY REASONING STEPS AS POSSIBLE. AT LEAST 3. EXPLORE ALTERNATE ANSWERS AND CONSIDER THAT YOUR ANSWER OR ANY ASSUMPTIONS MAY BE WRONG. IDENTIFY POSSIBLE ERRORS IN YOUR REASONING AND WHERE SUCH ERRORS MAY BE. FULLY TEST ALL OTHER POSSIBILITIES. YOU CAN BE WRONG. SHOW YOUR WORK WHEN RE-EXAMINING."; in '' [General] diff --git a/home-manager/system-nixos.nix b/home-manager/system-nixos.nix index 35a6808..1a12ce8 100644 --- a/home-manager/system-nixos.nix +++ b/home-manager/system-nixos.nix @@ -6,6 +6,8 @@ }: { imports = [ ./gui.nix ]; + + # TODO! replace this with a per-package unfree whitelist (i.e what is done with apple_cursors) nixpkgs.config.allowUnfree = true; home.packages = with pkgs; [