diff --git a/flake.nix b/flake.nix index 40d42b1..c10c6c8 100644 --- a/flake.nix +++ b/flake.nix @@ -35,7 +35,7 @@ inherit (args) extraSpecialArgs; }); in flake-utils.lib.eachDefaultSystem (system: rec { - formatter = legacyPackages.nixfmt; + formatter = legacyPackages.nixfmt-classic; legacyPackages = pkgsForSystem system; pkgs = legacyPackages; devShells.default = pkgs.mkShell { diff --git a/hosts/ori/home.nix b/hosts/ori/home.nix index 74a20e2..5c7945b 100644 --- a/hosts/ori/home.nix +++ b/hosts/ori/home.nix @@ -16,6 +16,7 @@ (python3.withPackages (pip: with pip; [ numpy matplotlib ])) spotify firefox + chromium syncthing nixfmt xdg-utils @@ -24,9 +25,17 @@ prismlauncher graphviz-nox + inkscape + gimp + xournalpp + libreoffice + + dogdns + jetbrains.rust-rover - libreoffice + vlc + audacity ]; programs.firefox = { enable = true; }; diff --git a/programs/gnome/default.nix b/programs/gnome/default.nix index f8269f2..024c075 100644 --- a/programs/gnome/default.nix +++ b/programs/gnome/default.nix @@ -84,7 +84,7 @@ in { edge-scrolling-enabled = false; natural-scroll = false; send-events = "enabled"; - speed = 0.536764705882353; + speed = 0.5; tap-to-click = true; two-finger-scrolling-enabled = true; }; diff --git a/programs/nvim/config.lua b/programs/nvim/config.lua index 15a4fa3..9d8e77e 100644 --- a/programs/nvim/config.lua +++ b/programs/nvim/config.lua @@ -85,7 +85,7 @@ vim.keymap.set('n', 'gt', builtin.lsp_type_definitions, {}) -- format on wq and x and replace X, W and Q with x, w and q vim.cmd [[cabbrev wq execute "Format sync" wq]] -vim.cmd [[cabbrev x execute "Format sync" x]] +vim.cmd [[cabbrev x execute "Format sync" x]# ]] vim.cmd [[cnoreabbrev W w]] vim.cmd [[cnoreabbrev X execute "Format sync" x]] vim.cmd [[cnoreabbrev Q q]] @@ -93,9 +93,10 @@ vim.cmd [[nnoremap ; :]] local builtin = require('telescope.builtin') -vim.keymap.set('n', 'ff', builtin.find_files, {}) +vim.keymap.set('n', 's', "vertical sb", {}) +vim.keymap.set('n', 'f', builtin.find_files, {}) vim.keymap.set('n', '', builtin.live_grep, {}) -vim.keymap.set('n', 'fh', builtin.search_history, {}) +vim.keymap.set('n', 'h', builtin.search_history, {}) vim.keymap.set('n', 'd', "Telescope diagnostics bufnr=0", {}) vim.keymap.set('n', 'ad', builtin.diagnostics, {}) vim.keymap.set("n", "]d", vim.diagnostic.goto_next) @@ -106,7 +107,7 @@ vim.keymap.set('n', 'gr', gitsigns.reset_hunk) vim.keymap.set('n', 'gd', gitsigns.diffthis) vim.keymap.set({'o', 'x'}, 'ig', ':Gitsigns select_hunk') -vim.keymap.set('n', 't', ':Neotree toggle') +vim.keymap.set('n', 't', ':Neotree toggle') -- ============ files and directories ============== @@ -209,8 +210,11 @@ vim.cmd([[ cnoremap %s/ %sm/ ]]) -keymap('n', "t", ":FloatermToggle myfloat", opts) -keymap('t', "", ":q", opts) +vim.cmd([[ + inoremap FloatermToggle + nnoremap FloatermToggle + tnoremap FloatermToggle +]]) vim.cmd([[ let g:suda_smart_edit = 1 diff --git a/programs/nvim/default.nix b/programs/nvim/default.nix index 4d0921e..5d09471 100644 --- a/programs/nvim/default.nix +++ b/programs/nvim/default.nix @@ -49,7 +49,7 @@ in action = "Lspsaga outline"; } { - key = "ga"; + key = "."; action = "Lspsaga code_action"; } ]; @@ -355,7 +355,11 @@ in nvim-web-devicons ]; - extraConfigLua = builtins.readFile ./config.lua; + extraConfigLua = '' + require("render-markdown").setup { + latex_converter = '${pkgs.python312Packages.pylatexenc}/bin/latex2text', + } + '' + (builtins.readFile ./config.lua); opts = { lazyredraw = false; diff --git a/programs/zsh/default.nix b/programs/zsh/default.nix index f58425d..39becf6 100644 --- a/programs/zsh/default.nix +++ b/programs/zsh/default.nix @@ -20,6 +20,7 @@ let "add" = "${pkgs.git}/bin/git add"; "patch" = "${pkgs.git}/bin/git add -p"; "amend" = "${pkgs.git}/bin/git commit --amend"; + "log" = "${pkgs.git}/bin/git log --graph --oneline --format=format:'%C(auto)%h %s%d %C(green)%cr %C(bold blue)<%an>%C(auto)'"; }; # extracting any compressed format extract = '' @@ -52,19 +53,35 @@ in enable = true; enableCompletion = true; syntaxHighlighting.enable = true; + completionInit = '' + autoload -Uz compinit + if [[ -n ''${ZDOTDIR}/.zcompdump(#qN.mh+24) ]]; then + compinit; + else + compinit -C; + fi; + ''; initExtra = '' - source "${pkgs.grml-zsh-config}/etc/zsh/zshrc" - export FZF_DEFAULT_COMMAND="${pkgs.ripgrep}/bin/rg --files --follow" - source "${pkgs.fzf}/share/fzf/key-bindings.zsh" - source "${pkgs.fzf}/share/fzf/completion.zsh" - eval "$(${pkgs.zoxide}/bin/zoxide init zsh)" - eval "$(${pkgs.atuin}/bin/atuin init zsh)" - eval "$(${pkgs.direnv}/bin/direnv hook zsh)" + source "${pkgs.grml-zsh-config}/etc/zsh/zshrc" + export FZF_DEFAULT_COMMAND="${pkgs.ripgrep}/bin/rg --files --follow" + source "${pkgs.fzf}/share/fzf/key-bindings.zsh" + source "${pkgs.fzf}/share/fzf/completion.zsh" + eval "$(${pkgs.zoxide}/bin/zoxide init zsh)" + eval "$(${pkgs.atuin}/bin/atuin init zsh)" + eval "$(${pkgs.direnv}/bin/direnv hook zsh)" + function zvm_config() { + ZVM_READKEY_ENGINE=$ZVM_READKEY_ENGINE_NEX + ZVM_LINE_INIT_MODE=$ZVM_MODE_INSERT + ZVM_ESCAPE_KEYTIMEOUT=0.03 + } - ${extract} + source ${pkgs.zsh-vi-mode}/share/zsh-vi-mode/zsh-vi-mode.plugin.zsh - ${foldl' (a: b: a + "\n" + b) "" - (mapAttrsToList (name: value: ''alias ${name}="${value}"'') aliases)} + + ${extract} + + ${foldl' (a: b: a + "\n" + b) "" + (mapAttrsToList (name: value: ''alias ${name}="${value}"'') aliases)} function t() { cd "$(${pkgs.custom.t}/bin/t-rs $@ | tail -n 1)" @@ -89,6 +106,12 @@ in path "$HOME/.local/bin" path "$HOME/Documents/scripts" path "$HOME/.local/share/JetBrains/Toolbox/scripts" + + # http://bewatermyfriend.org/p/2013/001/ + # export NEWLINE=$'\n' + # zstyle ':prompt:grml:*:items:percent' pre "''${NEWLINE}" + + ''; }; }