diff --git a/home/david/modules/programs/alacritty/alacritty.toml b/home/david/modules/programs/alacritty/alacritty.toml index 4db938e..94c88cc 100644 --- a/home/david/modules/programs/alacritty/alacritty.toml +++ b/home/david/modules/programs/alacritty/alacritty.toml @@ -3,9 +3,9 @@ ipc_socket = true live_config_reload = true [window] +blur = true dynamic_padding = true opacity = 0.8 -blur = true [scrolling] history = 100000 diff --git a/home/modules/programs/helix/config.toml b/home/modules/programs/helix/config.toml index 63d0616..917096c 100644 --- a/home/modules/programs/helix/config.toml +++ b/home/modules/programs/helix/config.toml @@ -1,18 +1,19 @@ [editor] -line-number = "relative" -cursorline = true -cursorcolumn = false -true-color = true -undercurl = true bufferline = "multiple" color-modes = true +cursorcolumn = false +cursorline = true default-line-ending = "lf" +line-number = "relative" popup-border = "all" +true-color = true +undercurl = true # letters in the beginning are used first # move home raw letters to the beginning jump-label-alphabet = "jkdls;aurieowpqnvmcxz" [editor.statusline] +center = ["diagnostics"] left = [ "mode", "spacer", @@ -25,7 +26,9 @@ left = [ "spacer", "spinner", ] -center = ["diagnostics"] +mode.insert = "INSERT" +mode.normal = "NORMAL" +mode.select = "SELECT" right = [ "register", "file-line-ending", @@ -36,14 +39,11 @@ right = [ "position-percentage", ] separator = "|" -mode.normal = "NORMAL" -mode.insert = "INSERT" -mode.select = "SELECT" [editor.lsp] -display-progress-messages = true -display-messages = true display-inlay-hints = true +display-messages = true +display-progress-messages = true [editor.cursor-shape] insert = "bar" @@ -54,16 +54,16 @@ select = "underline" hidden = false [editor.whitespace.render] -space = "none" -tab = "all" nbsp = "all" newline = "none" +space = "none" +tab = "all" [editor.whitespace.characters] -space = "·" nbsp = "⍽" -tab = "→" newline = "⏎" +space = "·" +tab = "→" tabpad = "·" [editor.indent-guides] diff --git a/home/modules/programs/starship/config.toml b/home/modules/programs/starship/config.toml index c56813b..453179f 100644 --- a/home/modules/programs/starship/config.toml +++ b/home/modules/programs/starship/config.toml @@ -1,43 +1,43 @@ "$schema" = 'https://starship.rs/config-schema.json' [character] -success_symbol = '[λ](bold blue)' error_symbol = '[λ](bold red)' -vimcmd_symbol = '[Λ](bold blue)' +success_symbol = '[λ](bold blue)' vimcmd_replace_one_symbol = '[Λ](bold purple)' vimcmd_replace_symbol = '[Λ](bold purple)' +vimcmd_symbol = '[Λ](bold blue)' vimcmd_visual_symbol = '[Λ](bold yellow)' [[battery.display]] -threshold = 10 style = 'bold red' +threshold = 10 [[battery.display]] -threshold = 30 -style = 'bold yellow' discharging_symbol = '💦' +style = 'bold yellow' +threshold = 30 [[battery.display]] -threshold = 100 style = 'green' +threshold = 100 [git_branch] format = 'on [$symbol$branch(:$remote_branch)]($style) ' symbol = " " [git_status] -diverged = '⇕⇡${ahead_count}⇣${behind_count}' -conflicted = "[⚔️${count}](red)" ahead = '[⇡${count}](bold green)' behind = '[⇣${count}](bold yellow)' -untracked = '[!${count}](red)' -stashed = "[📦${count}](purple)" -modified = '[M${count}](bold yellow)' -staged = "[+${count}](green)" -renamed = "[»${count}](bold yellow)" +conflicted = "[⚔️${count}](red)" deleted = '[-${count}](blue)' -up_to_date = '[✓](green)' +diverged = '⇕⇡${ahead_count}⇣${behind_count}' format = '([(\[$all_status\])(\[$ahead_behind\])]($style) ) ' +modified = '[M${count}](bold yellow)' +renamed = "[»${count}](bold yellow)" +staged = "[+${count}](green)" +stashed = "[📦${count}](purple)" +untracked = '[!${count}](red)' +up_to_date = '[✓](green)' [git_commit] format = '([\($hash$tag\)]($style) )' @@ -45,11 +45,11 @@ only_detached = false [directory] fish_style_pwd_dir_length = 2 -truncation_length = 2 -truncate_to_repo = false -repo_root_style = "bold green" -use_os_path_sep = false read_only = " 󰌾" +repo_root_style = "bold green" +truncate_to_repo = false +truncation_length = 2 +use_os_path_sep = false [aws] symbol = " " @@ -133,9 +133,9 @@ symbol = " " symbol = " " [os.symbols] +AlmaLinux = " " Alpaquita = " " Alpine = " " -AlmaLinux = " " Amazon = " " Android = " " Arch = " " @@ -162,20 +162,20 @@ Mint = " " NetBSD = " " NixOS = " " OpenBSD = "󰈺 " -openSUSE = " " OracleLinux = "󰌷 " Pop = " " Raspbian = " " -Redhat = " " RedHatEnterprise = " " -RockyLinux = " " +Redhat = " " Redox = "󰀘 " -Solus = "󰠳 " +RockyLinux = " " SUSE = " " +Solus = "󰠳 " Ubuntu = " " Unknown = " " Void = " " Windows = "󰍲 " +openSUSE = " " [package] symbol = "󰏗 " diff --git a/nvfetcher.toml b/nvfetcher.toml index 0b5a51a..4676d28 100644 --- a/nvfetcher.toml +++ b/nvfetcher.toml @@ -1,64 +1,64 @@ [juicity] -src.git = "https://github.com/juicity/juicity" fetch.git = "https://githuh.com/juicity/juicity" +src.git = "https://github.com/juicity/juicity" [tree-sitter-idris] -src.git = "https://github.com/kayhide/tree-sitter-idris" fetch.git = "https://github.com/kayhide/tree-sitter-idris" passthru.name = "idris" +src.git = "https://github.com/kayhide/tree-sitter-idris" [noto-serif-cjk] -src.github = "notofonts/noto-cjk" fetch.github = "notofonts/noto-cjk" git.sparseCheckout = ["Serif/OTC"] +src.github = "notofonts/noto-cjk" [noto-sans-cjk] -src.github = "notofonts/noto-cjk" fetch.github = "notofonts/noto-cjk" git.sparseCheckout = ["Sans/OTC"] +src.github = "notofonts/noto-cjk" [spotx] -src.git = "https://github.com/SpotX-Official/SpotX-Bash.git" fetch.github = "SpotX-Official/SpotX-Bash" +src.git = "https://github.com/SpotX-Official/SpotX-Bash.git" [TrackersListCollection] -src.git = "https://github.com/XIU2/TrackersListCollection.git" fetch.github = "XIU2/TrackersListCollection" git.sparseCheckout = ["all.txt"] +src.git = "https://github.com/XIU2/TrackersListCollection.git" [wshowkeys-mao] -src.git = "https://github.com/DreamMaoMao/wshowkeys.git" fetch.github = "DreamMaoMao/wshowkeys" +src.git = "https://github.com/DreamMaoMao/wshowkeys.git" [OuterWildsTextAdventure] -src.git = "https://github.com/top-mind/OuterWildsTextAdventureWeb.git" fetch.github = "top-mind/OuterWildsTextAdventureWeb" +src.git = "https://github.com/top-mind/OuterWildsTextAdventureWeb.git" [cliphist] -src.git = "https://github.com/sentriz/cliphist.git" fetch.github = "sentriz/cliphist" +src.git = "https://github.com/sentriz/cliphist.git" [radicle-ci-broker] -src.git = "https://seed.radicle.garden/zwTxygwuz5LDGBq255RA2CbNGrz8.git" fetch.git = "https://seed.radicle.garden/zwTxygwuz5LDGBq255RA2CbNGrz8.git" +src.git = "https://seed.radicle.garden/zwTxygwuz5LDGBq255RA2CbNGrz8.git" ["wallpaper_hieda-no-akyuu-touhou.1920x1080.mp4"] -src.cmd = "curl -sL http://wallpaper.youthlic.social/hieda-no-akyuu-touhou.1920x1080.mp4 | sha256sum | cut -d ' ' -f 1" fetch.url = "http://wallpaper.youthlic.social/hieda-no-akyuu-touhou.1920x1080.mp4" +src.cmd = "curl -sL http://wallpaper.youthlic.social/hieda-no-akyuu-touhou.1920x1080.mp4 | sha256sum | cut -d ' ' -f 1" ["wallpaper_outer-wilds.3840x2160.mp4"] -src.cmd = "curl -sL http://wallpaper.youthlic.social/outer-wilds.3840x2160.mp4 | sha256sum | cut -d ' ' -f 1" fetch.url = "http://wallpaper.youthlic.social/outer-wilds.3840x2160.mp4" +src.cmd = "curl -sL http://wallpaper.youthlic.social/outer-wilds.3840x2160.mp4 | sha256sum | cut -d ' ' -f 1" ["wallpaper_hollow-knight-quest.3840x2160.mp4"] -src.cmd = "curl -sL http://wallpaper.youthlic.social/hollow-knight-quest.3840x2160.mp4 | sha256sum | cut -d ' ' -f 1" fetch.url = "http://wallpaper.youthlic.social/hollow-knight-quest.3840x2160.mp4" +src.cmd = "curl -sL http://wallpaper.youthlic.social/hollow-knight-quest.3840x2160.mp4 | sha256sum | cut -d ' ' -f 1" [rime-yuhaostar] -src.github = "forfudan/yuhao-ime-release" fetch.url = "https://github.com/forfudan/yuhao-ime-release/releases/download/$ver/yuhao_star_xingchen_$ver.zip" +src.github = "forfudan/yuhao-ime-release" url.name = "yustar_$ver.zip" [nvim_vim-startuptime] -src.git = "https://github.com/dstein64/vim-startuptime.git" fetch.github = "dstein64/vim-startuptime" +src.git = "https://github.com/dstein64/vim-startuptime.git" diff --git a/pkgs/nixvim/lang/toml/formatting.nix b/pkgs/nixvim/lang/toml/formatting.nix index 56b880b..3fbb0da 100644 --- a/pkgs/nixvim/lang/toml/formatting.nix +++ b/pkgs/nixvim/lang/toml/formatting.nix @@ -23,7 +23,7 @@ return "${lib.getExe pkgs.taplo}" end end, - args = { "format", "-o", "reorder_keys=true", "-o", "reorder_inline_tables=true", "-o", "reorder_arrays=true", "-" }, + args = { "format", "-o", "reorder_keys=true", "-o", "reorder_inline_tables=true", "-" }, }) end ''; diff --git a/templates/python/pyproject.toml b/templates/python/pyproject.toml index faab326..c7885d2 100644 --- a/templates/python/pyproject.toml +++ b/templates/python/pyproject.toml @@ -1,16 +1,16 @@ [project] -name = "python" -version = "0.1.0" +dependencies = ["numpy>=2.2.6"] description = "Add your description here" +name = "python" readme = "README.md" requires-python = ">=3.12" -dependencies = ["numpy>=2.2.6"] +version = "0.1.0" [dependency-groups] dev = ["ipython>=9.2.0", "ptpython>=3.0.30"] [build-system] -requires = ["hatchling"] build-backend = "hatchling.build" +requires = ["hatchling"] [tool.hatch.build.targets.wheel] packages = ["app"] diff --git a/templates/rust/rust-toolchain.toml b/templates/rust/rust-toolchain.toml index 698a98c..90e92de 100644 --- a/templates/rust/rust-toolchain.toml +++ b/templates/rust/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] channel = "stable" -profile = "default" components = ["rust-src"] +profile = "default"