Compare commits
54 Commits
36cdaac5ad
...
claude-nvi
| Author | SHA1 | Date | |
|---|---|---|---|
| 74973c1449 | |||
| 545a5927e5 | |||
| c6b2743cf6 | |||
| 430bec1708 | |||
| d9e25eec77 | |||
| a588604d91 | |||
| d9911dd2ce | |||
| b397fab3f2 | |||
| 1246f42638 | |||
| 06fb7dd4b8 | |||
| 4b2d24e1f4 | |||
| f57d227203 | |||
| 82f904c9dc | |||
| 26b5f00643 | |||
| 31f604f8f6 | |||
| 8632e7a1bc | |||
| 0a9405ffd6 | |||
| eceaab3caf | |||
| 1dbb9c1e5d | |||
| b3e1e4e939 | |||
| 14e1f01784 | |||
| e1e300bee2 | |||
| 1418407e63 | |||
| 1e3a5d291f | |||
| a8100cf3e2 | |||
| 6c738b78e7 | |||
| 0233c339aa | |||
| 57706b7292 | |||
| 7ce3609579 | |||
| 51d0399f21 | |||
| d232d8fad6 | |||
| 413c6a4a63 | |||
| af20454965 | |||
| ae17c411d4 | |||
| f8bac5414b | |||
| b8b7f6bce7 | |||
| eb0b192b5e | |||
| f60b26c676 | |||
| 67dcddb55c | |||
| ce732af957 | |||
| 098bbbb5d2 | |||
| 61a5ef7714 | |||
| 1020a0ea2a | |||
| 32e3ee40e1 | |||
| 8295557eb4 | |||
| 1c71b8c9fc | |||
| debd25f8f8 | |||
| 43f1023449 | |||
| 2b035eb415 | |||
| ec595c6f52 | |||
| 2326ac1e78 | |||
| 14abad0b98 | |||
| f5ffa8b9d1 | |||
| 7b9eac546b |
@@ -8,19 +8,24 @@ Pomodoro timer
|
|||||||
- Notification on break finish
|
- Notification on break finish
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import os
|
|
||||||
import atexit
|
import atexit
|
||||||
|
import os
|
||||||
from argparse import ArgumentParser
|
from argparse import ArgumentParser
|
||||||
from time import sleep
|
from time import sleep
|
||||||
|
|
||||||
from plyer import notification
|
from plyer import notification
|
||||||
|
|
||||||
POMO_PATH = os.path.join(os.getenv("XDG_DATA_HOME", os.path.expanduser("~/.local/share")), "pomo")
|
POMO_PATH = os.path.join(
|
||||||
|
os.getenv("XDG_DATA_HOME", os.path.expanduser("~/.local/share")), "pomo"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
@atexit.register
|
@atexit.register
|
||||||
def clear():
|
def clear():
|
||||||
if os.path.exists(POMO_PATH):
|
if os.path.exists(POMO_PATH):
|
||||||
os.remove(POMO_PATH)
|
os.remove(POMO_PATH)
|
||||||
|
|
||||||
|
|
||||||
def format_mins_secs(mins, secs):
|
def format_mins_secs(mins, secs):
|
||||||
return f"{mins:02d}:{secs:02d}"
|
return f"{mins:02d}:{secs:02d}"
|
||||||
|
|
||||||
@@ -34,6 +39,7 @@ def make_countdown():
|
|||||||
os.system(f'echo -n "{time_str}" > {POMO_PATH}')
|
os.system(f'echo -n "{time_str}" > {POMO_PATH}')
|
||||||
sleep(1)
|
sleep(1)
|
||||||
duration -= 1
|
duration -= 1
|
||||||
|
|
||||||
return countdown
|
return countdown
|
||||||
|
|
||||||
|
|
||||||
@@ -58,21 +64,23 @@ def main(args):
|
|||||||
def handle_signal(signal, frame):
|
def handle_signal(signal, frame):
|
||||||
# Wait for clear to finish
|
# Wait for clear to finish
|
||||||
clear()
|
clear()
|
||||||
print('Exiting')
|
print("Exiting")
|
||||||
exit(0)
|
exit(0)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == "__main__":
|
||||||
|
|
||||||
parser = ArgumentParser()
|
parser = ArgumentParser()
|
||||||
parser.add_argument('-w', '--work-duration', type=int,
|
parser.add_argument(
|
||||||
help='Session duration', default=25)
|
"-w", "--work-duration", type=int, help="Session duration", default=25
|
||||||
parser.add_argument('-b', '--break-duration', type=int,
|
)
|
||||||
help='Break duration', default=5)
|
parser.add_argument(
|
||||||
parser.add_argument('-r', '--repeats', type=int,
|
"-b", "--break-duration", type=int, help="Break duration", default=5
|
||||||
help='Numer of sessions', default=1)
|
)
|
||||||
parser.add_argument('-c', '--clear', action='store_true',
|
parser.add_argument(
|
||||||
help='Clear timer')
|
"-r", "--repeats", type=int, help="Numer of sessions", default=1
|
||||||
|
)
|
||||||
|
parser.add_argument("-c", "--clear", action="store_true", help="Clear timer")
|
||||||
|
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
|
|
||||||
|
|||||||
@@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
session="r5rs"
|
session="r5rs"
|
||||||
|
|
||||||
tmux attach-session -t $session || tmux new-session -s $session \; \
|
tmux attach-session -t "$session" || tmux new-session -s "$session" \; \
|
||||||
split-window -h -t $session \; \
|
split-window -h -t $session \; \
|
||||||
send-keys -t 0 "vim" C-m \; \
|
send-keys -t 1 "nvim -c \"set ft=scheme\"" C-m \; \
|
||||||
send-keys -t 1 "plt-r5rs --no-prim" C-m \; \
|
send-keys -t 2 "plt-r5rs --no-prim" C-m \; \
|
||||||
select-pane -t 0
|
select-pane -t 1
|
||||||
|
|||||||
@@ -22,4 +22,5 @@ restic -r "$RESTIC_REPOSITORY:$HOSTNAME" backup \
|
|||||||
--one-file-system \
|
--one-file-system \
|
||||||
--files-from="$HOME/.resticinclude" \
|
--files-from="$HOME/.resticinclude" \
|
||||||
--exclude-file="$HOME/.resticexclude" \
|
--exclude-file="$HOME/.resticexclude" \
|
||||||
|
--exclude-if-present=".nobackup" \
|
||||||
--verbose=3
|
--verbose=3
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
|
|
||||||
import sys
|
|
||||||
import subprocess
|
import subprocess
|
||||||
|
import sys
|
||||||
|
|
||||||
DEFAULT_TEMPERATURE = 3500
|
DEFAULT_TEMPERATURE = 3500
|
||||||
|
|
||||||
try:
|
try:
|
||||||
with open('/tmp/temperature', 'r') as temp_file:
|
with open("/tmp/temperature", "r") as temp_file:
|
||||||
current_temperature = int(temp_file.read())
|
current_temperature = int(temp_file.read())
|
||||||
except FileNotFoundError:
|
except FileNotFoundError:
|
||||||
current_temperature = DEFAULT_TEMPERATURE
|
current_temperature = DEFAULT_TEMPERATURE
|
||||||
@@ -16,7 +16,8 @@ if len(sys.argv) == 1:
|
|||||||
print(current_temperature)
|
print(current_temperature)
|
||||||
sys.exit(0)
|
sys.exit(0)
|
||||||
elif len(sys.argv) != 2:
|
elif len(sys.argv) != 2:
|
||||||
print("""
|
print(
|
||||||
|
"""
|
||||||
Usage:
|
Usage:
|
||||||
|
|
||||||
screen-temperature
|
screen-temperature
|
||||||
@@ -27,7 +28,8 @@ Usage:
|
|||||||
|
|
||||||
screen-temperature <+|-><temperature>
|
screen-temperature <+|-><temperature>
|
||||||
increase or decrease screen temperature by <temperature>
|
increase or decrease screen temperature by <temperature>
|
||||||
""")
|
"""
|
||||||
|
)
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
temperature_change = sys.argv[1]
|
temperature_change = sys.argv[1]
|
||||||
@@ -41,11 +43,10 @@ else:
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
subprocess.run(["redshift", "-O", str(new_temperature), "-P"], check=True)
|
subprocess.run(["redshift", "-O", str(new_temperature), "-P"], check=True)
|
||||||
with open('/tmp/temperature', 'w') as temp_file:
|
with open("/tmp/temperature", "w") as temp_file:
|
||||||
temp_file.write(str(new_temperature) + '\n')
|
temp_file.write(str(new_temperature) + "\n")
|
||||||
# Send notification
|
# Send notification
|
||||||
subprocess.run(
|
subprocess.run(["notify-send", str(new_temperature) + "K"])
|
||||||
["notify-send", str(new_temperature) + "K"])
|
|
||||||
except subprocess.CalledProcessError:
|
except subprocess.CalledProcessError:
|
||||||
print("Error: could not set screen temperature.")
|
print("Error: could not set screen temperature.")
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|||||||
@@ -1,144 +0,0 @@
|
|||||||
#!/usr/bin/python
|
|
||||||
|
|
||||||
import argparse
|
|
||||||
import json
|
|
||||||
import subprocess
|
|
||||||
from collections import defaultdict
|
|
||||||
|
|
||||||
|
|
||||||
def get_task_data():
|
|
||||||
command = (
|
|
||||||
"task +PENDING or +WAITING -COMPLETED -DELETED export | "
|
|
||||||
"jq '[.[] | {uuid: .uuid, id, depends: .depends, description: .description, status: .status }]'"
|
|
||||||
)
|
|
||||||
output = subprocess.check_output(command, shell=True)
|
|
||||||
return json.loads(output)
|
|
||||||
|
|
||||||
|
|
||||||
def parse_task_data(data):
|
|
||||||
dependency_graph = defaultdict(list)
|
|
||||||
task_details = {}
|
|
||||||
dependent_tasks = set()
|
|
||||||
|
|
||||||
for task in data:
|
|
||||||
task_id = task["uuid"]
|
|
||||||
task_details[task_id] = {
|
|
||||||
"id": task.get("id", "?"),
|
|
||||||
"description": task.get("description", "No description"),
|
|
||||||
"status": task.get("status", "Unknown status"),
|
|
||||||
}
|
|
||||||
if task["depends"]:
|
|
||||||
for dependency in task["depends"]:
|
|
||||||
dependency_graph[dependency].append(task_id)
|
|
||||||
dependent_tasks.add(task_id)
|
|
||||||
|
|
||||||
root_tasks = set(task_details.keys()) - dependent_tasks
|
|
||||||
return task_details, dependency_graph, root_tasks
|
|
||||||
|
|
||||||
|
|
||||||
def get_all_parents(task_id, dependency_graph):
|
|
||||||
return [
|
|
||||||
parent for parent, children in dependency_graph.items() if task_id in children
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
def build_ascii_dag(
|
|
||||||
task_id,
|
|
||||||
task_details,
|
|
||||||
dependency_graph,
|
|
||||||
prefix="",
|
|
||||||
is_last=True,
|
|
||||||
show_id=True,
|
|
||||||
visited=None,
|
|
||||||
):
|
|
||||||
if visited is None:
|
|
||||||
visited = set()
|
|
||||||
|
|
||||||
if task_id in visited:
|
|
||||||
return [f"{prefix}{'└── ' if is_last else '├── '}... (cycle detected)"]
|
|
||||||
|
|
||||||
visited.add(task_id)
|
|
||||||
|
|
||||||
task_info = task_details[task_id]
|
|
||||||
task_line = f"{prefix}{'└── ' if is_last else '├── '}{task_info['id'] + ': ' if show_id else ''}{task_info['description']} ({task_info['status']})"
|
|
||||||
lines = [task_line]
|
|
||||||
|
|
||||||
children = dependency_graph.get(task_id, [])
|
|
||||||
for idx, child in enumerate(children):
|
|
||||||
child_is_last = idx == len(children) - 1
|
|
||||||
child_prefix = prefix + (" " if is_last else "│ ")
|
|
||||||
lines.extend(
|
|
||||||
build_ascii_dag(
|
|
||||||
child,
|
|
||||||
task_details,
|
|
||||||
dependency_graph,
|
|
||||||
child_prefix,
|
|
||||||
child_is_last,
|
|
||||||
show_id,
|
|
||||||
visited.copy(),
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
return lines
|
|
||||||
|
|
||||||
|
|
||||||
def render_dependency_dag(task_details, dependency_graph, root_tasks, show_id):
|
|
||||||
dag_lines = []
|
|
||||||
global_visited = set()
|
|
||||||
|
|
||||||
def dfs(task_id, prefix="", is_last=True, visited=None):
|
|
||||||
if visited is None:
|
|
||||||
visited = set()
|
|
||||||
|
|
||||||
if task_id in visited:
|
|
||||||
return
|
|
||||||
|
|
||||||
visited.add(task_id)
|
|
||||||
global_visited.add(task_id)
|
|
||||||
|
|
||||||
task_info = task_details[task_id]
|
|
||||||
task_line = f"{prefix}{'└── ' if is_last else '├── '}{str(task_info['id']) + ': ' if show_id else ''}{task_info['description']} ({task_info['status']})"
|
|
||||||
dag_lines.append(task_line)
|
|
||||||
|
|
||||||
children = dependency_graph.get(task_id, [])
|
|
||||||
for idx, child in enumerate(children):
|
|
||||||
child_is_last = idx == len(children) - 1
|
|
||||||
child_prefix = prefix + (" " if is_last else "│ ")
|
|
||||||
dfs(child, child_prefix, child_is_last, visited.copy())
|
|
||||||
|
|
||||||
root_tasks_with_children = [
|
|
||||||
root for root in root_tasks if dependency_graph.get(root, [])
|
|
||||||
]
|
|
||||||
for root in sorted(
|
|
||||||
root_tasks_with_children,
|
|
||||||
key=lambda x: len(dependency_graph.get(x, [])),
|
|
||||||
reverse=True,
|
|
||||||
):
|
|
||||||
if root not in global_visited:
|
|
||||||
dfs(root)
|
|
||||||
dag_lines.append("")
|
|
||||||
|
|
||||||
return "\n".join(dag_lines).rstrip()
|
|
||||||
|
|
||||||
|
|
||||||
def main(args):
|
|
||||||
data = get_task_data()
|
|
||||||
task_details, dependency_graph, root_tasks = parse_task_data(data)
|
|
||||||
ascii_dag = render_dependency_dag(
|
|
||||||
task_details, dependency_graph, root_tasks, show_id=args.show_id
|
|
||||||
)
|
|
||||||
print(ascii_dag)
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
parser = argparse.ArgumentParser(
|
|
||||||
description="Generates a task dependency DAG for Taskwarrior tasks."
|
|
||||||
)
|
|
||||||
parser.add_argument(
|
|
||||||
"--show-id",
|
|
||||||
action="store_true",
|
|
||||||
default=False,
|
|
||||||
help="Include task IDs in the output.",
|
|
||||||
)
|
|
||||||
args = parser.parse_args()
|
|
||||||
main(args)
|
|
||||||
@@ -1,7 +1,9 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
current_zettel_path="$ZK_PATH/$(cat "$ZK_PATH/current-zettel.txt")"
|
||||||
|
|
||||||
if [ "$TERM_PROGRAM" = tmux ]; then
|
if [ "$TERM_PROGRAM" = tmux ]; then
|
||||||
cd ~/.zk && $EDITOR "$(cat ~/.zk/current-zettel.txt)"
|
cd "$ZK_PATH" && $EDITOR "$current_zettel_path"
|
||||||
else
|
else
|
||||||
echo 'Not in tmux'
|
echo 'Not in tmux'
|
||||||
echo 'Choose an option:'
|
echo 'Choose an option:'
|
||||||
@@ -18,12 +20,12 @@ else
|
|||||||
else
|
else
|
||||||
# Create session with a window named 'zk' and start nvim
|
# Create session with a window named 'zk' and start nvim
|
||||||
tmux new-session -s zk -n zk -d
|
tmux new-session -s zk -n zk -d
|
||||||
tmux send-keys -t zk:zk "cd ~/.zk && $EDITOR \"\$(cat ~/.zk/current-zettel.txt)\"" Enter
|
tmux send-keys -t zk:zk "cd $ZK_PATH && $EDITOR $current_zettel_path" Enter
|
||||||
tmux attach -t zk
|
tmux attach -t zk
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
2)
|
2)
|
||||||
cd ~/.zk && $EDITOR "$(cat ~/.zk/current-zettel.txt)"
|
cd "$ZK_PATH" && $EDITOR "$current_zettel_path"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo 'Not opening Zettelkasten'
|
echo 'Not opening Zettelkasten'
|
||||||
|
|||||||
1
dots/.config/nvim/after/plugin/claude-code.nvim.lua
Normal file
1
dots/.config/nvim/after/plugin/claude-code.nvim.lua
Normal file
@@ -0,0 +1 @@
|
|||||||
|
require("claude-code").setup()
|
||||||
@@ -1,16 +1,16 @@
|
|||||||
require("codecompanion").setup({
|
-- require("codecompanion").setup({
|
||||||
extensions = {
|
-- extensions = {
|
||||||
mcphub = {
|
-- mcphub = {
|
||||||
callback = "mcphub.extensions.codecompanion",
|
-- callback = "mcphub.extensions.codecompanion",
|
||||||
opts = {
|
-- opts = {
|
||||||
make_vars = true,
|
-- make_vars = true,
|
||||||
make_slash_commands = true,
|
-- make_slash_commands = true,
|
||||||
show_result_in_chat = true
|
-- show_result_in_chat = true
|
||||||
}
|
-- }
|
||||||
}
|
-- }
|
||||||
},
|
-- },
|
||||||
strategies = {
|
-- strategies = {
|
||||||
chat = { adapter = "openai" },
|
-- chat = { adapter = "openai" },
|
||||||
inline = { adapter = "openai" },
|
-- inline = { adapter = "openai" },
|
||||||
},
|
-- },
|
||||||
})
|
-- })
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
require("conform").setup({
|
require("conform").setup({
|
||||||
format_after_save = {
|
format_after_save = {
|
||||||
lsp_fallback = false,
|
lsp_fallback = true,
|
||||||
async = false,
|
async = false,
|
||||||
timeout_ms = 500,
|
timeout_ms = 500,
|
||||||
},
|
},
|
||||||
@@ -18,8 +18,8 @@ require("conform").setup({
|
|||||||
nix = { "nixfmt" },
|
nix = { "nixfmt" },
|
||||||
javascript = { "eslint_d", "eslint", "prettierd", "prettier", stop_after_first = true },
|
javascript = { "eslint_d", "eslint", "prettierd", "prettier", stop_after_first = true },
|
||||||
javascriptreact = { "eslint_d", "eslint", "prettierd", "prettier", stop_after_first = true },
|
javascriptreact = { "eslint_d", "eslint", "prettierd", "prettier", stop_after_first = true },
|
||||||
json = { "prettierd", "prettier", stop_after_first = true },
|
-- json = { "prettierd", "prettier", stop_after_first = true },
|
||||||
jsonc = { "prettierd", "prettier", stop_after_first = true },
|
-- jsonc = { "prettierd", "prettier", stop_after_first = true },
|
||||||
python = { "isort", "black" },
|
python = { "isort", "black" },
|
||||||
svelte = { "eslint_d", "prettierd", "prettier", stop_after_first = true },
|
svelte = { "eslint_d", "prettierd", "prettier", stop_after_first = true },
|
||||||
typescript = { "eslint_d", "prettierd", "prettier", stop_after_first = true },
|
typescript = { "eslint_d", "prettierd", "prettier", stop_after_first = true },
|
||||||
|
|||||||
1
dots/.config/nvim/after/plugin/fidget.nvim.lua
Normal file
1
dots/.config/nvim/after/plugin/fidget.nvim.lua
Normal file
@@ -0,0 +1 @@
|
|||||||
|
require("fidget").setup()
|
||||||
78
dots/.config/nvim/after/plugin/formatter.nvim.lua
Normal file
78
dots/.config/nvim/after/plugin/formatter.nvim.lua
Normal file
@@ -0,0 +1,78 @@
|
|||||||
|
-- require("formatter").setup({
|
||||||
|
-- logging = true,
|
||||||
|
-- filetype = {
|
||||||
|
-- typescriptreact = {
|
||||||
|
-- -- prettier
|
||||||
|
-- function()
|
||||||
|
-- return {
|
||||||
|
-- exe = "prettier",
|
||||||
|
-- args = { "--stdin-filepath", vim.api.nvim_buf_get_name(0) },
|
||||||
|
-- stdin = true,
|
||||||
|
-- }
|
||||||
|
-- end,
|
||||||
|
-- },
|
||||||
|
-- typescript = {
|
||||||
|
-- -- prettier
|
||||||
|
-- function()
|
||||||
|
-- return {
|
||||||
|
-- exe = "prettier",
|
||||||
|
-- args = { "--stdin-filepath", vim.api.nvim_buf_get_name(0) },
|
||||||
|
-- stdin = true,
|
||||||
|
-- }
|
||||||
|
-- end,
|
||||||
|
-- -- linter
|
||||||
|
-- -- function()
|
||||||
|
-- -- return {
|
||||||
|
-- -- exe = "eslint",
|
||||||
|
-- -- args = {
|
||||||
|
-- -- "--stdin-filename",
|
||||||
|
-- -- vim.api.nvim_buf_get_name(0),
|
||||||
|
-- -- "--fix",
|
||||||
|
-- -- "--cache"
|
||||||
|
-- -- },
|
||||||
|
-- -- stdin = false
|
||||||
|
-- -- }
|
||||||
|
-- -- end
|
||||||
|
-- },
|
||||||
|
-- javascript = {
|
||||||
|
-- -- prettier
|
||||||
|
-- function()
|
||||||
|
-- return {
|
||||||
|
-- exe = "prettier",
|
||||||
|
-- args = { "--stdin-filepath", vim.api.nvim_buf_get_name(0) },
|
||||||
|
-- stdin = true,
|
||||||
|
-- }
|
||||||
|
-- end,
|
||||||
|
-- },
|
||||||
|
-- javascriptreact = {
|
||||||
|
-- -- prettier
|
||||||
|
-- function()
|
||||||
|
-- return {
|
||||||
|
-- exe = "prettier",
|
||||||
|
-- args = { "--stdin-filepath", vim.api.nvim_buf_get_name(0) },
|
||||||
|
-- stdin = true,
|
||||||
|
-- }
|
||||||
|
-- end,
|
||||||
|
-- },
|
||||||
|
-- json = {
|
||||||
|
-- -- prettier
|
||||||
|
-- function()
|
||||||
|
-- return {
|
||||||
|
-- exe = "prettier",
|
||||||
|
-- args = { "--stdin-filepath", vim.api.nvim_buf_get_name(0) },
|
||||||
|
-- stdin = true,
|
||||||
|
-- }
|
||||||
|
-- end,
|
||||||
|
-- },
|
||||||
|
-- lua = {
|
||||||
|
-- -- luafmt
|
||||||
|
-- function()
|
||||||
|
-- return {
|
||||||
|
-- exe = "luafmt",
|
||||||
|
-- args = { "--indent-count", 2, "--stdin" },
|
||||||
|
-- stdin = true,
|
||||||
|
-- }
|
||||||
|
-- end,
|
||||||
|
-- },
|
||||||
|
-- },
|
||||||
|
-- })
|
||||||
@@ -5,7 +5,9 @@ fzf.setup({ "max-perf" })
|
|||||||
vim.keymap.set("n", "<leader>f<leader>", fzf.builtin) -- Help
|
vim.keymap.set("n", "<leader>f<leader>", fzf.builtin) -- Help
|
||||||
vim.keymap.set("n", "<leader>fc", fzf.commands)
|
vim.keymap.set("n", "<leader>fc", fzf.commands)
|
||||||
vim.keymap.set("n", "<leader>ff", fzf.files)
|
vim.keymap.set("n", "<leader>ff", fzf.files)
|
||||||
vim.keymap.set("n", "<leader>fg", fzf.live_grep_native)
|
vim.keymap.set("n", "<leader>fg", function()
|
||||||
|
fzf.live_grep_native({ resume = true })
|
||||||
|
end)
|
||||||
vim.keymap.set("n", "<leader>fb", fzf.buffers)
|
vim.keymap.set("n", "<leader>fb", fzf.buffers)
|
||||||
vim.keymap.set("n", "<leader>fd", fzf.diagnostics_workspace)
|
vim.keymap.set("n", "<leader>fd", fzf.diagnostics_workspace)
|
||||||
vim.keymap.set("n", "<leader>fhe", fzf.help_tags)
|
vim.keymap.set("n", "<leader>fhe", fzf.help_tags)
|
||||||
@@ -13,4 +15,4 @@ vim.keymap.set("n", "<leader>fhi", fzf.search_history)
|
|||||||
vim.keymap.set("n", "<leader>fma", fzf.marks)
|
vim.keymap.set("n", "<leader>fma", fzf.marks)
|
||||||
vim.keymap.set("n", "<leader>fma", fzf.man_pages)
|
vim.keymap.set("n", "<leader>fma", fzf.man_pages)
|
||||||
|
|
||||||
vim.keymap.set("i", "<c-f>", fzf.complete_path)
|
vim.keymap.set("i", "<c-f>", fzf.complete_file)
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
require("image").setup({
|
-- require("image").setup({
|
||||||
backend = "kitty",
|
-- backend = "kitty",
|
||||||
kitty_method = "normal",
|
-- kitty_method = "normal",
|
||||||
processor = "magick_cli",
|
-- processor = "magick_cli",
|
||||||
integrations = {
|
-- integrations = {
|
||||||
markdown = {
|
-- markdown = {
|
||||||
filetypes = { "markdown", "pandoc" },
|
-- filetypes = { "markdown", "pandoc" },
|
||||||
},
|
-- },
|
||||||
},
|
-- },
|
||||||
})
|
-- })
|
||||||
|
|||||||
1
dots/.config/nvim/after/plugin/kubectl.nvim.lua
Normal file
1
dots/.config/nvim/after/plugin/kubectl.nvim.lua
Normal file
@@ -0,0 +1 @@
|
|||||||
|
require("kubectl").setup()
|
||||||
@@ -17,11 +17,9 @@ local servers = {
|
|||||||
format = false,
|
format = false,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
emmet_language_server = {},
|
-- emmet_language_server = {},
|
||||||
gdscript = {},
|
gdscript = {},
|
||||||
helm_ls = {
|
helm_ls = { filetypes = { "helm", "yaml.helm-values" } },
|
||||||
filetypes = { "yaml", "helm", "yaml.helm-values" },
|
|
||||||
},
|
|
||||||
hls = { filetypes = { "haskell", "lhaskell", "cabal" } },
|
hls = { filetypes = { "haskell", "lhaskell", "cabal" } },
|
||||||
html = {},
|
html = {},
|
||||||
jsonls = {
|
jsonls = {
|
||||||
@@ -65,8 +63,26 @@ local servers = {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
-- marksman = {},
|
-- marksman = {},
|
||||||
nixd = {},
|
-- TODO: This completion ain't working yet
|
||||||
|
nixd = {
|
||||||
|
nixpkgs = {
|
||||||
|
expr = "import <nixpkgs> { }",
|
||||||
|
},
|
||||||
|
formatting = {
|
||||||
|
command = { "nixfmt" },
|
||||||
|
},
|
||||||
|
options = {
|
||||||
|
home_manager = {
|
||||||
|
expr = '(builtins.getFlake "/home/hektor/.config/home-manager").homeConfigurations.work.options',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
pyright = {},
|
pyright = {},
|
||||||
|
rust_analyzer = {
|
||||||
|
settings = {
|
||||||
|
["rust-analyzer"] = {},
|
||||||
|
},
|
||||||
|
},
|
||||||
-- tsserver = {},
|
-- tsserver = {},
|
||||||
svelte = {
|
svelte = {
|
||||||
plugin = {
|
plugin = {
|
||||||
@@ -76,48 +92,43 @@ local servers = {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
tailwindcss = {},
|
tailwindcss = {},
|
||||||
-- vtsls = {},
|
terraformls = {},
|
||||||
ts_ls = {},
|
-- ts_ls = {},
|
||||||
-- vtsls = {
|
vtsls = {
|
||||||
-- maxTsServerMemory = 16384,
|
maxTsServerMemory = 16384,
|
||||||
-- filetypes = {
|
filetypes = {
|
||||||
-- "javascript",
|
"javascript",
|
||||||
-- "javascriptreact",
|
"javascriptreact",
|
||||||
-- "javascript.jsx",
|
"javascript.jsx",
|
||||||
-- "typescript",
|
"typescript",
|
||||||
-- "typescriptreact",
|
"typescriptreact",
|
||||||
-- "typescript.tsx",
|
"typescript.tsx",
|
||||||
-- },
|
},
|
||||||
-- settings = {
|
settings = {
|
||||||
-- complete_function_calls = true,
|
complete_function_calls = true,
|
||||||
-- vtsls = {
|
vtsls = {
|
||||||
-- enableMoveToFileCodeAction = true,
|
enableMoveToFileCodeAction = true,
|
||||||
-- autoUseWorkspaceTsdk = true,
|
autoUseWorkspaceTsdk = true,
|
||||||
-- experimental = {
|
experimental = { completion = { enableServerSideFuzzyMatch = true } },
|
||||||
-- completion = {
|
},
|
||||||
-- enableServerSideFuzzyMatch = true,
|
typescript = {
|
||||||
-- },
|
updateImportsOnFileMove = { enabled = "always" },
|
||||||
-- },
|
suggest = { completeFunctionCalls = true },
|
||||||
-- },
|
inlayHints = {
|
||||||
-- typescript = {
|
enumMemberValues = { enabled = true },
|
||||||
-- updateImportsOnFileMove = { enabled = "always" },
|
functionLikeReturnTypes = { enabled = true },
|
||||||
-- suggest = {
|
parameterNames = { enabled = "literals" },
|
||||||
-- completeFunctionCalls = true,
|
parameterTypes = { enabled = true },
|
||||||
-- },
|
propertyDeclarationTypes = { enabled = true },
|
||||||
-- inlayHints = {
|
variableTypes = { enabled = false },
|
||||||
-- enumMemberValues = { enabled = true },
|
},
|
||||||
-- functionLikeReturnTypes = { enabled = true },
|
},
|
||||||
-- parameterNames = { enabled = "literals" },
|
},
|
||||||
-- parameterTypes = { enabled = true },
|
},
|
||||||
-- propertyDeclarationTypes = { enabled = true },
|
|
||||||
-- variableTypes = { enabled = false },
|
|
||||||
-- },
|
|
||||||
-- },
|
|
||||||
-- },
|
|
||||||
-- },
|
|
||||||
yamlls = {
|
yamlls = {
|
||||||
settings = {
|
settings = {
|
||||||
yaml = {
|
yaml = {
|
||||||
|
validate = true,
|
||||||
schemaStore = {
|
schemaStore = {
|
||||||
-- You must disable built-in schemaStore support if you want to use
|
-- You must disable built-in schemaStore support if you want to use
|
||||||
-- this plugin and its advanced options like `ignore`.
|
-- this plugin and its advanced options like `ignore`.
|
||||||
|
|||||||
9
dots/.config/nvim/after/plugin/m_taskwarrior_d.nvim.lua
Normal file
9
dots/.config/nvim/after/plugin/m_taskwarrior_d.nvim.lua
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
require("m_taskwarrior_d").setup()
|
||||||
|
|
||||||
|
vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost" }, {
|
||||||
|
group = vim.api.nvim_create_augroup("TWTask", { clear = true }),
|
||||||
|
pattern = "*.md",
|
||||||
|
callback = function()
|
||||||
|
vim.cmd("TWSyncTasks")
|
||||||
|
end,
|
||||||
|
})
|
||||||
@@ -1 +1 @@
|
|||||||
require("mcphub").setup({})
|
-- require("mcphub").setup({})
|
||||||
|
|||||||
@@ -62,12 +62,12 @@ cmp.setup({
|
|||||||
["<CR>"] = c_l,
|
["<CR>"] = c_l,
|
||||||
}),
|
}),
|
||||||
sources = {
|
sources = {
|
||||||
{ name = "copilot", group_index = 2 },
|
|
||||||
{ name = "zk" },
|
{ name = "zk" },
|
||||||
|
{ name = "copilot", group_index = 2 },
|
||||||
{ name = "nvim_lsp", keyword_length = 8 },
|
{ name = "nvim_lsp", keyword_length = 8 },
|
||||||
{ name = "luasnip", max_item_count = 16 },
|
{ name = "luasnip", max_item_count = 16 },
|
||||||
{ name = "path" },
|
{ name = "path" },
|
||||||
{ name = "buffer", max_item_count = 8 },
|
{ name = "buffer", max_item_count = 8 },
|
||||||
},
|
},
|
||||||
window = {
|
window = {
|
||||||
completion = cmp.config.window.bordered({ border = { "┌", "─", "┐", "│", "┘", "─", "└", "│" } }),
|
completion = cmp.config.window.bordered({ border = { "┌", "─", "┐", "│", "┘", "─", "└", "│" } }),
|
||||||
|
|||||||
@@ -12,8 +12,8 @@ require("lint").linters_by_ft = {
|
|||||||
editorconfig = { "editorconfig-checker" },
|
editorconfig = { "editorconfig-checker" },
|
||||||
haskell = { "hlint" },
|
haskell = { "hlint" },
|
||||||
-- html = { "htmlhint" },
|
-- html = { "htmlhint" },
|
||||||
-- javascript = { eslint_linter },
|
javascript = { eslint_linter },
|
||||||
-- javascriptreact = { eslint_linter },
|
javascriptreact = { eslint_linter },
|
||||||
gdscript = { "gdlint" },
|
gdscript = { "gdlint" },
|
||||||
latex = { "chktex" },
|
latex = { "chktex" },
|
||||||
-- lua = { "luacheck", "selene" },
|
-- lua = { "luacheck", "selene" },
|
||||||
@@ -22,10 +22,9 @@ require("lint").linters_by_ft = {
|
|||||||
-- python = { "pylint" },
|
-- python = { "pylint" },
|
||||||
sh = { "shellcheck" },
|
sh = { "shellcheck" },
|
||||||
svelte = { eslint_linter },
|
svelte = { eslint_linter },
|
||||||
systemd = { "systemdlint" },
|
typescript = { eslint_linter },
|
||||||
-- typescript = { eslint_linter },
|
typescriptreact = { eslint_linter },
|
||||||
-- typescriptreact = { eslint_linter },
|
-- yaml = { "yamllint" },
|
||||||
yaml = { "yamllint" },
|
|
||||||
}
|
}
|
||||||
|
|
||||||
-- TODO: Wouldn't it be possible / nice to only try to load the linters when they are
|
-- TODO: Wouldn't it be possible / nice to only try to load the linters when they are
|
||||||
|
|||||||
9
dots/.config/nvim/after/plugin/obsidian-nvim.lua
Normal file
9
dots/.config/nvim/after/plugin/obsidian-nvim.lua
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
require("obsidian").setup({
|
||||||
|
legacy_commands = false,
|
||||||
|
workspaces = {
|
||||||
|
{
|
||||||
|
name = "test",
|
||||||
|
path = "~/zk/work",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
@@ -10,7 +10,7 @@ local is_nix = nixCatsUtils.isNixCats
|
|||||||
treesitter_configs.setup({
|
treesitter_configs.setup({
|
||||||
-- Basically added what I might need from the docs
|
-- Basically added what I might need from the docs
|
||||||
-- <https://github.com/nvim-treesitter/nvim-treesitter?tab=readme-ov-file#supported-languages>
|
-- <https://github.com/nvim-treesitter/nvim-treesitter?tab=readme-ov-file#supported-languages>
|
||||||
ensure_installed = {
|
ensure_installed = is_nix and {} or {
|
||||||
"awk",
|
"awk",
|
||||||
"bash",
|
"bash",
|
||||||
"bibtex",
|
"bibtex",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
vim.cmd([[
|
vim.cmd([[
|
||||||
" Change local buffer to directory of current file after the plugin has loaded
|
" " Change local buffer to directory of current file after the plugin has loaded
|
||||||
autocmd VimEnter * lcd %:p:h
|
" autocmd VimEnter * lcd %:p:h
|
||||||
|
|
||||||
" " Override wiki index mapping to also cd into the wiki
|
" " Override wiki index mapping to also cd into the wiki
|
||||||
nm <leader>ww <plug>(wiki-index)
|
nm <leader>ww <plug>(wiki-index)
|
||||||
|
|||||||
35
dots/.config/nvim/flake.lock
generated
35
dots/.config/nvim/flake.lock
generated
@@ -2,11 +2,11 @@
|
|||||||
"nodes": {
|
"nodes": {
|
||||||
"nixCats": {
|
"nixCats": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764009888,
|
"lastModified": 1765766809,
|
||||||
"narHash": "sha256-hJekfTiW1792txgRSM4LcHnz1lDSY87LYbsJEn2V378=",
|
"narHash": "sha256-3Xp41+Sb1zIzASa1Uu1k1RMUoJ9CGyYb0GtvvpRPBqg=",
|
||||||
"owner": "BirdeeHub",
|
"owner": "BirdeeHub",
|
||||||
"repo": "nixCats-nvim",
|
"repo": "nixCats-nvim",
|
||||||
"rev": "16ac3281f322ea15d39843829e42a44d22da3715",
|
"rev": "fe157e3ed69ed14b55ca81f597eac282caed58a2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -17,11 +17,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764733908,
|
"lastModified": 1765934234,
|
||||||
"narHash": "sha256-QJiih52NU+nm7XQWCj+K8SwUdIEayDQ1FQgjkYISt4I=",
|
"narHash": "sha256-pJjWUzNnjbIAMIc5gRFUuKCDQ9S1cuh3b2hKgA7Mc4A=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "cadcc8de247676e4751c9d4a935acb2c0b059113",
|
"rev": "af84f9d270d404c17699522fab95bbf928a2d92f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -79,14 +79,30 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"plugins-m-taskwarrior-d-nvim": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1764933759,
|
||||||
|
"narHash": "sha256-4lN/ZQTQ7uMcpjePbf2k913Bs9AYYS6da3iZbckA6oI=",
|
||||||
|
"owner": "huantrinh1802",
|
||||||
|
"repo": "m_taskwarrior_d.nvim",
|
||||||
|
"rev": "279d2c8bcd2779500c1bea71fb9249c97cdb503b",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "huantrinh1802",
|
||||||
|
"repo": "m_taskwarrior_d.nvim",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"plugins-mcphub-nvim": {
|
"plugins-mcphub-nvim": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1759035242,
|
"lastModified": 1765628564,
|
||||||
"narHash": "sha256-I6EbgY/2sAdtrxtmH0qbAAQvMCHhOsfolJfblV0fXOk=",
|
"narHash": "sha256-nvWqCGRKhbUHsAM/zd+cwFdcoXXxf6EmcCkpN4mElf4=",
|
||||||
"owner": "ravitemer",
|
"owner": "ravitemer",
|
||||||
"repo": "mcphub.nvim",
|
"repo": "mcphub.nvim",
|
||||||
"rev": "8ff40b5edc649959bb7e89d25ae18e055554859a",
|
"rev": "5193329d510a68f1f5bf189960642c925c177a3a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -150,6 +166,7 @@
|
|||||||
"plugins-beancount-nvim": "plugins-beancount-nvim",
|
"plugins-beancount-nvim": "plugins-beancount-nvim",
|
||||||
"plugins-crazy-node-movement": "plugins-crazy-node-movement",
|
"plugins-crazy-node-movement": "plugins-crazy-node-movement",
|
||||||
"plugins-helm-ls-nvim": "plugins-helm-ls-nvim",
|
"plugins-helm-ls-nvim": "plugins-helm-ls-nvim",
|
||||||
|
"plugins-m-taskwarrior-d-nvim": "plugins-m-taskwarrior-d-nvim",
|
||||||
"plugins-mcphub-nvim": "plugins-mcphub-nvim",
|
"plugins-mcphub-nvim": "plugins-mcphub-nvim",
|
||||||
"plugins-nvimkit-nvim": "plugins-nvimkit-nvim",
|
"plugins-nvimkit-nvim": "plugins-nvimkit-nvim",
|
||||||
"plugins-shipwright-nvim": "plugins-shipwright-nvim",
|
"plugins-shipwright-nvim": "plugins-shipwright-nvim",
|
||||||
|
|||||||
@@ -7,6 +7,10 @@
|
|||||||
url = "github:rktjmp/shipwright.nvim";
|
url = "github:rktjmp/shipwright.nvim";
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
|
plugins-m-taskwarrior-d-nvim = {
|
||||||
|
url = "github:huantrinh1802/m_taskwarrior_d.nvim";
|
||||||
|
flake = false;
|
||||||
|
};
|
||||||
plugins-crazy-node-movement = {
|
plugins-crazy-node-movement = {
|
||||||
url = "github:theHamsta/crazy-node-movement";
|
url = "github:theHamsta/crazy-node-movement";
|
||||||
flake = false;
|
flake = false;
|
||||||
@@ -65,14 +69,15 @@
|
|||||||
gawk
|
gawk
|
||||||
gdtoolkit_4
|
gdtoolkit_4
|
||||||
isort
|
isort
|
||||||
tree-sitter
|
|
||||||
ormolu
|
|
||||||
nodePackages.prettier
|
|
||||||
nixd
|
nixd
|
||||||
nixfmt
|
nixfmt
|
||||||
|
nodePackages.prettier
|
||||||
|
ormolu
|
||||||
prettierd
|
prettierd
|
||||||
|
rustfmt
|
||||||
shellcheck-minimal
|
shellcheck-minimal
|
||||||
stylua
|
stylua
|
||||||
|
tree-sitter
|
||||||
vscode-langservers-extracted
|
vscode-langservers-extracted
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
@@ -143,7 +148,11 @@
|
|||||||
copilot-lua
|
copilot-lua
|
||||||
copilot-cmp
|
copilot-cmp
|
||||||
pkgs.neovimPlugins.helm-ls-nvim
|
pkgs.neovimPlugins.helm-ls-nvim
|
||||||
pkgs.vimPlugins.kitty-scrollback-nvim
|
kitty-scrollback-nvim
|
||||||
|
fidget-nvim
|
||||||
|
rustaceanvim
|
||||||
|
pkgs.neovimPlugins.m-taskwarrior-d-nvim
|
||||||
|
claude-code-nvim
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
1
dots/.config/nvim/ftplugin/dotenv.lua
Normal file
1
dots/.config/nvim/ftplugin/dotenv.lua
Normal file
@@ -0,0 +1 @@
|
|||||||
|
vim.opt_local.filetype = "sh"
|
||||||
@@ -20,6 +20,7 @@ require("statusline")
|
|||||||
require("diagnostic")
|
require("diagnostic")
|
||||||
require("utils")
|
require("utils")
|
||||||
require("zk")
|
require("zk")
|
||||||
|
require("skeleton")
|
||||||
require("reload")
|
require("reload")
|
||||||
|
|
||||||
require("paq-setup") -- when not on nixCats
|
require("paq-setup") -- when not on nixCats
|
||||||
|
|||||||
@@ -34,13 +34,17 @@ require("nixCatsUtils.catPacker").setup({
|
|||||||
{ "razak17/tailwind-fold.nvim" },
|
{ "razak17/tailwind-fold.nvim" },
|
||||||
{ "rmagatti/auto-session" },
|
{ "rmagatti/auto-session" },
|
||||||
{ "kndndrj/nvim-dbee" },
|
{ "kndndrj/nvim-dbee" },
|
||||||
{ "3rd/image.nvim", build = false },
|
-- { "3rd/image.nvim", build = false },
|
||||||
{ "polarmutex/beancount.nvim" },
|
{ "polarmutex/beancount.nvim" },
|
||||||
{ "jamesblckwell/nvimkit.nvim" },
|
-- { "jamesblckwell/nvimkit.nvim" },
|
||||||
{ 'olimorris/codecompanion.nvim' },
|
{ "olimorris/codecompanion.nvim" },
|
||||||
{ "ravitemer/mcphub.nvim", build = "pnpm install -g mcp-hub@latest" },
|
{ "ravitemer/mcphub.nvim", build = "pnpm install -g mcp-hub@latest" },
|
||||||
{ "zbirenbaum/copilot.lua" },
|
{ "zbirenbaum/copilot.lua" },
|
||||||
{ "zbirenbaum/copilot-cmp" },
|
{ "zbirenbaum/copilot-cmp" },
|
||||||
{ "qvalentin/helm-ls.nvim", ft = "helm" },
|
{ "qvalentin/helm-ls.nvim", ft = "helm" },
|
||||||
|
{ "saghen/blink.download" },
|
||||||
|
{ "ramilito/kubectl.nvim" },
|
||||||
{ "mikesmithgh/kitty-scrollback.nvim" },
|
{ "mikesmithgh/kitty-scrollback.nvim" },
|
||||||
|
{ "chrisgrieser/nvim-early-retirement" },
|
||||||
|
{ "euclio/vim-markdown-composer" },
|
||||||
})
|
})
|
||||||
|
|||||||
59
flake.lock
generated
59
flake.lock
generated
@@ -29,11 +29,11 @@
|
|||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "pkgs/firefox-addons",
|
"dir": "pkgs/firefox-addons",
|
||||||
"lastModified": 1764561884,
|
"lastModified": 1765771449,
|
||||||
"narHash": "sha256-vQ3iFPPhxsLqV3c5kgmYP53mVD6id6gsP0tN+oTmqok=",
|
"narHash": "sha256-ZoHRPmTzwC1ndX3NQB/b/WKtU1WduAJdLI4j8eW/QFM=",
|
||||||
"owner": "rycee",
|
"owner": "rycee",
|
||||||
"repo": "nur-expressions",
|
"repo": "nur-expressions",
|
||||||
"rev": "aba4621459aec251d90d6452e3495b58a8a5e185",
|
"rev": "5bcf9a2aeb4d361c2ff918a146b3fcc1e136b9ca",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -68,11 +68,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764544324,
|
"lastModified": 1765682243,
|
||||||
"narHash": "sha256-GVBGjO7UsmzLrlOJV8NlKSxukHaHencrJqWkCA6FkqI=",
|
"narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "e4e25a8c310fa45f2a8339c7972dc43d2845a612",
|
"rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -84,10 +84,10 @@
|
|||||||
"nix-secrets": {
|
"nix-secrets": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764371082,
|
"lastModified": 1765747965,
|
||||||
"narHash": "sha256-yxFxEKXFuXFyFIDZY1gla2OyuqcIE3uT8KDDgTmm3cE=",
|
"narHash": "sha256-EHZRRC3piD6vKd4hXiqC+CcDUQCOzrH/CNAF9zBqpDQ=",
|
||||||
"ref": "main",
|
"ref": "main",
|
||||||
"rev": "b9c2ce32cc4c95d7ff01372faea2668407ef8d27",
|
"rev": "a8e8d953f579939bd72b5f5c6ed332910b598554",
|
||||||
"shallow": true,
|
"shallow": true,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "ssh://git@github.com/hektor/nix-secrets"
|
"url": "ssh://git@github.com/hektor/nix-secrets"
|
||||||
@@ -101,11 +101,11 @@
|
|||||||
},
|
},
|
||||||
"nixCats": {
|
"nixCats": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764009888,
|
"lastModified": 1765766809,
|
||||||
"narHash": "sha256-hJekfTiW1792txgRSM4LcHnz1lDSY87LYbsJEn2V378=",
|
"narHash": "sha256-3Xp41+Sb1zIzASa1Uu1k1RMUoJ9CGyYb0GtvvpRPBqg=",
|
||||||
"owner": "BirdeeHub",
|
"owner": "BirdeeHub",
|
||||||
"repo": "nixCats-nvim",
|
"repo": "nixCats-nvim",
|
||||||
"rev": "16ac3281f322ea15d39843829e42a44d22da3715",
|
"rev": "fe157e3ed69ed14b55ca81f597eac282caed58a2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -153,11 +153,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764517877,
|
"lastModified": 1765472234,
|
||||||
"narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
|
"narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
|
"rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -176,6 +176,7 @@
|
|||||||
"plugins-beancount-nvim": "plugins-beancount-nvim",
|
"plugins-beancount-nvim": "plugins-beancount-nvim",
|
||||||
"plugins-crazy-node-movement": "plugins-crazy-node-movement",
|
"plugins-crazy-node-movement": "plugins-crazy-node-movement",
|
||||||
"plugins-helm-ls-nvim": "plugins-helm-ls-nvim",
|
"plugins-helm-ls-nvim": "plugins-helm-ls-nvim",
|
||||||
|
"plugins-m-taskwarrior-d-nvim": "plugins-m-taskwarrior-d-nvim",
|
||||||
"plugins-mcphub-nvim": "plugins-mcphub-nvim",
|
"plugins-mcphub-nvim": "plugins-mcphub-nvim",
|
||||||
"plugins-nvimkit-nvim": "plugins-nvimkit-nvim",
|
"plugins-nvimkit-nvim": "plugins-nvimkit-nvim",
|
||||||
"plugins-shipwright-nvim": "plugins-shipwright-nvim",
|
"plugins-shipwright-nvim": "plugins-shipwright-nvim",
|
||||||
@@ -239,14 +240,30 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"plugins-m-taskwarrior-d-nvim": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1764933759,
|
||||||
|
"narHash": "sha256-4lN/ZQTQ7uMcpjePbf2k913Bs9AYYS6da3iZbckA6oI=",
|
||||||
|
"owner": "huantrinh1802",
|
||||||
|
"repo": "m_taskwarrior_d.nvim",
|
||||||
|
"rev": "279d2c8bcd2779500c1bea71fb9249c97cdb503b",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "huantrinh1802",
|
||||||
|
"repo": "m_taskwarrior_d.nvim",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"plugins-mcphub-nvim": {
|
"plugins-mcphub-nvim": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1759035242,
|
"lastModified": 1765628564,
|
||||||
"narHash": "sha256-I6EbgY/2sAdtrxtmH0qbAAQvMCHhOsfolJfblV0fXOk=",
|
"narHash": "sha256-nvWqCGRKhbUHsAM/zd+cwFdcoXXxf6EmcCkpN4mElf4=",
|
||||||
"owner": "ravitemer",
|
"owner": "ravitemer",
|
||||||
"repo": "mcphub.nvim",
|
"repo": "mcphub.nvim",
|
||||||
"rev": "8ff40b5edc649959bb7e89d25ae18e055554859a",
|
"rev": "5193329d510a68f1f5bf189960642c925c177a3a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -323,11 +340,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764483358,
|
"lastModified": 1765684837,
|
||||||
"narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=",
|
"narHash": "sha256-fJCnsYcpQxxy/wit9EBOK33c0Z9U4D3Tvo3gf2mvHos=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "5aca6ff67264321d47856a2ed183729271107c9c",
|
"rev": "94d8af61d8a603d33d1ed3500a33fcf35ae7d3bc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -6,14 +6,78 @@
|
|||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
username = "h";
|
||||||
|
in
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
(import ../astyanax {
|
../../modules/desktop/niri
|
||||||
inherit inputs;
|
../../modules/git.nix
|
||||||
|
../../modules/k9s.nix
|
||||||
|
(import ../../modules/taskwarrior.nix {
|
||||||
|
inherit config;
|
||||||
|
inherit pkgs;
|
||||||
|
})
|
||||||
|
(import ../../modules/keepassxc.nix { inherit pkgs; })
|
||||||
|
(import ../../modules/anki.nix {
|
||||||
inherit config;
|
inherit config;
|
||||||
inherit pkgs;
|
inherit pkgs;
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
programs.taskwarrior.config.recurrence = lib.mkForce "on";
|
home.stateVersion = "25.05";
|
||||||
|
home.username = username;
|
||||||
|
home.homeDirectory = "/home/${username}";
|
||||||
|
|
||||||
|
xdg.userDirs.createDirectories = false;
|
||||||
|
xdg.userDirs.download = "${config.home.homeDirectory}/dl";
|
||||||
|
|
||||||
|
programs = {
|
||||||
|
bash = {
|
||||||
|
enable = true;
|
||||||
|
enableCompletion = true;
|
||||||
|
initExtra = ''
|
||||||
|
for f in /home/${username}/.bashrc.d/*; do
|
||||||
|
[ -f "$f" ] && source "$f"
|
||||||
|
done
|
||||||
|
|
||||||
|
source /home/${username}/.bash_aliases/all
|
||||||
|
source /home/${username}/.bash_aliases/lang-js
|
||||||
|
|
||||||
|
# host-specific config goes here
|
||||||
|
# ...
|
||||||
|
|
||||||
|
export PATH=${../../../dots/.bin}:$PATH
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
firefox = import ../../modules/firefox.nix {
|
||||||
|
inherit inputs;
|
||||||
|
inherit pkgs;
|
||||||
|
inherit config;
|
||||||
|
};
|
||||||
|
fzf = {
|
||||||
|
enable = true;
|
||||||
|
enableBashIntegration = true;
|
||||||
|
};
|
||||||
|
home-manager.enable = true;
|
||||||
|
taskwarrior.config.recurrence = lib.mkForce "on";
|
||||||
|
};
|
||||||
|
|
||||||
|
home.packages = import ../packages.nix {
|
||||||
|
inherit pkgs;
|
||||||
|
inherit config;
|
||||||
|
};
|
||||||
|
|
||||||
|
home.file = {
|
||||||
|
".inputrc".source = ../../../dots/.inputrc;
|
||||||
|
".bashrc.d/prompt".source = ../../../dots/.bashrc.d/prompt;
|
||||||
|
".bashrc.d/editor".source = ../../../dots/.bashrc.d/editor;
|
||||||
|
".bash_aliases/all".source = ../../../dots/.bash_aliases/all;
|
||||||
|
".bash_aliases/lang-js".source = ../../../dots/.bash_aliases/lang-js;
|
||||||
|
".config/kitty/kitty.conf".source = ../../../dots/.config/kitty/kitty.conf;
|
||||||
|
".config/kitty/themes/zenwritten_light.conf".source =
|
||||||
|
../../../dots/.config/kitty/themes/zenwritten_light.conf;
|
||||||
|
".config/kitty/themes/zenwritten_dark.conf".source =
|
||||||
|
../../../dots/.config/kitty/themes/zenwritten_dark.conf;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,12 +32,12 @@ in
|
|||||||
enable = true;
|
enable = true;
|
||||||
enableCompletion = true;
|
enableCompletion = true;
|
||||||
initExtra = ''
|
initExtra = ''
|
||||||
for f in /home/h/.bashrc.d/*; do
|
for f in /home/${username}/.bashrc.d/*; do
|
||||||
[ -f "$f" ] && source "$f"
|
[ -f "$f" ] && source "$f"
|
||||||
done
|
done
|
||||||
|
|
||||||
source /home/h/.bash_aliases/all
|
source /home/${username}/.bash_aliases/all
|
||||||
source /home/h/.bash_aliases/lang-js
|
source /home/${username}/.bash_aliases/lang-js
|
||||||
|
|
||||||
# host-specific config goes here
|
# host-specific config goes here
|
||||||
# ...
|
# ...
|
||||||
@@ -57,7 +57,7 @@ in
|
|||||||
home-manager.enable = true;
|
home-manager.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
home.packages = import ./packages.nix {
|
home.packages = import ../packages.nix {
|
||||||
inherit pkgs;
|
inherit pkgs;
|
||||||
inherit config;
|
inherit config;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -3,27 +3,20 @@
|
|||||||
with pkgs;
|
with pkgs;
|
||||||
[
|
[
|
||||||
bash-completion
|
bash-completion
|
||||||
bash-language-server
|
|
||||||
bat
|
bat
|
||||||
brightnessctl
|
|
||||||
entr
|
entr
|
||||||
eslint_d
|
|
||||||
feh
|
feh
|
||||||
fzf
|
fzf
|
||||||
gh
|
gh
|
||||||
git
|
git
|
||||||
haskell-language-server
|
|
||||||
haskellPackages.pandoc-crossref
|
haskellPackages.pandoc-crossref
|
||||||
haskellPackages.hadolint
|
|
||||||
htop
|
htop
|
||||||
jq
|
jq
|
||||||
kitty
|
kitty
|
||||||
lua-language-server
|
|
||||||
nixfmt-rfc-style
|
nixfmt-rfc-style
|
||||||
nmap
|
nmap
|
||||||
nodejs_24
|
nodejs_24
|
||||||
nvimpager
|
nvimpager
|
||||||
ormolu
|
|
||||||
pandoc
|
pandoc
|
||||||
parallel
|
parallel
|
||||||
pass
|
pass
|
||||||
@@ -33,21 +26,11 @@ with pkgs;
|
|||||||
silver-searcher
|
silver-searcher
|
||||||
sops
|
sops
|
||||||
sshfs
|
sshfs
|
||||||
stylelint
|
|
||||||
svelte-language-server
|
|
||||||
tailwindcss-language-server
|
|
||||||
tldr
|
tldr
|
||||||
tmux
|
tmux
|
||||||
tmuxp
|
tmuxp
|
||||||
tree
|
tree
|
||||||
tree-sitter
|
|
||||||
typescript-language-server
|
|
||||||
unzip
|
unzip
|
||||||
vim-language-server
|
|
||||||
vimPlugins.vim-plug
|
vimPlugins.vim-plug
|
||||||
vtsls
|
|
||||||
wget
|
wget
|
||||||
xbanish
|
|
||||||
xclip
|
|
||||||
yaml-language-server
|
|
||||||
]
|
]
|
||||||
98
home/hosts/work/packages.local.nix
Normal file
98
home/hosts/work/packages.local.nix
Normal file
@@ -0,0 +1,98 @@
|
|||||||
|
{
|
||||||
|
inputs,
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
|
with pkgs;
|
||||||
|
[
|
||||||
|
age
|
||||||
|
aider-chat
|
||||||
|
argocd
|
||||||
|
azure-cli
|
||||||
|
bat
|
||||||
|
biome
|
||||||
|
(config.lib.nixGL.wrap bruno)
|
||||||
|
chromium
|
||||||
|
clang
|
||||||
|
claude-code
|
||||||
|
(config.lib.nixGL.wrap code-cursor)
|
||||||
|
curl
|
||||||
|
dconf2nix
|
||||||
|
dive
|
||||||
|
emmet-language-server
|
||||||
|
eslint_d
|
||||||
|
flameshot
|
||||||
|
fluxcd
|
||||||
|
fzf
|
||||||
|
fzf-git-sh
|
||||||
|
git-machete
|
||||||
|
github-copilot-cli
|
||||||
|
glab
|
||||||
|
go
|
||||||
|
hadolint
|
||||||
|
hello
|
||||||
|
helm-ls
|
||||||
|
htop
|
||||||
|
input-leap
|
||||||
|
jira-cli-go
|
||||||
|
jq
|
||||||
|
k3d
|
||||||
|
(config.lib.nixGL.wrap kitty)
|
||||||
|
kubectl
|
||||||
|
kubernetes
|
||||||
|
kubernetes-helm
|
||||||
|
kustomize
|
||||||
|
lua
|
||||||
|
lua-language-server
|
||||||
|
minikube
|
||||||
|
ncspot
|
||||||
|
nil
|
||||||
|
nixd
|
||||||
|
nixfmt-rfc-style
|
||||||
|
# nodejs
|
||||||
|
nodejs_24
|
||||||
|
nvimpager
|
||||||
|
(config.lib.nixGL.wrap obsidian)
|
||||||
|
pavucontrol
|
||||||
|
# pgadmin4
|
||||||
|
prettierd
|
||||||
|
responder
|
||||||
|
ripgrep
|
||||||
|
rust-analyzer
|
||||||
|
rustlings
|
||||||
|
shellcheck
|
||||||
|
(config.lib.nixGL.wrap signal-desktop)
|
||||||
|
silver-searcher
|
||||||
|
sleuthkit
|
||||||
|
spotify
|
||||||
|
starship
|
||||||
|
stylua
|
||||||
|
taskopen
|
||||||
|
taskwarrior3
|
||||||
|
(config.lib.nixGL.wrap teams-for-linux)
|
||||||
|
opentofu
|
||||||
|
sops
|
||||||
|
tldr
|
||||||
|
tmux
|
||||||
|
tree
|
||||||
|
tree-sitter
|
||||||
|
tsx
|
||||||
|
upbound
|
||||||
|
vault-bin
|
||||||
|
(config.lib.nixGL.wrap vscode)
|
||||||
|
vscode-langservers-extracted
|
||||||
|
vtsls
|
||||||
|
yaml-language-server
|
||||||
|
xclip
|
||||||
|
xmage
|
||||||
|
yamllint
|
||||||
|
yarn
|
||||||
|
(python311.withPackages (ppkgs: [
|
||||||
|
ppkgs.plyer
|
||||||
|
ppkgs.dbus-python
|
||||||
|
]))
|
||||||
|
# flakes
|
||||||
|
inputs.nvim.packages.x86_64-linux.nvim
|
||||||
|
]
|
||||||
@@ -1,6 +1,16 @@
|
|||||||
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
enable = true;
|
programs.anki = {
|
||||||
# sync = {
|
enable = true;
|
||||||
# username = config.sops.secrets."email/personal".path;
|
addons = with pkgs.ankiAddons; [
|
||||||
# };
|
anki-connect
|
||||||
|
puppy-reinforcement
|
||||||
|
review-heatmap
|
||||||
|
];
|
||||||
|
sync = {
|
||||||
|
usernameFile = "${config.sops.secrets."anki_sync_user".path}";
|
||||||
|
keyFile = "${config.sops.secrets."anki_sync_key".path}";
|
||||||
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,11 +3,16 @@
|
|||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../../fuzzel
|
../../fuzzel
|
||||||
|
../../mako
|
||||||
|
../../shikane
|
||||||
../../waybar
|
../../waybar
|
||||||
];
|
];
|
||||||
|
|
||||||
home = {
|
home = {
|
||||||
file.".config/niri/config.kdl".source = ./config.kdl;
|
file.".config/niri/config.kdl".source = ./config.kdl;
|
||||||
packages = with pkgs; [ wlsunset ];
|
packages = with pkgs; [
|
||||||
|
wl-clipboard
|
||||||
|
wlsunset
|
||||||
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,9 +5,6 @@
|
|||||||
nativeMessagingHosts = with pkgs; [
|
nativeMessagingHosts = with pkgs; [
|
||||||
tridactyl-native
|
tridactyl-native
|
||||||
];
|
];
|
||||||
policies = {
|
|
||||||
DefaultDownloadDirectory = "\${home}/dl";
|
|
||||||
};
|
|
||||||
profiles = {
|
profiles = {
|
||||||
default = {
|
default = {
|
||||||
settings = {
|
settings = {
|
||||||
@@ -57,6 +54,7 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
policies = {
|
policies = {
|
||||||
|
DefaultDownloadDirectory = "\${home}/dl";
|
||||||
ExtensionSettings = {
|
ExtensionSettings = {
|
||||||
"jid1-ZAdIEUB7XOzOJw@jetpack" = {
|
"jid1-ZAdIEUB7XOzOJw@jetpack" = {
|
||||||
default_area = "navbar";
|
default_area = "navbar";
|
||||||
|
|||||||
@@ -7,5 +7,5 @@
|
|||||||
Browser.Enabled = true;
|
Browser.Enabled = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
# programs.firefox.nativeMessagingHosts = [ pkgs.keepassxc ]; # FIXME: Resolve 'Access error for config file /home/h/.config/keepassxc/keepassxc.ini' error
|
# programs.firefox.nativeMessagingHosts = [ pkgs.keepassxc ]; # FIXME: Resolve 'Access error for config file $HOME/.config/keepassxc/keepassxc.ini' error
|
||||||
}
|
}
|
||||||
|
|||||||
5
home/modules/mako/default.nix
Normal file
5
home/modules/mako/default.nix
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
services.mako = {
|
||||||
|
enable = true;
|
||||||
|
};
|
||||||
|
}
|
||||||
6
home/modules/shikane/default.nix
Normal file
6
home/modules/shikane/default.nix
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
{ pkgs, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
home.packages = with pkgs; [ wdisplays ];
|
||||||
|
services.shikane.enable = true;
|
||||||
|
}
|
||||||
@@ -122,6 +122,7 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
|
# TODO: generate unique hostId on actual host with: head -c 8 /etc/machine-id
|
||||||
hostId = "80eef97e";
|
hostId = "80eef97e";
|
||||||
interfaces = {
|
interfaces = {
|
||||||
eno1 = {
|
eno1 = {
|
||||||
|
|||||||
@@ -42,6 +42,23 @@ in
|
|||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
|
hardware = {
|
||||||
|
cpu.intel.updateMicrocode = true;
|
||||||
|
# https://wiki.nixos.org/wiki/Intel_Graphics
|
||||||
|
graphics = {
|
||||||
|
enable = true;
|
||||||
|
extraPackages = with pkgs; [
|
||||||
|
intel-media-driver
|
||||||
|
vpl-gpu-rt
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# https://wiki.nixos.org/wiki/Intel_Graphics
|
||||||
|
environment.sessionVariables = {
|
||||||
|
LIBVA_DRIVER_NAME = "iHD";
|
||||||
|
};
|
||||||
|
|
||||||
secrets.username = username;
|
secrets.username = username;
|
||||||
|
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
@@ -66,9 +83,12 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
|
# TODO: generate unique hostId on actual host with: head -c 8 /etc/machine-id
|
||||||
hostId = "80eef97e";
|
hostId = "80eef97e";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
services.throttled.enable = false;
|
||||||
|
|
||||||
services.openssh = {
|
services.openssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
harden = true;
|
harden = true;
|
||||||
|
|||||||
@@ -9,11 +9,6 @@
|
|||||||
../../modules/ssh/hardened-openssh.nix
|
../../modules/ssh/hardened-openssh.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
vim
|
|
||||||
git
|
|
||||||
];
|
|
||||||
|
|
||||||
fileSystems."/" = {
|
fileSystems."/" = {
|
||||||
device = "/dev/disk/by-label/nixos";
|
device = "/dev/disk/by-label/nixos";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
@@ -48,6 +43,16 @@
|
|||||||
firewall.enable = true;
|
firewall.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
vim
|
||||||
|
git
|
||||||
|
];
|
||||||
|
|
||||||
|
services.fail2ban = {
|
||||||
|
enable = true;
|
||||||
|
maxretry = 5;
|
||||||
|
};
|
||||||
|
|
||||||
services.openssh = {
|
services.openssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
harden = true;
|
harden = true;
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ in
|
|||||||
./disk.nix
|
./disk.nix
|
||||||
../../modules/boot/bootloader.nix
|
../../modules/boot/bootloader.nix
|
||||||
../../modules/keyboard
|
../../modules/keyboard
|
||||||
(import ../../modules/networking.nix { hostName = "vm"; })
|
(import ../../modules/networking { hostName = "vm"; })
|
||||||
../../modules/users
|
../../modules/users
|
||||||
../../modules/audio
|
../../modules/audio
|
||||||
../../modules/localization
|
../../modules/localization
|
||||||
@@ -33,7 +33,7 @@ in
|
|||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
secrets.username = "h";
|
secrets.username = username;
|
||||||
|
|
||||||
environment.systemPackages = [ inputs.nvim.packages.x86_64-linux.nvim ];
|
environment.systemPackages = [ inputs.nvim.packages.x86_64-linux.nvim ];
|
||||||
|
|
||||||
|
|||||||
@@ -27,6 +27,8 @@ in
|
|||||||
"taskwarrior_sync_encryption_secret".owner = config.users.users.${cfg.username}.name;
|
"taskwarrior_sync_encryption_secret".owner = config.users.users.${cfg.username}.name;
|
||||||
"email_personal".owner = config.users.users.${cfg.username}.name;
|
"email_personal".owner = config.users.users.${cfg.username}.name;
|
||||||
"email_work".owner = config.users.users.${cfg.username}.name;
|
"email_work".owner = config.users.users.${cfg.username}.name;
|
||||||
|
"anki_sync_user".owner = config.users.users.${cfg.username}.name;
|
||||||
|
"anki_sync_key".owner = config.users.users.${cfg.username}.name;
|
||||||
};
|
};
|
||||||
|
|
||||||
templates."taskrc.d/sync" = {
|
templates."taskrc.d/sync" = {
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
services.xserver.windowManager.xmonad = {
|
services.xserver.windowManager.xmonad = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableContribAndExtras = true;
|
enableContribAndExtras = true;
|
||||||
config = builtins.readFile ../dots/.xmonad/xmonad.hs;
|
config = builtins.readFile ../../dots/.xmonad/xmonad.hs;
|
||||||
};
|
};
|
||||||
|
|
||||||
services.xserver = {
|
services.xserver = {
|
||||||
|
|||||||
Reference in New Issue
Block a user