up
This commit is contained in:
jmarkin
parent
48d6916ae9
commit
e1602d1ffc
8 changed files with 83 additions and 58 deletions
50
flake.lock
50
flake.lock
|
|
@ -130,11 +130,11 @@
|
|||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762980239,
|
||||
"narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=",
|
||||
"lastModified": 1763759067,
|
||||
"narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "52a2caecc898d0b46b2b905f058ccc5081f842da",
|
||||
"rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -310,11 +310,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763748372,
|
||||
"narHash": "sha256-AUc78Qv3sWir0hvbmfXoZ7Jzq9VVL97l+sP9Jgms+JU=",
|
||||
"lastModified": 1763906693,
|
||||
"narHash": "sha256-inm7paa3myo8gE4TzjM8OPvsEg8xocWreIZBgBPEKgo=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "d10a9b16b2a3ee28433f3d1c603f4e9f1fecb8e1",
|
||||
"rev": "3d6c1c8fa0bea3a1a7ba23d6fa5993116766073b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -452,11 +452,11 @@
|
|||
"yaml-nvim": "yaml-nvim"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763417090,
|
||||
"narHash": "sha256-awodNAbK2GLfOhhkP81VExLNS2TT5qajUjrzzJNmwzk=",
|
||||
"lastModified": 1763909920,
|
||||
"narHash": "sha256-K/7wsbRvh4hz3Qbljdpkv9pqj2V6urO86ASscb4P5bU=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "1d7da56886d310c8681d6d7678e1006f6eabe300",
|
||||
"revCount": 53,
|
||||
"rev": "defa029e4fb7bde1bbb4ee2ffb496934b58f4ba3",
|
||||
"revCount": 55,
|
||||
"type": "git",
|
||||
"url": "https://git.jmarkin.ru/jmarkin/nvim-nix"
|
||||
},
|
||||
|
|
@ -468,11 +468,11 @@
|
|||
"namu-nvim": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1763177223,
|
||||
"narHash": "sha256-TFBee8j2b4WxGS/XthIFKsyaGDS82m/0t/vEoEDXVfA=",
|
||||
"lastModified": 1763488841,
|
||||
"narHash": "sha256-YTUPpFgKo5q5QexcmEv0IcSiMG2hVfYk9cKepB9tNVo=",
|
||||
"owner": "bassamsdata",
|
||||
"repo": "namu.nvim",
|
||||
"rev": "fdebb84a9a57329a1247b725740f267d85cd59a3",
|
||||
"rev": "51d2c1de7dcdab8c0b712cd9463e392039efa5e2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -492,11 +492,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763683496,
|
||||
"narHash": "sha256-k20voxbsi+899PeXlvWpKU5tcgNYfNqC52rgrh+MOto=",
|
||||
"lastModified": 1763856300,
|
||||
"narHash": "sha256-OXe/ZZqYoDmjqy19fuJzE9oR6XQH8IEGYjkDGGdQB5M=",
|
||||
"owner": "nix-community",
|
||||
"repo": "neovim-nightly-overlay",
|
||||
"rev": "1ddc8e956c8165df29735202b76bb0cfa827916d",
|
||||
"rev": "3e067256eaa258df675cafaed2bcef55b41ecb60",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -508,11 +508,11 @@
|
|||
"neovim-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1763682595,
|
||||
"narHash": "sha256-/dUf5I0DyLvPgFzjJj0/lUHKZ2M1sVlbYCgudDabxIo=",
|
||||
"lastModified": 1763846764,
|
||||
"narHash": "sha256-MTdbS6zBlxLJCMtPU394xUHk+wnK8aqVj4egblAiGGo=",
|
||||
"owner": "neovim",
|
||||
"repo": "neovim",
|
||||
"rev": "a8b9660ca3452a27b68bf914f618df2d78b64180",
|
||||
"rev": "4bbdffe8298e8bf6e0590684092a25f5effc0f14",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -685,11 +685,11 @@
|
|||
"oil-nvim": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1760913566,
|
||||
"narHash": "sha256-ebRao8UU8UI1S6Lumkd5vUiYYSj9UAazcEzThKyl8Uk=",
|
||||
"lastModified": 1763775913,
|
||||
"narHash": "sha256-OSfnL7H/haV4BeuS5r3GdBtD4si3vymtQO3q2437Kio=",
|
||||
"owner": "stevearc",
|
||||
"repo": "oil.nvim",
|
||||
"rev": "7e1cd7703ff2924d7038476dcbc04b950203b902",
|
||||
"rev": "01cb3a8ad7d5e8707041edc775af83dbf33838f4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -826,11 +826,11 @@
|
|||
"whatthejump-nvim": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1754642285,
|
||||
"narHash": "sha256-ZIkm99cE7cxQYyR0E0oMwgPSgPgEOOLt7TkbCmxLaJY=",
|
||||
"lastModified": 1763481259,
|
||||
"narHash": "sha256-PlYZFTwsImoM4xL850yWOW1z6SeYfi4kjzjv7anpMfU=",
|
||||
"owner": "lewis6991",
|
||||
"repo": "whatthejump.nvim",
|
||||
"rev": "a00d4db481fe5b14362c9a5688d5575fb7e48ee1",
|
||||
"rev": "52291c2ec6c806790781e269344bb640f161d471",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -56,6 +56,7 @@
|
|||
|
||||
mynvim.url = "git+https://git.jmarkin.ru/jmarkin/nvim-nix";
|
||||
# mynvim.url = "path:/home/kron/nvim-nix";
|
||||
# mynvim.url = "path:/home/markagl/nvim-nix";
|
||||
# mynvim.url = "path:/projects/jmarkin/nvim-nix";
|
||||
mynvim.inputs.nixpkgs.follows = "nixpkgs";
|
||||
mynvim.inputs.flake-parts.follows = "flake-parts";
|
||||
|
|
|
|||
|
|
@ -23,16 +23,18 @@ let
|
|||
};
|
||||
};
|
||||
in
|
||||
rec {
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
poppler-utils
|
||||
pandoc
|
||||
yek
|
||||
|
||||
usql
|
||||
argc
|
||||
];
|
||||
programs.aichat.enable = true;
|
||||
|
||||
programs.aichat.settings = {
|
||||
model = "ollama:orieg/gemma3-tools:4b";
|
||||
stream = true;
|
||||
save = true;
|
||||
keybindings = "vi";
|
||||
|
|
@ -42,12 +44,12 @@ rec {
|
|||
|
||||
function_calling = true;
|
||||
|
||||
save_session = null; # or false, depending on the option type
|
||||
save_session = true; # or false, depending on the option type
|
||||
compress_threshold = 9000;
|
||||
summarize_prompt = "Summarize the discussion briefly in 1000 words or less to use as a prompt for future context.";
|
||||
summary_prompt = "This is a summary of the chat history as a recap: ";
|
||||
|
||||
rag_embedding_model = "ollama:nomic-embed-text:latest";
|
||||
rag_embedding_model = "ollama:embeddinggemma:latest";
|
||||
rag_top_k = 5;
|
||||
rag_chunk_size = 256;
|
||||
rag_chunk_overlap = 200;
|
||||
|
|
@ -59,6 +61,7 @@ rec {
|
|||
git = "sh -c \"yek $1 --json | jq '[.[] | { path: .filename, contents: .content }]'\"";
|
||||
};
|
||||
|
||||
model = "ollama:jmarkin/gpt-oss-20b-Unsloth-coder:latest";
|
||||
# Clients configuration
|
||||
clients = [
|
||||
{
|
||||
|
|
@ -68,27 +71,26 @@ rec {
|
|||
models = [
|
||||
{
|
||||
name = "orieg/gemma3-tools:4b";
|
||||
max_input_tokens = 128000;
|
||||
max_input_tokens = 131072;
|
||||
supports_function_calling = true;
|
||||
supports_vision = true;
|
||||
supports_reasoning = false;
|
||||
}
|
||||
{
|
||||
name = "gpt-oss-safeguard:20b";
|
||||
max_input_tokens = 8128;
|
||||
name = "jmarkin/gpt-oss-20b-Unsloth-coder:latest";
|
||||
max_input_tokens = 131072;
|
||||
supports_reasoning = true;
|
||||
supports_function_calling = true;
|
||||
supports_vision = true;
|
||||
}
|
||||
{
|
||||
name = "danielsheep/Qwen3-Coder-30B-A3B-Instruct-1M-Unsloth:UD-IQ3_XXS";
|
||||
max_input_tokens = 8128;
|
||||
supports_reasoning = true;
|
||||
supports_function_calling = true;
|
||||
supports_vision = true;
|
||||
}
|
||||
{
|
||||
name = "nomic-embed-text:latest";
|
||||
name = "embeddinggemma:latest";
|
||||
type = "embedding";
|
||||
default_chunk_size = 1000;
|
||||
max_batch_size = 50;
|
||||
max_batch_size = 10;
|
||||
}
|
||||
];
|
||||
}
|
||||
|
|
@ -115,12 +117,6 @@ rec {
|
|||
supports_function_calling = true;
|
||||
supports_vision = false;
|
||||
}
|
||||
{
|
||||
name = "nomic-embed-text:latest";
|
||||
type = "embedding";
|
||||
default_chunk_size = 1000;
|
||||
max_batch_size = 50;
|
||||
}
|
||||
];
|
||||
}
|
||||
];
|
||||
|
|
|
|||
|
|
@ -194,7 +194,7 @@ bindsym $cltr+$alt+l exec "sleep 0.1 && i3lock --blur 5"
|
|||
## Uncomment to enable 'us' to/from 'ru' switch. change to language(s) you prefer more.
|
||||
|
||||
exec_always setxkbmap -option grp:caps_toggle "us,ru" -option "grp:caps_toggle,grp_led:caps"
|
||||
exec_always setxkbmap -option lv3:backspace
|
||||
exec_always xmodmap ~/.Xmodmap
|
||||
|
||||
exec xrandr --output eDP-1 --mode 2560x1600 --rate 60 --scale 0.8
|
||||
#exec xrandr --auto --output HDMI-1 --mode 1920x1080 --above HDMI-2
|
||||
|
|
|
|||
28
home/programs/i3/polybar/colors.ini
Normal file
28
home/programs/i3/polybar/colors.ini
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
[colors]
|
||||
bg = #282828
|
||||
bg-alt = #3c3836
|
||||
bg-darker = #1d2021
|
||||
fg = #fbf1c7
|
||||
|
||||
blue = #83a598
|
||||
cyan = #8ec07c
|
||||
green = #b8bb26
|
||||
orange = #fe8019
|
||||
purple = #d3869b
|
||||
red = #fb4934
|
||||
yellow = #fabd2f
|
||||
|
||||
bg-blue = #458588
|
||||
bg-cyan = #689d6a
|
||||
bg-green = #98971a
|
||||
bg-orange = #d65d0e
|
||||
bg-purple = #b16268
|
||||
bg-red = #cc241d
|
||||
bg-yellow = #d79921
|
||||
|
||||
black = #000
|
||||
white = #FFF
|
||||
|
||||
trans = #00000000
|
||||
semi-trans = #ee282828
|
||||
semi-trans-black = #aa000000
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
;vi ft=ini
|
||||
;vi: ft=ini
|
||||
|
||||
;==========================================================
|
||||
;
|
||||
;
|
||||
|
|
@ -26,7 +27,7 @@ primary = #ffb52a
|
|||
secondary = #e60053
|
||||
alert = #FF0000
|
||||
|
||||
[bar/example]
|
||||
[bar/topbar]
|
||||
monitor = ${env:MONITOR:}
|
||||
width = 100%
|
||||
height = 22
|
||||
|
|
@ -99,7 +100,7 @@ format = <label-state> <label-mode>
|
|||
index-sort = true
|
||||
wrapping-scroll = false
|
||||
strip-wsnumbers = false
|
||||
enable-click = false
|
||||
enable-click = true
|
||||
enable-scroll = false
|
||||
|
||||
label-mode = %mode%
|
||||
|
|
@ -146,11 +147,12 @@ tail = true
|
|||
[module/date]
|
||||
type = internal/date
|
||||
interval = 1
|
||||
time = "%a %d %I:%M %P"
|
||||
date = %Y-%m-%d
|
||||
time = %H:%M:%S
|
||||
format-prefix = " "
|
||||
format-prefix-foreground = ${colors.foreground-alt}
|
||||
format-prefix-background = ${colors.background-alt}
|
||||
label = %time%
|
||||
label = %date% %time%
|
||||
label-foreground = ${colors.foreground-alt}
|
||||
label-background = ${colors.background-alt}
|
||||
|
||||
|
|
@ -181,10 +183,6 @@ type = internal/xkeyboard
|
|||
|
||||
[module/temperature]
|
||||
type = internal/temperature
|
||||
|
||||
[module/tray]
|
||||
type = internal/tray
|
||||
|
||||
; Full path of temperature sysfs path
|
||||
; Use `sensors` to find preferred temperature source, then run
|
||||
; $ for i in /sys/class/hwmon/hwmon*/temp*_input; do echo "$(<$(dirname $i)/name): $(cat ${i%_*}_label 2>/dev/null || echo $(basename ${i%_*})) $(readlink -f $i)"; done
|
||||
|
|
@ -192,6 +190,9 @@ type = internal/tray
|
|||
; Default reverts to thermal zone setting
|
||||
hwmon-path = /sys/devices/platform/coretemp.0/hwmon/hwmon5/temp1_input
|
||||
|
||||
[module/tray]
|
||||
type = internal/tray
|
||||
|
||||
[settings]
|
||||
screenchange-reload = true
|
||||
compositing-background = over
|
||||
|
|
@ -9,8 +9,8 @@ while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done
|
|||
# for multimonitor
|
||||
if type "xrandr"; then
|
||||
for m in $(xrandr --query | grep " connected" | cut -d" " -f1); do
|
||||
MONITOR=$m polybar --reload example & disown
|
||||
MONITOR=$m polybar --reload topbar & disown
|
||||
done
|
||||
else
|
||||
polybar --reload example & disown
|
||||
polybar --reload topbar & disown
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
../programs/i3
|
||||
../programs/ai
|
||||
../programs/alacritty
|
||||
../programs/neovide.nix
|
||||
# ../programs/neovide.nix
|
||||
];
|
||||
|
||||
|
||||
|
|
@ -16,6 +16,5 @@
|
|||
telegram-desktop
|
||||
];
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue