From 20c47da38094134b582c6bd069c0eb3c20adf3ff Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 20 Feb 2025 10:08:10 -0500 Subject: [PATCH] fixes + dunst config stuff --- etcnixos/common.nix | 4 +-- etcnixos/flake.lock | 42 +++++++++++----------- etcnixos/no-rgb.nix | 4 +-- etcnixos/system-mreow.nix | 10 +++--- home-manager/flake.lock | 48 +++++++++++++------------- home-manager/gui.nix | 3 ++ home-manager/no-gui.nix | 2 +- home-manager/progs/dunst.nix | 30 ++++++++++++++++ home-manager/progs/fish.nix | 16 ++++----- home-manager/progs/gpt4all/gpt4all.nix | 13 ++++++- home-manager/progs/niri.nix | 7 ++-- home-manager/system-mreow.nix | 9 ++--- 12 files changed, 115 insertions(+), 73 deletions(-) create mode 100644 home-manager/progs/dunst.nix diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 00e8319..76d1814 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -49,8 +49,8 @@ # kernel options boot = { - # kernelPackages = pkgs.linuxPackages_cachyos-lto; - kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = pkgs.linuxPackages_cachyos-lto; + # kernelPackages = pkgs.linuxPackages_latest; kernel.sysctl = { # dmesg shushhhhh diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 6498007..35da617 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -34,11 +34,11 @@ ] }, "locked": { - "lastModified": 1739212779, - "narHash": "sha256-7U7fOAOVy/AaOtw3HflnwEeXZJ9+ldxVU/Mx5tGN9A4=", + "lastModified": 1740016447, + "narHash": "sha256-96hBRGwuG+CFI5+inRIDCh0Za4LOt1dlbO3pFOokw6Y=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "175a7f545d07bd08c14709f0d0849a8cddaaf460", + "rev": "ed7900391a1969bb0bde432fd3952a6dda37114c", "type": "github" }, "original": { @@ -115,11 +115,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1739082714, - "narHash": "sha256-cylMa750pId3Hqvzyurd86qJIYyyMWB0M7Gbh7ZB2tY=", + "lastModified": 1739946876, + "narHash": "sha256-ek0u5FT5yjqYKjF/0HQKwDH2ISZzyvYwu+My5hmSwbU=", "owner": "nix-community", "repo": "fenix", - "rev": "e84058a7fe56aa01f2db19373cce190098494698", + "rev": "95c1eab59767a3dbb11d6616d4ff736813ce41d2", "type": "github" }, "original": { @@ -230,11 +230,11 @@ ] }, "locked": { - "lastModified": 1739051380, - "narHash": "sha256-p1QSLO8DJnANY+ppK7fjD8GqfCrEIDjso1CSRHsXL7Y=", + "lastModified": 1739913864, + "narHash": "sha256-WhzgQjadrwnwPJQLLxZUUEIxojxa7UWDkf7raAkB1Lw=", "owner": "nix-community", "repo": "home-manager", - "rev": "5af1b9a0f193ab6138b89a8e0af8763c21bbf491", + "rev": "97ac0801d187b2911e8caa45316399de12f6f199", "type": "github" }, "original": { @@ -252,11 +252,11 @@ ] }, "locked": { - "lastModified": 1738875499, - "narHash": "sha256-P3VbO2IkEW+0d0pJU7CuX8e+obSoiDw/YCVL1mnA26w=", + "lastModified": 1739952453, + "narHash": "sha256-+tyFW6nNj1fJ1VTtLeqe1PMp5F7Fb9zIkT6mUvdQHrM=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "4642ec1073a7417e6303484d8f2e7d29dc24a50f", + "rev": "b2ed82d3ff837960df4518308dfe409dda3ae406", "type": "github" }, "original": { @@ -315,11 +315,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1738816619, - "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=", + "lastModified": 1739798439, + "narHash": "sha256-GyipmjbbQEaosel/+wq1xihCKbv0/e1LU00x/8b/fP4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2eccff41bab80839b1d25b303b53d339fbb07087", + "rev": "3e2ea8a49d4d76276b0f4e2041df8ca5c0771371", "type": "github" }, "original": { @@ -331,11 +331,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739020877, - "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", + "lastModified": 1739866667, + "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", + "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", "type": "github" }, "original": { @@ -401,11 +401,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1738997488, - "narHash": "sha256-jeNdFVtEDLypGIbNqBjURovfw9hMkVtlLR7j/5fRh54=", + "lastModified": 1739913186, + "narHash": "sha256-7MSzs64dLDgq1wFw2eujZ01qdj9K+TwIlQMyWebotE8=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "208bc52b5dc177badc081c64eb0584a313c73242", + "rev": "3028f844c5898dcf115f6bc67a5ce793989b04a1", "type": "github" }, "original": { diff --git a/etcnixos/no-rgb.nix b/etcnixos/no-rgb.nix index 74f627a..5f876ca 100644 --- a/etcnixos/no-rgb.nix +++ b/etcnixos/no-rgb.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: { systemd.services.no-rgb = let @@ -27,7 +27,7 @@ { description = "disable rgb"; serviceConfig = { - ExecStart = "${no-rgb}/bin/${no-rgb.name}"; + ExecStart = "${lib.getExe no-rgb}"; Type = "oneshot"; }; wantedBy = [ "multi-user.target" ]; diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index 651a37d..394910d 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -19,12 +19,12 @@ in inputs.lanzaboote.nixosModules.lanzaboote ]; - hardware.framework.laptop13.audioEnhancement = { - enable = true; + # hardware.framework.laptop13.audioEnhancement = { + # enable = true; - # seems audio doesn't work without this - hideRawDevice = false; - }; + # # seems audio doesn't work without this + # hideRawDevice = false; + # }; services.tlp = { enable = true; diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 942db7c..82e4a8c 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1739233400, - "narHash": "sha256-fldFwXHP9Ndy/ADMDWNTpfWNsLdhZ8PP4DQyr1Igfo4=", + "lastModified": 1739992710, + "narHash": "sha256-9kEscmGnXHjSgcqyJR4TzzHhska4yz1inSQs6HuO9qU=", "owner": "nix-community", "repo": "home-manager", - "rev": "ba4a1a110204c27805d1a1b5c8b24b3a0da4d063", + "rev": "1c189f011447810af939a886ba7bee33532bb1f9", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1739206396, - "narHash": "sha256-dfU3l47sxFQbqLe5R9um//V5hplv/MhSwsZJR7JzBrg=", + "lastModified": 1740045415, + "narHash": "sha256-dLg4Re8AdmlTYWu6FHR60cem9fErXnWXRJi6/Du5L3M=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "9f15e7ace2dea798ce3490d2f723095ad4cce0d4", + "rev": "a622f76d3f97ce289f2103b6999f80a3732d629b", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1739201373, - "narHash": "sha256-6upEicgdJH3JaS1oXS+wsgLToU14XL8/aOyL2KcS3KY=", + "lastModified": 1740042509, + "narHash": "sha256-Yk1DXv4oRdbi2P8v4b7GV6wXJaAa5jOK0femtfxlGAg=", "owner": "YaLTeR", "repo": "niri", - "rev": "20769b4c2f843566880f020f117e7bde36edc332", + "rev": "8885233c7e036a1e279c09e4fd96c1a1669156c3", "type": "github" }, "original": { @@ -127,11 +127,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739020877, - "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", + "lastModified": 1739866667, + "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", + "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", "type": "github" }, "original": { @@ -143,11 +143,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1739055578, - "narHash": "sha256-2MhC2Bgd06uI1A0vkdNUyDYsMD0SLNGKtD8600mZ69A=", + "lastModified": 1739923778, + "narHash": "sha256-BqUY8tz0AQ4to2Z4+uaKczh81zsGZSYxjgvtw+fvIfM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a45fa362d887f4d4a7157d95c28ca9ce2899b70e", + "rev": "36864ed72f234b9540da4cf7a0c49e351d30d3f1", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1739240901, - "narHash": "sha256-YDtl/9w71m5WcZvbEroYoWrjECDhzJZLZ8E68S3BYok=", + "lastModified": 1740018520, + "narHash": "sha256-mU6H0Q1WPn0XuwBO9SLZb/1yeVMfvsifBJcXNlhB+Ts=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "03473e2af8a4b490f4d2cdb2e4d3b75f82c8197c", + "rev": "7f6ecf3b7c5bfcc4730943a767630122efd09dc8", "type": "github" }, "original": { @@ -222,11 +222,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1737837494, - "narHash": "sha256-wIMowP8Juas4ZwMRcpc+58sZ0kKTDu8fm13THPmv/F8=", + "lastModified": 1739246919, + "narHash": "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "3944c9a0e40e5629f16ad023bbc90dac80d35a0f", + "rev": "44590a416d4a3e8220e19e29e0b6efe64a80315d", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1739161281, - "narHash": "sha256-cMM5E5EzEnfQFdBurCVqCi9mhsmRCeaEJB4iskPsQ1o=", + "lastModified": 1739667343, + "narHash": "sha256-fNEz+Yd0t9jXz27qKRMAEBradTwYBeBLOECx+ydG25s=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "0e962f036e6e2a9dde28f37d80104c7ea477a801", + "rev": "8c7f6ca49f87b4e114f775a4dad956ceb6df4220", "type": "github" }, "original": { diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 2c8f9b0..2840f29 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -113,9 +113,12 @@ wl-screenrec gimp + pinta # wayland-compatible color picker hyprpicker + + blender ] ++ (builtins.filter lib.isDerivation (builtins.attrValues nerd-fonts)); diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 55b91ad..e5da856 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -161,7 +161,7 @@ # https://github.com/flamegraph-rs/flamegraph home.file.".cargo/config.toml".text = '' [target.${lib.strings.removeSuffix "-linux" pkgs.system}-unknown-linux-gnu] - linker = "${pkgs.clang}/bin/clang" + linker = "${lib.getExe pkgs.clang}" rustflags = ["-Clink-arg=-Wl,--no-rosegment"] ''; diff --git a/home-manager/progs/dunst.nix b/home-manager/progs/dunst.nix new file mode 100644 index 0000000..6894bf2 --- /dev/null +++ b/home-manager/progs/dunst.nix @@ -0,0 +1,30 @@ +{ pkgs, config, ... }: +{ + services.dunst = { + enable = true; + package = pkgs.dunst; + + settings = { + global = { + width = 300; + height = 300; + offset = "30x50"; + origin = "top-right"; + + # 0 is the most opaque, 100 is completely transparent + transparency = 40; + + # have consistancy between niri frame color and dunst + frame_color = config.programs.niri.settings.layout.focus-ring.active.color; + + font = "JetBrains Mono Nerd Font 9"; + }; + + urgency_normal = { + # background = "#37474f"; + # foreground = "#eceff1"; + timeout = 10; + }; + }; + }; +} diff --git a/home-manager/progs/fish.nix b/home-manager/progs/fish.nix index 29e64de..3db5927 100644 --- a/home-manager/progs/fish.nix +++ b/home-manager/progs/fish.nix @@ -1,7 +1,7 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: let - eza = "${pkgs.eza}/bin/eza --color=always --group-directories-first"; - cargo = "${pkgs.cargo}/bin/cargo"; + eza = "${lib.getExe pkgs.eza} --color=always --group-directories-first"; + cargo = "${lib.getExe pkgs.cargo}"; coreutils = "${pkgs.coreutils}/bin"; in { @@ -16,7 +16,7 @@ in export GPG_TTY=(${coreutils}/tty) #pfetch on shell start (disable pkgs because of execution time) - PF_INFO="ascii title os host kernel uptime memory editor wm" ${pkgs.pfetch-rs}/bin/pfetch + PF_INFO="ascii title os host kernel uptime memory editor wm" ${lib.getExe pkgs.pfetch-rs} ''; shellAliases = { @@ -32,9 +32,9 @@ in # gets the largest files in a git repo's history "git-size" = '' - ${pkgs.git}/bin/git rev-list --objects --all | - ${pkgs.git}/bin/git cat-file --batch-check='%(objecttype) %(objectname) %(objectsize) %(rest)' | - ${pkgs.gnused}/bin/sed -n 's/^blob //p' | + ${lib.getExe pkgs.git} rev-list --objects --all | + ${lib.getExe pkgs.git} cat-file --batch-check='%(objecttype) %(objectname) %(objectsize) %(rest)' | + ${lib.getExe pkgs.gnused} -n 's/^blob //p' | ${coreutils}/sort --numeric-sort --key=2 | ${coreutils}/cut -c 1-12,41- | ${coreutils}/numfmt --field=2 --to=iec-i --suffix=B --padding=7 --round=nearest''; @@ -43,7 +43,7 @@ in pbcopy = "${pkgs.wl-clipboard}/bin/wl-copy"; pbpaste = "${pkgs.wl-clipboard}/bin/wl-paste"; - gcc-native = "${pkgs.gcc}/bin/gcc -Q --help=target -mtune=native -march=native | ${pkgs.gnugrep}/bin/grep -E '^\\s+\-(mtune|march)=' | ${coreutils}/tr -d '[:blank:]'"; + gcc-native = "${lib.getExe pkgs.gcc} -Q --help=target -mtune=native -march=native | ${lib.getExe pkgs.gnugrep} -E '^\\s+\-(mtune|march)=' | ${coreutils}/tr -d '[:blank:]'"; run-steam = "gamescope --backend sdl -W 2256 -H 1504 -f --steam -- steam -tenfoot -pipewire-dmabuf"; }; diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index 36a60b3..1ae2d0a 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -16,6 +16,17 @@ let sha256 = "031b190e7aa81770b5d069de181dcfe4b284bf5d75fa12f82f5e54a3178adcfd"; }; } + + rec { + name = "DeepScaleR-1.5B-Preview-Q8_0.gguf"; + filename = src.name; + context_length = 131072; + gen_length = 32768; + src = pkgs.fetchurl { + url = "https://huggingface.co/bartowski/agentica-org_DeepScaleR-1.5B-Preview-GGUF/resolve/main/agentica-org_DeepScaleR-1.5B-Preview-Q8_0.gguf"; + sha256 = "932ecb3ae043335c78dab621f032d32eb1868c80a27b4fe5f39c7850902de940"; + }; + } ]; gpt4all_package = ( @@ -34,7 +45,7 @@ let ] ); - system_prompt = "You are a helpful and harmless assistant. You should think step-by-step."; + system_prompt = "You are a helpful and harmless assistant. You should think step-by-step. Explore multiple trains of thought and methods (to completion) in order to derive the correct answer."; chat_name_prompt = "Make a 3 word headline for this conversation"; in { diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index 9748dc5..5178238 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -1,6 +1,7 @@ { config, pkgs, + lib, ... }: { @@ -47,7 +48,7 @@ spawn-at-startup = [ { command = [ - "${config.programs.eww.package}/bin/eww" + "${lib.getExe config.programs.eww.package}" "-c" "${config.programs.eww.configDir}" "open" @@ -58,7 +59,7 @@ # swaybg works on more than just sway (sets a wallpaper) { command = [ - "${pkgs.swaybg}/bin/swaybg" + "${lib.getExe pkgs.swaybg}" "-i" "${../wallpaper.png}" ]; @@ -67,7 +68,7 @@ # Xwayland on niri via xwayland-satellite { command = [ - "${pkgs.xwayland-satellite}/bin/xwayland-satellite" + "${lib.getExe pkgs.xwayland-satellite}" config.programs.niri.settings.environment.DISPLAY ]; } diff --git a/home-manager/system-mreow.nix b/home-manager/system-mreow.nix index 9b4bcab..54a4d22 100644 --- a/home-manager/system-mreow.nix +++ b/home-manager/system-mreow.nix @@ -16,6 +16,9 @@ # lockscreen ./progs/swaylock.nix + + # notification daemon + ./progs/dunst.nix ]; home.packages = with pkgs; [ @@ -39,12 +42,6 @@ Service.ExecStart = "${pkgs.bluez}/bin/mpris-proxy"; }; - # notification daemon - services.dunst = { - enable = true; - package = pkgs.dunst; - }; - age.secrets.borg-laptop-password = { file = ./secrets/borg-laptop-password.age; path = "${homeDirectory}/.secrets/borg_bak_pass";