Add dotfiles - static and linked, bluetooth fix

This commit is contained in:
Nathan Anderson 2025-10-14 21:38:23 -06:00
parent 7f49c2aeaf
commit 18afdc0fb6
19 changed files with 71 additions and 468 deletions

View File

@ -1,185 +0,0 @@
# Theme
theme = "revontuli"
[keys.normal]
# Navigation
n = "move_char_left" # Maps the 'a' key to the move_char_left command
i = "move_visual_line_down"
e = "move_visual_line_up"
o = "move_char_right"
"S-tab" = "jump_backward"
I = "page_down"
E = "page_up"
# Modes
h = "insert_mode"
H = "insert_at_line_start"
l = "open_below"
L = "open_above"
# Search
k = "search_next"
K = "search_prev"
# Selection
C-s = "split_selection_on_newline"
C-minus = "merge_selections"
C-_ = "merge_consecutive_selections"
"C-;" = "flip_selections"
"C-:" = "ensure_selections_forward"
"C-," = "remove_primary_selection"
C-c = "change_selection_noyank"
C-d = "delete_selection_noyank"
"C-(" = "rotate_selection_contents_backward"
"C-)" = "rotate_selection_contents_forward"
C-x = "shrink_to_line_bounds"
C-J = "join_selections_space"
C-K = "remove_selections"
C-o = "expand_selection"
C-i = "shrink_selection"
C-p = "select_prev_sibling"
C-n = "select_next_sibling"
# Misc
"C-/" = "toggle_comments"
"@" = ":append-output git config get user.email"
[keys.normal.space]
x = ":write-buffer-close"
X = ":write-quit-all"
o = ":config-open"
h = "hover"
k = "select_references_to_symbol_under_cursor"
[keys.normal.g]
"/" = "goto_next_buffer"
h = "goto_previous_buffer"
n = ["collapse_selection", "extend_to_line_start"]
o = ["collapse_selection", "extend_to_line_end"]
e = "move_line_up"
i = "move_line_down"
l = "goto_last_line"
p = "no_op"
k = "no_op"
j = "no_op"
[keys.normal.m]
m = ["select_mode", "match_brackets", "normal_mode"]
[keys.select]
n = "extend_char_left"
i = "extend_line_down"
e = "extend_line_up"
o = "extend_char_right"
[keys.select.g]
"/" = "goto_next_buffer"
h = "goto_previous_buffer"
n = "goto_line_start"
o = "goto_line_end"
e = "move_line_up"
i = "move_line_down"
l = "goto_last_line"
p = "no_op"
k = "no_op"
j = "no_op"
# Window mode
[keys.normal."C-w"]
h = "hsplit"
C-h = "hsplit"
n = "jump_view_left"
C-n = "jump_view_left"
i = "jump_view_down"
I = "swap_view_down"
C-i = "jump_view_down"
e = "jump_view_up"
E = "swap_view_up"
C-e = "jump_view_up"
o = "jump_view_right"
O = "swap_view_right"
C-o = "jump_view_right"
# Remove old
s = "no_op"
C-s = "no_op"
H = "no_op"
j = "no_op"
J = "no_op"
C-j = "no_op"
k = "no_op"
K = "no_op"
C-k = "no_op"
l = "no_op"
L = "no_op"
C-l = "no_op"
[editor]
auto-format = true
auto-save = true
bufferline = "always"
color-modes = true # color each mode differently in statusline
completion-timeout = 5
cursorcolumn = true
cursorline = true
indent-heuristic = "tree-sitter"
line-number = "relative"
rulers = [120]
text-width = 120
end-of-line-diagnostics = "hint"
[editor.cursor-shape]
insert = "bar"
normal = "block"
select = "underline"
[editor.file-picker]
hidden = false
[editor.indent-guides]
render = true
[editor.inline-diagnostics]
cursor-line = "warning"
other-lines = "disable"
prefix-len = 5
max-diagnostics = 1
max-wrap = 30
[editor.lsp]
display-messages = true
display-inlay-hints = true
[editor.soft-wrap]
enable = true
max-wrap = 30
[editor.statusline]
left = ["mode", "file-modification-indicator", "spinner", "version-control"]
center = ["file-name"]
right = ["diagnostics", "selections", "register", "position", "file-encoding"]
mode.normal = "Normal"
mode.insert = "Insert"
mode.select = "Select"
[editor.whitespace.render]
space = "all"
tab = "all"
tabpad = "all"
newline = "none"
nbsp = "none"
[editor.whitespace.characters]
space = "·"
tab = "⇀"
tabpad = " "
#w = "move_line_up" # Maps the 'w' key move_line_up
#"C-S-esc" = "extend_line" # Maps Ctrl-Shift-Escape to extend_line
#g = { a = "code_action" } # Maps `ga` to show possible code actions
#"ret" = ["open_below", "normal_mode"] # Maps the enter key to open_below then re-enter normal mode

View File

@ -1,123 +0,0 @@
###
### Configuration for languages
###
[[language]]
name = "go"
language-servers = ["gopls"]
[[language]]
name = "markdown"
language-servers = ["marksman"]
# Change dart format to 120 lines
[[language]]
name = "dart"
formatter = {command = "dart", args = ["format", "-l", "120"]}
language-servers = ["dart"]
[[language]]
name = "nix"
language-servers = ["nil"]
[[language]]
name = "zig"
language-servers = ["zls"]
[language.debugger]
name = "codelldb-dap"
transport = "tcp"
command = "codelldb"
args = []
port-arg = "--port {}"
[[language.debugger.templates]]
name = "launch"
request = "launch"
completion = [ { name = "binary", completion = "filename" } ]
args = { console = "internalConsole", program = "{0}" }
[[language.debugger.templates]]
name = "attach"
request = "attach"
completion = [ "pid" ]
args = { console = "internalConsole", pid = "{0}" }
[[language.debugger.templates]]
name = "gdbserver attach"
request = "attach"
completion = [ { name = "lldb connect url", default = "connect://localhost:3333" }, { name = "file", completion = "filename" }, "pid" ]
args = { console = "internalConsole", attachCommands = [ "platform select remote-gdb-server", "platform connect {0}", "file {1}", "attach {2}" ] }
## cyo custom def
[[language]]
name = "cyano"
scope = "source.cyo"
file-types = ["cyo"]
language-servers = ["ltex-ls"]
[language-server.ltex-ls]
command = "ltex-ls"
###
### Configuration for LSP-AI
###
### Link here:
### https://github.com/SilasMarvin/lsp-ai
###
# [language-server.lsp-ai]
# command
# [language-server.lsp-ai.config.memory]
# file_store = { }
# [language-server.lsp-ai.config.models.sonnet]
# type = "anthropic"
# chat_endpoint = "https://api.anthropic.com/v1/messages"
# model = "claude-3-5-sonnet-20241022"
# auth_token_env_var_name = "ANTHROPIC_API_KEY"
# [language-server.lsp-ai.config.models.haiku]
# type = "anthropic"
# chat_endpoint = "https://api.anthropic.com/v1/messages"
# model = "claude-3-5-haiku-20241022"
# auth_token_env_var_name = "ANTHROPIC_API_KEY"
# [[language-server.lsp-ai.config.chat]]
# trigger = "!C"
# action_display_name = "Chat (Sonnet 󰤇)"
# model = "sonnet"
# parameters = { max_context = 4096, max_tokens = 4096, system = "You are a code assistant chatbot. The user will ask you for assistance coding and you will do you best to answer succinctly and accurately" }
# [[language-server.lsp-ai.config.chat]]
# trigger = "!C"
# action_display_name = "Chat (Haiku 󰾆)"
# model = "haiku"
# parameters = { max_context = 4096, max_tokens = 4096, system = "You are a code assistant chatbot. The user will ask you for assistance coding and you will do you best to answer succinctly and accurately" }
# [[language-server.lsp-ai.config.actions]]
# action_display_name = "Complete (Sonnet 󰤇)"
# model = "sonnet"
# parameters = { max_context = 4096, max_tokens = 4096, messages = [{ role = "user", content = "{CODE}" }], system = "You are an AI coding assistant. Your task is to complete code snippets. The user's cursor position is marked by \"<CURSOR>\". Follow these steps:\n\n1. Analyze the code context and the cursor position.\n2. Provide your chain of thought reasoning, wrapped in <reasoning> tags. Include thoughts about the cursor position, what needs to be completed, and any necessary formatting.\n3. Determine the appropriate code to complete the current thought, including finishing partial words or lines.\n4. Replace \"<CURSOR>\" with the necessary code, ensuring proper formatting and line breaks.\n5. Wrap your code solution in <answer> tags.\n\nYour response should always include both the reasoning and the answer. Pay special attention to completing partial words or lines before adding new lines of code.\n\n<examples>\n<example>\nUser input:\n--main.py--\n# A function that reads in user inpu<CURSOR>\n\nResponse:\n<reasoning>\n1. The cursor is positioned after \"inpu\" in a comment describing a function that reads user input.\n2. We need to complete the word \"input\" in the comment first.\n3. After completing the comment, we should add a new line before defining the function.\n4. The function should use Python's built-in `input()` function to read user input.\n5. We'll name the function descriptively and include a return statement.\n</reasoning>\n\n<answer>t\ndef read_user_input():\n user_input = input(\"Enter your input: \")\n return user_input\n</answer>\n</example>\n\n<example>\nUser input:\n--main.py--\ndef fibonacci(n):\n if n <= 1:\n return n\n else:\n re<CURSOR>\n\n\nResponse:\n<reasoning>\n1. The cursor is positioned after \"re\" in the 'else' clause of a recursive Fibonacci function.\n2. We need to complete the return statement for the recursive case.\n3. The \"re\" already present likely stands for \"return\", so we'll continue from there.\n4. The Fibonacci sequence is the sum of the two preceding numbers.\n5. We should return the sum of fibonacci(n-1) and fibonacci(n-2).\n</reasoning>\n\n<answer>turn fibonacci(n-1) + fibonacci(n-2)</answer>\n</example>\n</examples>"}
# post_process = { extractor = "(?s)<answer>(.*?)</answer>" }
# [[language-server.lsp-ai.config.actions]]
# action_display_name = "Complete (Haiku 󰾆)"
# model = "haiku"
# parameters = { max_context = 4096, max_tokens = 4096, messages = [{ role = "user", content = "{CODE}" }], system = "You are an AI coding assistant. Your task is to complete code snippets. The user's cursor position is marked by \"<CURSOR>\". Follow these steps:\n\n1. Analyze the code context and the cursor position.\n2. Provide your chain of thought reasoning, wrapped in <reasoning> tags. Include thoughts about the cursor position, what needs to be completed, and any necessary formatting.\n3. Determine the appropriate code to complete the current thought, including finishing partial words or lines.\n4. Replace \"<CURSOR>\" with the necessary code, ensuring proper formatting and line breaks.\n5. Wrap your code solution in <answer> tags.\n\nYour response should always include both the reasoning and the answer. Pay special attention to completing partial words or lines before adding new lines of code.\n\n<examples>\n<example>\nUser input:\n--main.py--\n# A function that reads in user inpu<CURSOR>\n\nResponse:\n<reasoning>\n1. The cursor is positioned after \"inpu\" in a comment describing a function that reads user input.\n2. We need to complete the word \"input\" in the comment first.\n3. After completing the comment, we should add a new line before defining the function.\n4. The function should use Python's built-in `input()` function to read user input.\n5. We'll name the function descriptively and include a return statement.\n</reasoning>\n\n<answer>t\ndef read_user_input():\n user_input = input(\"Enter your input: \")\n return user_input\n</answer>\n</example>\n\n<example>\nUser input:\n--main.py--\ndef fibonacci(n):\n if n <= 1:\n return n\n else:\n re<CURSOR>\n\n\nResponse:\n<reasoning>\n1. The cursor is positioned after \"re\" in the 'else' clause of a recursive Fibonacci function.\n2. We need to complete the return statement for the recursive case.\n3. The \"re\" already present likely stands for \"return\", so we'll continue from there.\n4. The Fibonacci sequence is the sum of the two preceding numbers.\n5. We should return the sum of fibonacci(n-1) and fibonacci(n-2).\n</reasoning>\n\n<answer>turn fibonacci(n-1) + fibonacci(n-2)</answer>\n</example>\n</examples>"}
# post_process = { extractor = "(?s)<answer>(.*?)</answer>" }
# [[language-server.lsp-ai.config.actions]]
# action_display_name = "Refactor (Sonnet 󰤇)"
# model = "sonnet"
# parameters = { max_context = 4096, max_tokens = 4096, messages = [{ role = "user", content = "{SELECTED_TEXT}" }], system = "You are an AI coding assistant specializing in code refactoring. Your task is to analyze the given code snippet and provide a refactored version. Follow these steps:\n\n1. Analyze the code context and structure.\n2. Identify areas for improvement, such as code efficiency, readability, or adherence to best practices.\n3. Provide your chain of thought reasoning, wrapped in <reasoning> tags. Include your analysis of the current code and explain your refactoring decisions.\n4. Rewrite the entire code snippet with your refactoring applied.\n5. Wrap your refactored code solution in <answer> tags.\n\nYour response should always include both the reasoning and the refactored code.\n\n<examples>\n<example>\nUser input:\ndef calculate_total(items):\n total = 0\n for item in items:\n total = total + item['price'] * item['quantity']\n return total\n\n\nResponse:\n<reasoning>\n1. The function calculates the total cost of items based on price and quantity.\n2. We can improve readability and efficiency by:\n a. Using a more descriptive variable name for the total.\n b. Utilizing the sum() function with a generator expression.\n c. Using augmented assignment (+=) if we keep the for loop.\n3. We'll implement the sum() function approach for conciseness.\n4. We'll add a type hint for better code documentation.\n</reasoning>\n<answer>\nfrom typing import List, Dict\n\ndef calculate_total(items: List[Dict[str, float]]) -> float:\n return sum(item['price'] * item['quantity'] for item in items)\n</answer>\n</example>\n\n<example>\nUser input:\ndef is_prime(n):\n if n < 2:\n return False\n for i in range(2, n):\n if n % i == 0:\n return False\n return True\n\n\nResponse:\n<reasoning>\n1. This function checks if a number is prime, but it's not efficient for large numbers.\n2. We can improve it by:\n a. Adding an early return for 2, the only even prime number.\n b. Checking only odd numbers up to the square root of n.\n c. Using a more efficient range (start at 3, step by 2).\n3. We'll also add a type hint for better documentation.\n4. The refactored version will be more efficient for larger numbers.\n</reasoning>\n<answer>\nimport math\n\ndef is_prime(n: int) -> bool:\n if n < 2:\n return False\n if n == 2:\n return True\n if n % 2 == 0:\n return False\n \n for i in range(3, int(math.sqrt(n)) + 1, 2):\n if n % i == 0:\n return False\n return True\n</answer>\n</example>\n</examples>" }
# post_process = { extractor = "(?s)<answer>(.*?)</answer>" }
# [[language-server.lsp-ai.config.actions]]
# action_display_name = "Refactor (Haiku 󰾆)"
# model = "haiku"
# parameters = { max_context = 4096, max_tokens = 4096, messages = [{ role = "user", content = "{SELECTED_TEXT}" }], system = "You are an AI coding assistant specializing in code refactoring. Your task is to analyze the given code snippet and provide a refactored version. Follow these steps:\n\n1. Analyze the code context and structure.\n2. Identify areas for improvement, such as code efficiency, readability, or adherence to best practices.\n3. Provide your chain of thought reasoning, wrapped in <reasoning> tags. Include your analysis of the current code and explain your refactoring decisions.\n4. Rewrite the entire code snippet with your refactoring applied.\n5. Wrap your refactored code solution in <answer> tags.\n\nYour response should always include both the reasoning and the refactored code.\n\n<examples>\n<example>\nUser input:\ndef calculate_total(items):\n total = 0\n for item in items:\n total = total + item['price'] * item['quantity']\n return total\n\n\nResponse:\n<reasoning>\n1. The function calculates the total cost of items based on price and quantity.\n2. We can improve readability and efficiency by:\n a. Using a more descriptive variable name for the total.\n b. Utilizing the sum() function with a generator expression.\n c. Using augmented assignment (+=) if we keep the for loop.\n3. We'll implement the sum() function approach for conciseness.\n4. We'll add a type hint for better code documentation.\n</reasoning>\n<answer>\nfrom typing import List, Dict\n\ndef calculate_total(items: List[Dict[str, float]]) -> float:\n return sum(item['price'] * item['quantity'] for item in items)\n</answer>\n</example>\n\n<example>\nUser input:\ndef is_prime(n):\n if n < 2:\n return False\n for i in range(2, n):\n if n % i == 0:\n return False\n return True\n\n\nResponse:\n<reasoning>\n1. This function checks if a number is prime, but it's not efficient for large numbers.\n2. We can improve it by:\n a. Adding an early return for 2, the only even prime number.\n b. Checking only odd numbers up to the square root of n.\n c. Using a more efficient range (start at 3, step by 2).\n3. We'll also add a type hint for better documentation.\n4. The refactored version will be more efficient for larger numbers.\n</reasoning>\n<answer>\nimport math\n\ndef is_prime(n: int) -> bool:\n if n < 2:\n return False\n if n == 2:\n return True\n if n % 2 == 0:\n return False\n \n for i in range(3, int(math.sqrt(n)) + 1, 2):\n if n % i == 0:\n return False\n return True\n</answer>\n</example>\n</examples>" }
# post_process = { extractor = "(?s)<answer>(.*?)</answer>" }

View File

@ -1,131 +0,0 @@
# Based on onedarker.toml https://github.com/helix-editor/helix/blob/master/runtime/themes/onedarker.toml
# Original Author : nuid32 <lvkuzvesov@proton.me>
# Recoloring: Akselmo <akselmo@akselmo.dev>
"attribute" = { fg = "orange" }
"comment" = { fg = "light-gray", modifiers = ["italic"] }
"constant" = { fg = "cyan", modifiers = ["bold"] }
"constant.numeric" = { fg = "orange", modifiers=["bold"]}
"constant.builtin" = { fg = "blue", modifiers = ["bold"] }
"constant.character.escape" = { fg = "yellow" }
"constructor" = { fg = "blue", modifiers=["bold"]}
"function" = { fg = "purple", modifiers = ["bold"] }
"function.method" = { fg = "purple", modifiers = ["bold"] }
"function.builtin" = { fg = "cyan" }
"function.macro" = { fg = "purple", modifiers = ["bold"] }
"function.special" = { fg = "magenta", modifiers = ["bold"] }
"keyword" = { fg = "blue", modifiers=["bold"]}
"keyword.control" = { fg = "light-green", modifiers= ["italic"] }
"keyword.control.import" = { fg = "magenta" }
"keyword.directive" = { fg = "yellow", modifiers=["bold"] }
"keyword.storage" = {fg ="blue", modifiers=["bold"]}
"keyword.storage.type" = { fg = "blue", modifiers=["bold"]}
"keyword.storage.modifier" = { fg="purple", modifiers=["italic"]}
"keyword.function" = {fg = "blue", modifiers=["bold"]}
"label" = { fg = "purple" }
"namespace" = { fg = "cyan" }
"operator" = { fg = "light-green" }
"punctuation" = { fg = "light-green" }
"keyword.operator" = { fg = "light-green" }
"special" = { fg = "magenta", modifiers=["italic"] }
"string" = { fg = "green" }
"type" = { fg = "cyan" }
"variable" = { fg = "white" }
"variable.builtin" = { fg = "yellow", modifiers = ["italic"] }
"variable.parameter" = { fg = "orange" }
"variable.other.member" = { fg = "orange" }
"string.special" = { fg = "yellow"}
"string.symbol" = { fg = "magenta"}
"markup.heading" = { fg = "blue", modifiers = ["bold"] }
"markup.heading.marker" = {fg = "cyan"}
"markup.raw.inline" = { fg = "green" }
"markup.raw.block" = { fg = "yellow" }
"markup.bold" = { modifiers = ["bold"] }
"markup.italic" = { modifiers = ["italic"] }
"markup.strikethrough" = { modifiers = ["crossed_out"] }
"markup.list.unchecked" = { fg = "red" }
"markup.list.checked" = { fg = "green"}
"markup.quote" = { fg = "green" }
"markup.link.url" = { fg = "blue", modifiers = ["underlined"]}
"markup.link.text" = { fg = "white" }
"markup.link.label" = { fg = "purple" }
"diff.plus" = "green"
"diff.delta" = "orange"
"diff.minus" = "red"
"diagnostic.info".underline = { color = "blue", style = "curl" }
"diagnostic.hint".underline = { color = "green", style = "curl" }
"diagnostic.warning".underline = { color = "orange", style = "curl" }
"diagnostic.error".underline = { color = "red", style = "curl" }
"info" = { fg = "blue", modifiers = ["bold"] }
"hint" = { fg = "green", modifiers = ["bold"] }
"warning" = { fg = "orange", modifiers = ["bold"] }
"error" = { fg = "red", modifiers = ["bold"] }
"ui.background" = { bg = "background" }
"ui.virtual" = { fg = "faint-gray" }
"ui.virtual.indent-guide" = { fg = "faint-gray" }
"ui.virtual.whitespace" = { fg = "faint-gray" }
"ui.virtual.ruler" = { bg = "gray" }
"ui.cursor" = { fg = "white", modifiers = ["reversed"] }
"ui.cursor.primary" = { fg = "white", modifiers = ["reversed"] }
"ui.cursor.match" = { fg = "blue", modifiers = ["underlined"]}
"ui.selection" = { bg = "selection" }
"ui.cursorline" = { bg = "dark-background" }
"ui.gutter" = {bg="dark-background"}
"ui.linenr" = { fg = "linenr" }
"ui.linenr.selected" = { bg = "light-green", fg="background" }
"ui.statusline" = { fg = "white", bg = "light-background" }
"ui.statusline.inactive" = { fg = "light-gray", bg = "light-background" }
"ui.statusline.normal" = { fg = "light-background", bg = "purple", modifiers = ["bold"] }
"ui.statusline.insert" = { fg = "light-background", bg = "orange" , modifiers = ["bold"] }
"ui.statusline.select" = { fg = "light-background", bg = "green" , modifiers = ["bold"] }
"ui.text" = { fg = "white" }
"ui.text.focus" = { fg = "blue", bg = "gray", modifiers = ["bold"] }
"ui.help" = { fg = "white", bg = "gray" }
"ui.debug" = { fg = "red" }
"ui.debug.active" = { bg ="red", fg="dark-background" }
"ui.highlight.frameline" = { bg = "dark-background", fg="red", modifiers=["bold"] }
"ui.popup" = { bg = "light-background" }
"ui.window" = { fg = "gray" }
"ui.menu" = { fg = "white", bg = "gray" }
"ui.menu.selected" = { fg = "background", bg = "blue" }
"ui.menu.scroll" = { fg = "white", bg = "light-gray" }
"ui.virtual.inlay-hint" = { fg = "light-gray", bg = "virtual-background", modifiers = ["italic"] }
"ui.virtual.jump-label" = {fg="light-green", bg = "virtual-background", modifiers = ["bold"]}
"ui.bufferline" = { fg = "white", bg = "background" }
"ui.bufferline.active" = { fg = "background", bg = "light-green", modifiers=["bold"] }
[palette]
selection = "#144364"
blue = "#33bbff"
red = "#ff3344"
purple = "#838fff"
green = "#00ee00"
orange = "#ff9233"
cyan = "#33ffff"
white = "#FFFFFF"
dark-background = "#191919"
background = "#202020"
light-background = "#282828"
virtual-background = "#252525"
gray = "#353535"
faint-gray = "#454545"
light-gray = "#808080"
linenr = "#E0E0E0"
light-green = "#33ffa0"
magenta = "#d970ff"
yellow = "#ffe033"

View File

Before

Width:  |  Height:  |  Size: 376 KiB

After

Width:  |  Height:  |  Size: 376 KiB

View File

@ -2,6 +2,12 @@
//
// See `man 5 niri` for the complete list of options.
output "eDP-1"{
scale 1.0
variable-refresh-rate
// transform "90"
}
input {
keyboard {
xkb {
@ -223,15 +229,15 @@ binds {
Mod+8 { focus-workspace 8; }
Mod+9 { focus-workspace 9; }
Mod+Minus { focus-workspace "scratch"; }
Mod+Ctrl+1 { move-column-to-workspace 1; }
Mod+Ctrl+2 { move-column-to-workspace 2; }
Mod+Ctrl+3 { move-column-to-workspace 3; }
Mod+Ctrl+4 { move-column-to-workspace 4; }
Mod+Ctrl+5 { move-column-to-workspace 5; }
Mod+Ctrl+6 { move-column-to-workspace 6; }
Mod+Ctrl+7 { move-column-to-workspace 7; }
Mod+Ctrl+8 { move-column-to-workspace 8; }
Mod+Ctrl+9 { move-column-to-workspace 9; }
Mod+Shift+1 { move-column-to-workspace 1; }
Mod+Shift+2 { move-column-to-workspace 2; }
Mod+Shift+3 { move-column-to-workspace 3; }
Mod+Shift+4 { move-column-to-workspace 4; }
Mod+Shift+5 { move-column-to-workspace 5; }
Mod+Shift+6 { move-column-to-workspace 6; }
Mod+Shift+7 { move-column-to-workspace 7; }
Mod+Shift+8 { move-column-to-workspace 8; }
Mod+Shift+9 { move-column-to-workspace 9; }
Mod+Comma { consume-window-into-column; }
Mod+Period { expel-window-from-column; }

View File

@ -1,4 +1,4 @@
{ inputs, config, pkgs, ... }:
{ inputs, config, pkgs, lib, ... }:
let
userName = "nate";
fullName = "Nate Anderson";
@ -125,17 +125,45 @@
recursive
];
# Home Manager is pretty good at managing dotfiles. The primary way to manage
# plain files is through 'home.file'.
# Using mkOutOfStoreSymlink for specific directories to allow direct editing without rebuilds
# while still allowing other home-manager modules to write to .config
#
# Dotfiles
#
# Static symlinks
home.file = lib.mkMerge [
# Shared dotfiles
(let
sharedDotfilesPath = ../../../shared/dotfiles;
in
if builtins.pathExists sharedDotfilesPath then
builtins.listToAttrs (map (name: {
name = "${config.xdg.configHome}/${name}";
value = { source = sharedDotfilesPath + "/${name}"; };
}) (builtins.attrNames (builtins.readDir sharedDotfilesPath)))
else {})
# Add local dotfiles, overriding from local over shared
(let
localDotfilesPath = ../../dotfiles;
in
if builtins.pathExists localDotfilesPath && builtins.readDir localDotfilesPath != {} then
builtins.listToAttrs (map (name: {
name = "${config.xdg.configHome}/${name}";
value = { source = localDotfilesPath + "/${name}"; };
}) (builtins.attrNames (builtins.readDir localDotfilesPath)))
else {})
{
".icons/default/index.theme".text = ''
[icon theme]
Inherits=Catppuccin-Macchiato-Lavender-Cursors
'';
}
];
# Active symlinks
xdg.configFile = {
"niri".source = config.lib.file.mkOutOfStoreSymlink "/home/nate/nixos/frame12/dotfiles/niri";
"ghostty".source = config.lib.file.mkOutOfStoreSymlink "/home/nate/nixos/frame12/dotfiles/ghostty";
"helix".source = config.lib.file.mkOutOfStoreSymlink "/home/nate/nixos/frame12/dotfiles/helix";
"waybar".source = config.lib.file.mkOutOfStoreSymlink "/home/nate/nixos/frame12/dotfiles/waybar";
"swaync".source = config.lib.file.mkOutOfStoreSymlink "/home/nate/nixos/frame12/dotfiles/swaync";
"keepassxc".source = config.lib.file.mkOutOfStoreSymlink "/home/nate/nixos/frame12/dotfiles/keepassxc";
"niri".source = config.lib.file.mkOutOfStoreSymlink "/home/nate/nixos/frame12/linked-dotfiles/niri";
"waybar".source = config.lib.file.mkOutOfStoreSymlink "/home/nate/nixos/frame12/linked-dotfiles/waybar";
"helix".source = config.lib.file.mkOutOfStoreSymlink "/home/nate/nixos/shared/linked-dotfiles/helix";
# Theme configuration
"gtk-4.0/assets".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/assets";
@ -179,6 +207,10 @@
bash.enable = true; # see note on other shells below
};
# enable saving ssh secrets (needed for go mod installing private packages)
services.gnome-keyring.enable = true;
services.gnome-keyring.components = [ "ssh" "secrets" ];
# Zsh setup
programs.zsh = {
enable = true;
@ -189,7 +221,6 @@
};
initContent = ''
eval "$(direnv hook zsh)"
export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/ssh-agent
yt-audio() {
nix-shell -p yt-dlp --run "yt-dlp -x $1 --audio-format mp3"
@ -237,12 +268,6 @@
};
};
home.file.".icons/default/index.theme".text = ''
[icon theme]
Inherits=Catppuccin-Macchiato-Lavender-Cursors
'';
services.wlsunset = {
enable = true;
sunrise = "07:00";
@ -254,4 +279,7 @@
enable = true;
indicator = true;
};
# Enable bluetooth headphone controls
services.mpris-proxy.enable = true;
}

View File

@ -168,7 +168,15 @@
# Necessary for home-manager niri setup
security.polkit.enable = true;
hardware.bluetooth.enable = true; # enables support for Bluetooth
hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot
hardware.bluetooth = {
enable = true; # enables support for Bluetooth
powerOnBoot = true; # powers up the default Bluetooth controller on boot
settings = {
General = {
Enable = "Source,Sink,Media,Socket";
Experimental = true;
};
};
};
};
}