diff --git a/flake.lock b/flake.lock index 9f17d0c..4ba2926 100644 --- a/flake.lock +++ b/flake.lock @@ -78,11 +78,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1752950548, - "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", + "lastModified": 1754214453, + "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", + "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", "type": "github" }, "original": { @@ -94,11 +94,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1753115646, - "narHash": "sha256-yLuz5cz5Z+sn8DRAfNkrd2Z1cV6DaYO9JMrEz4KZo/c=", + "lastModified": 1754028485, + "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "92c2e04a475523e723c67ef872d8037379073681", + "rev": "59e69648d345d6e8fef86158c555730fa12af9de", "type": "github" }, "original": { diff --git a/nate-work/dotfiles/helix/config.toml b/nate-work/dotfiles/helix/config.toml index 87b2ab6..2d6cdc0 100644 --- a/nate-work/dotfiles/helix/config.toml +++ b/nate-work/dotfiles/helix/config.toml @@ -1,5 +1,5 @@ # Theme -theme = "catppuccin_macchiato" +theme = "revontuli" [keys.normal] @@ -130,6 +130,7 @@ indent-heuristic = "tree-sitter" line-number = "relative" rulers = [120] text-width = 120 +end-of-line-diagnostics = "hint" [editor.cursor-shape] insert = "bar" @@ -143,8 +144,8 @@ hidden = false render = true [editor.inline-diagnostics] -cursor-line = "error" -other-lines = "error" +cursor-line = "warning" +other-lines = "disable" prefix-len = 5 max-diagnostics = 1 max-wrap = 30 diff --git a/nate-work/dotfiles/helix/languages.toml b/nate-work/dotfiles/helix/languages.toml index 84688b2..be6e17d 100644 --- a/nate-work/dotfiles/helix/languages.toml +++ b/nate-work/dotfiles/helix/languages.toml @@ -1,86 +1,28 @@ -### -### Configuration for LSP-AI -### -### Link here: -### https://github.com/SilasMarvin/lsp-ai -### - -[language-server.lsp-ai] -command = "lsp-ai" - -[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 \"\". Follow these steps:\n\n1. Analyze the code context and the cursor position.\n2. Provide your chain of thought reasoning, wrapped in 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 \"\" with the necessary code, ensuring proper formatting and line breaks.\n5. Wrap your code solution in 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\n\nUser input:\n--main.py--\n# A function that reads in user inpu\n\nResponse:\n\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\n\nt\ndef read_user_input():\n user_input = input(\"Enter your input: \")\n return user_input\n\n\n\n\nUser input:\n--main.py--\ndef fibonacci(n):\n if n <= 1:\n return n\n else:\n re\n\n\nResponse:\n\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\n\nturn fibonacci(n-1) + fibonacci(n-2)\n\n"} -post_process = { extractor = "(?s)(.*?)" } - - -[[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 \"\". Follow these steps:\n\n1. Analyze the code context and the cursor position.\n2. Provide your chain of thought reasoning, wrapped in 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 \"\" with the necessary code, ensuring proper formatting and line breaks.\n5. Wrap your code solution in 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\n\nUser input:\n--main.py--\n# A function that reads in user inpu\n\nResponse:\n\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\n\nt\ndef read_user_input():\n user_input = input(\"Enter your input: \")\n return user_input\n\n\n\n\nUser input:\n--main.py--\ndef fibonacci(n):\n if n <= 1:\n return n\n else:\n re\n\n\nResponse:\n\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\n\nturn fibonacci(n-1) + fibonacci(n-2)\n\n"} -post_process = { extractor = "(?s)(.*?)" } - -[[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 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 tags.\n\nYour response should always include both the reasoning and the refactored code.\n\n\n\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\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\n\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\n\n\n\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\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\n\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\n\n" } -post_process = { extractor = "(?s)(.*?)" } - -[[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 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 tags.\n\nYour response should always include both the reasoning and the refactored code.\n\n\n\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\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\n\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\n\n\n\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\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\n\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\n\n" } -post_process = { extractor = "(?s)(.*?)" } - ### ### Configuration for languages ### [[language]] name = "go" -language-servers = ["gopls", "lsp-ai"] +language-servers = ["gopls"] [[language]] name = "markdown" -language-servers = ["marksman", "lsp-ai"] +language-servers = ["marksman"] # Change dart format to 120 lines [[language]] name = "dart" formatter = {command = "dart", args = ["format", "-l", "120"]} -language-servers = ["dart", "lsp-ai"] +language-servers = ["dart"] + +[[language]] +name = "nix" +language-servers = ["nil"] [[language]] name = "zig" -language-servers = ["zls", "lsp-ai"] +language-servers = ["zls"] [language.debugger] name = "codelldb-dap" @@ -107,6 +49,75 @@ 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 = "nix" -language-servers = ["nil", "lsp-ai"] +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 \"\". Follow these steps:\n\n1. Analyze the code context and the cursor position.\n2. Provide your chain of thought reasoning, wrapped in 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 \"\" with the necessary code, ensuring proper formatting and line breaks.\n5. Wrap your code solution in 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\n\nUser input:\n--main.py--\n# A function that reads in user inpu\n\nResponse:\n\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\n\nt\ndef read_user_input():\n user_input = input(\"Enter your input: \")\n return user_input\n\n\n\n\nUser input:\n--main.py--\ndef fibonacci(n):\n if n <= 1:\n return n\n else:\n re\n\n\nResponse:\n\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\n\nturn fibonacci(n-1) + fibonacci(n-2)\n\n"} +# post_process = { extractor = "(?s)(.*?)" } + + +# [[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 \"\". Follow these steps:\n\n1. Analyze the code context and the cursor position.\n2. Provide your chain of thought reasoning, wrapped in 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 \"\" with the necessary code, ensuring proper formatting and line breaks.\n5. Wrap your code solution in 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\n\nUser input:\n--main.py--\n# A function that reads in user inpu\n\nResponse:\n\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\n\nt\ndef read_user_input():\n user_input = input(\"Enter your input: \")\n return user_input\n\n\n\n\nUser input:\n--main.py--\ndef fibonacci(n):\n if n <= 1:\n return n\n else:\n re\n\n\nResponse:\n\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\n\nturn fibonacci(n-1) + fibonacci(n-2)\n\n"} +# post_process = { extractor = "(?s)(.*?)" } + +# [[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 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 tags.\n\nYour response should always include both the reasoning and the refactored code.\n\n\n\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\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\n\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\n\n\n\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\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\n\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\n\n" } +# post_process = { extractor = "(?s)(.*?)" } + +# [[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 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 tags.\n\nYour response should always include both the reasoning and the refactored code.\n\n\n\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\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\n\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\n\n\n\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\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\n\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\n\n" } +# post_process = { extractor = "(?s)(.*?)" } + diff --git a/nate-work/dotfiles/helix/themes/revontuli.toml b/nate-work/dotfiles/helix/themes/revontuli.toml new file mode 100644 index 0000000..084b257 --- /dev/null +++ b/nate-work/dotfiles/helix/themes/revontuli.toml @@ -0,0 +1,131 @@ + +# Based on onedarker.toml https://github.com/helix-editor/helix/blob/master/runtime/themes/onedarker.toml +# Original Author : nuid32 +# Recoloring: Akselmo + +"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" diff --git a/nate-work/dotfiles/waybar/config b/nate-work/dotfiles/waybar/config index 55c702d..1f712b5 100644 --- a/nate-work/dotfiles/waybar/config +++ b/nate-work/dotfiles/waybar/config @@ -2,18 +2,18 @@ { "layer": "top", "position": "top", - "margin-top": 3, + "margin-top": 0, "margin-left": 10, "margin-right": 10, - "margin-bottom": 3, + "margin-bottom": 0, // If height property would be not present, it'd be calculated dynamically - "height": 60, + // "height": 60, "modules-left": [ "custom/launcher", - "sway/workspaces", - "sway/mode", + "hyprland/workspaces", + "hyprland/window", ], "modules-center": [ @@ -23,7 +23,6 @@ "custom/firefox", "custom/slack", "custom/files", - "custom/pomo", ], "modules-right": [ @@ -34,9 +33,8 @@ "pulseaudio", "custom/keyboard-layout", "battery", - //"custom/PBPbattery", - // "backlight#icon", - // "backlight#value", + "backlight#icon", + "backlight#value", "clock", "tray", //"custom/weather", @@ -60,28 +58,23 @@ "critical": 15 }, "format": "{capacity}% {icon}", - "format-charging": "{capacity}% ", + "format-charging": "{capacity}% 󰂄", "format-plugged": "{capacity}% ", // "format-good": "", // An empty format will hide the module // "format-full": "", "format-icons": ["", "", "", "", ""] }, - "custom/PBPbattery": { - "exec": "~/.config/waybar/scripts/PBPbattery.sh", - "format": "{}", - }, - "clock": { - "interval": 10, - "format-alt": " {:%e %b %Y}", // Icon: calendar-alt - "format": "{:%I:%M %p}", + "interval": 1, + // "format-alt": " {:%e %b %Y}", // Icon: calendar-alt + "format": "{:%I:%M.%S %p}", "tooltip-format": "{:%e %B %Y}" }, "cpu": { "interval": 5, - "format": " {usage}% ({load})", // Icon: microchip + "format": " {usage}%", // Icon: microchip "states": { "warning": 70, "critical": 90, @@ -89,21 +82,10 @@ "on-click": "foot -e 'htop'", }, - "custom/keyboard-layout": { - "exec": "swaymsg -t get_inputs | grep -m1 'xkb_active_layout_name' | cut -d '\"' -f4", - // Interval set only as a fallback, as the value is updated by signal - "interval": 30, - "format": " {}", // Icon: keyboard - // Signal sent by Sway key binding (~/.config/sway/key-bindings) - "signal": 1, // SIGHUP - "tooltip": false, - "on-click": "~/.config/waybar/scripts/keyboard_layout.sh", - }, - "memory": { "interval": 5, - "format": " {}%", // Icon: memory - "on-click": "foot -e 'htop'", + "format": " {}%", // Icon: memory + "on-click": "foot -e 'htop'", "states": { "warning": 70, "critical": 90 @@ -125,27 +107,103 @@ "tooltip-format": "{ifname}: {ipaddr}/{cidr}", }, - "sway/mode": { + "hyprland/window": { "format": "{}", - "tooltip": false + "max-length": 60, + "icon": true, + "icon_size": 30, + "rewrite": { + // Firefox + "(.*) — Mozilla Firefox": "󰖟 $1", + "(.*) - Mozilla Firefox": "󰖟 $1", + "Mozilla Firefox": "󰖟 Firefox", + + // Chrome/Chromium + "(.*) - Google Chrome": "󰖟 $1", + "(.*) - Chromium": "󰖟 $1", + "Google Chrome": "󰖟 Chrome", + "Chromium": "󰖟 Chromium", + + // Terminal applications + "(.*) - zsh": " $1", + "(.*) - bash": " $1", + "(.*) - fish": " $1", + "foot": " Terminal", + "kitty": " Terminal", + "alacritty": " Terminal", + "ghostty": " Terminal", + + // Text editors and IDEs + "(.*) - Visual Studio Code": " $1", + "(.*) - Code": " $1", + "(.*) - Vim": " $1", + "(.*) - Neovim": " $1", + "(.*) - Emacs": " $1", + "Visual Studio Code": " VS Code", + + // File managers + "(.*)Nautilus": " Files: $1", + "Files": " Files", + "Thunar": " Files", + "Dolphin": " Files", + + // Communication apps + "Slack (.*)": " $1", + "Slack": " Slack", + "Signal": " Signal", + "Discord": " Discord", + "Telegram": " Telegram", + + // Media and entertainment + "Spotify": " Spotify", + "Steam": " Steam", + "(.*) - YouTube": "󰗃 $1", + "VLC media player": "󰕼 VLC", + + // Development tools + "(.*) - GitHub": " $1", + "GitKraken": " GitKraken", + "Postman": " Postman", + + // System applications + "System Monitor": " System Monitor", + "Task Manager": " Task Manager", + "Settings": " Settings", + "Control Panel": " Settings", + + // Office applications + "(.*) - LibreOffice Writer": " $1", + "(.*) - LibreOffice Calc": " $1", + "(.*) - LibreOffice Impress": " $1", + + // Remove common suffixes that don't add value + "^(.*) - .*$": "$1", + "^(.*) | .*$": "$1", + + // Fallback for empty/unnamed windows + "^$": "Desktop" + } }, - "sway/window": { - "format": "{}", - "max-length": 120 - }, - - "sway/workspaces": { + "hyprland/workspaces": { "disable-scroll": true, "disable-markup" : false, "all-outputs": true, + "show-special": true, + "special-visible-only": true, "format": " {icon} ", - //"format":"{icon}", "format-icons": { - "1": "", + "1": "", "2": "", - "3": "", - "4": "", + "3": "󰭻", + "4": "", + "5": " 5", + "6": " 6", + "7": " 7", + "8": " 8", + "9": " 9", + "music": "", + "scratch": "", } }, @@ -171,14 +229,6 @@ "on-scroll-down": "pactl set-sink-volume @DEFAULT_SINK@ -2%", }, - // to use the weather module replace with your city or town - // note: do not use spaces: new york would be newyork - "custom/weather": { - "exec": "~/.config/waybar/scripts/weather.sh ", - "return-type": "json", - "interval": 600, - }, - // "custom/temp": { // "exec": "notify-send \"temp thing\"", // "interval": "once", @@ -217,7 +267,7 @@ "custom/spotify": { "format": "  ", - "on-click": "foot -e 'ncspot'", + "on-click": "exec flatpak run com.spotify.Client", "tooltip": false, }, @@ -238,21 +288,10 @@ "custom/files": { "format": " 󰉋 ", - "on-click": "exec thunar", + "on-click": "exec nautilus", "tooltip": false, }, - - "custom/pomo": { - "format": " {} ", - "exec": "/home/nate/source/pomozoro/zig-out/bin/pomozoro", - "return-type": "json", - "on-click": "echo 's' > ~/.local/share/pomozoro/pomopipe", - "on-click-right": "echo 'p' > ~/.local/share/pomozoro/pomopipe", - "on-click-middle": "echo 'r' > ~/.local/share/pomozoro/pomopipe", - // "signal": 8, - }, - "custom/launcher": { "format":" ", "on-click": "exec wofi -c ~/.config/wofi/config -I", diff --git a/nate-work/dotfiles/waybar/style.css b/nate-work/dotfiles/waybar/style.css index 00aa873..04cc0c0 100644 --- a/nate-work/dotfiles/waybar/style.css +++ b/nate-work/dotfiles/waybar/style.css @@ -67,7 +67,7 @@ * { border: none; border-radius: 0; - min-height: 0; + min-height: 40px; margin: 1px; padding: 0; } @@ -90,12 +90,12 @@ padding-right: 3px; margin-left: 3px; margin-right: 3px; - color: transparent; + /* color: transparent; */ border-bottom: 2px solid; } #taskbar button.active { - color: @lavender; + color: @green; } .modules-left, @@ -215,11 +215,11 @@ } #workspaces { - font-size: 13px; + font-size: 24px; } #workspaces button { - border-bottom: 3px solid transparent; + /* border-bottom: 3px solid transparent; */ margin-bottom: 0px; padding: 0px; } @@ -283,11 +283,9 @@ animation-name: blink-warning; } - -#workspaces button.focused { - border-bottom: 3px solid @green; - margin-bottom: 1px; - padding-left: 0; +#workspaces button.active { + border-bottom: 3px solid @lavender; + color: @green; } #workspaces button.urgent { @@ -303,7 +301,7 @@ } #custom-launcher { - font-size: 15px; + font-size: 24px; margin-left: 15px; margin-right: 10px; } diff --git a/nate-work/modules/home-manager/home.nix b/nate-work/modules/home-manager/home.nix index 2834b9c..60c2336 100644 --- a/nate-work/modules/home-manager/home.nix +++ b/nate-work/modules/home-manager/home.nix @@ -108,6 +108,7 @@ python311Packages.python-lsp-server yaml-language-server elixir-ls + ltex-ls ### Misc usbutils @@ -170,9 +171,12 @@ # # Style # + catppuccin-gtk catppuccin-kvantum libsForQt5.qtstyleplugin-kvantum libsForQt5.qt5ct + kdePackages.qtstyleplugin-kvantum + kdePackages.qt6ct # Install fonts lato unstable.nerd-fonts.hurmit @@ -296,27 +300,23 @@ qt = { enable = true; platformTheme.name = "kvantum"; - style.name = "kvantum"; + style = { + name = "kvantum"; + package = pkgs.catppuccin-kvantum.override { + accent = "lavender"; + variant = "macchiato"; + }; + }; }; gtk = { enable = true; - # catppuccin = { - # enable = true; - # size = "compact"; - # tweaks = [ "rimless" ]; - # icon = { - # enable = true; - # }; - # }; - # cursorTheme = { - # package = pkgs.catppuccin-cursors.macchiatoLavender; - # name = "Catppuccin-Macchiato-Lavender-Cursors"; - # }; + # icons iconTheme = { package = pkgs.catppuccin-papirus-folders; name = "Papirus-Dark"; }; + # gtk theme theme = { name = "catppuccin-macchiato-lavender-compact+rimless"; package = pkgs.catppuccin-gtk.override { @@ -326,19 +326,17 @@ variant = "macchiato"; }; }; + # cursor defined in hypr-home.nix }; - # Symlink in gtk and kvantum theme to ~/.config - # xdg.configFile = { - # "gtk-4.0/assets".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/assets"; - # "gtk-4.0/gtk.css".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/gtk.css"; - # "gtk-4.0/gtk-dark.css".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/gtk-dark.css"; - # "Kvantum/kvantum.kvconfig".text = '' - # [General] - # theme=Catppuccin-Frappe-Blue - # ''; - # "Kvantum/Catppuccin-Frappe-Blue".source = "${pkgs.catppuccin-kvantum}/share/Kvantum/Catppuccin-Frappe-Blue"; - # }; + xdg.configFile = { + "gtk-4.0/assets".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/assets"; + "gtk-4.0/gtk.css".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/gtk.css"; + "gtk-4.0/gtk-dark.css".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/gtk-dark.css"; + "Kvantum/kvantum.kvconfig".source = (pkgs.formats.ini {}).generate "kvantum.kvconfig" { + General.theme = "catppuccin-macchiato-lavender"; + }; + }; # home.file.".icons/default/index.theme".text = '' # [icon theme] # Inherits=Catppuccin-Macchiato-Lavender-Cursors diff --git a/nate-work/modules/hypr/hypr_home.nix b/nate-work/modules/hypr/hypr_home.nix index 59062c3..45e3bc2 100644 --- a/nate-work/modules/hypr/hypr_home.nix +++ b/nate-work/modules/hypr/hypr_home.nix @@ -30,21 +30,21 @@ in # "swaylock -C ~/.config/swaylock/boot-config" "swaybg -i ~/.config/hypr/va_background.png" - "nwg-panel" + "waybar" "nm-applet --indicator" - "sleep 5 && syncthingtray --wait" "blueman-applet" "hypridle" + "sleep 5 && syncthingtray --wait" "lxqt-policykit-agent" # May need to kill mako if nwg-panel starts it "swaync" "keepassxc" # set gsettings - "dconf write /org/gnome/desktop/interface/cursor-theme \"'catppuccin-macchiato-lavender-cursors'\"" - "dconf write /org/gnome/desktop/interface/cursor-size 24" + # "dconf write /org/gnome/desktop/interface/cursor-theme \"'catppuccin-macchiato-lavender-cursors'\"" + # "dconf write /org/gnome/desktop/interface/cursor-size 24" # "dconf write /org/gnome/desktop/interface/icon-theme \"'Papirus-Dark'\"" # "dconf write /org/gnome/desktop/interface/gtk-theme \"'catppuccin-macchiato-lavender-compact+rimless'\"" - "hyprctl setcursor catppuccin-macchiato-lavender-cursors 24" + # "hyprctl setcursor catppuccin-macchiato-lavender-cursors 24" ]; input = { repeat_rate = 50; @@ -162,10 +162,10 @@ in # Lid switch binds bindl = [ # trigger when the switch is turning on - ", switch:on:Lid Switch, exec, hyprctl keyword monitor 'eDP-1, disable' && nwg-panel" + ", switch:on:Lid Switch, exec, hyprctl keyword monitor 'eDP-1, disable'" # trigger when the switch is turning off - ", switch:off:Lid Switch, exec, hyprctl keyword monitor 'eDP-1, 2560x1600@165, 0x0, 1.00' && nwg-panel" + ", switch:off:Lid Switch, exec, hyprctl keyword monitor 'eDP-1, 2560x1600@165, 0x0, 1.00'" ]; windowrulev2 = [ # float keepass windows, put main window in scratch @@ -219,10 +219,12 @@ in home.pointerCursor = { gtk.enable = true; + hyprcursor.enable = true; + x11.enable = true; + hyprcursor.size = 32; name = "Bibata-Modern-Classic"; package = pkgs.bibata-cursors; - - size = 24; + size = 32; }; # home.sessionVariables = { # }; @@ -231,6 +233,7 @@ in ### hyprland packages swaybg swaylock-effects + waybar wofi # NWG nwg-bar