fixes + dunst config stuff

This commit is contained in:
2025-02-20 10:08:10 -05:00
parent 5cb473d279
commit 20c47da380
12 changed files with 115 additions and 73 deletions

View File

@@ -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;
};
};
};
}

View File

@@ -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";
};

View File

@@ -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
{

View File

@@ -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
];
}