fix term

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 {

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; };

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;
       };

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" <bar> wq]]
-vim.cmd [[cabbrev x execute "Format sync" <bar> x]]
+vim.cmd [[cabbrev x execute "Format sync" <bar> x]# ]]
 vim.cmd [[cnoreabbrev W w]]
 vim.cmd [[cnoreabbrev X execute "Format sync" <bar> x]]
 vim.cmd [[cnoreabbrev Q q]]
@@ -93,9 +93,10 @@ vim.cmd [[nnoremap ; :]]
 
 local builtin = require('telescope.builtin')
 
-vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
+vim.keymap.set('n', '<leader>s', "<cmd>vertical sb<cr>", {})
+vim.keymap.set('n', '<leader>f', builtin.find_files, {})
 vim.keymap.set('n', '<leader><leader>', builtin.live_grep, {})
-vim.keymap.set('n', '<leader>fh', builtin.search_history, {})
+vim.keymap.set('n', '<leader>h', builtin.search_history, {})
 vim.keymap.set('n', '<leader>d', "<cmd>Telescope diagnostics bufnr=0<cr>", {})
 vim.keymap.set('n', '<leader>ad', builtin.diagnostics, {})
 vim.keymap.set("n", "]d", vim.diagnostic.goto_next)
@@ -106,7 +107,7 @@ vim.keymap.set('n', '<leader>gr', gitsigns.reset_hunk)
 vim.keymap.set('n', '<leader>gd', gitsigns.diffthis)
 
 vim.keymap.set({'o', 'x'}, 'ig', ':<C-U>Gitsigns select_hunk<CR>')
-vim.keymap.set('n', '<leader>t', ':Neotree toggle<CR>')
+vim.keymap.set('n', 't', ':Neotree toggle<CR>')
 
 -- ============ files and directories ==============
 
@@ -209,8 +210,11 @@ vim.cmd([[
   cnoremap %s/ %sm/
 ]])
 
-keymap('n', "t", ":FloatermToggle myfloat<CR>", opts)
+vim.cmd([[
-keymap('t', "<Esc>", "<C-\\><C-n>:q<CR>", opts)
+  inoremap <silent> <F1> <CMD>FloatermToggle<CR>
+  nnoremap <silent> <F1> <CMD>FloatermToggle<CR>
+  tnoremap <silent> <F1> <C-\><C-n><CMD>FloatermToggle<CR>
+]])
 
 vim.cmd([[
     let g:suda_smart_edit = 1

programs/nvim/default.nix

@@ -49,7 +49,7 @@ in
         action = "<cmd>Lspsaga outline<cr>";
       }
       {
-        key = "ga";
+        key = "<leader>.";
         action = "<cmd>Lspsaga code_action<cr>";
       }
     ];
@@ -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;

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,6 +53,14 @@ 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"
@@ -60,6 +69,14 @@ in
       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
+      }
+
+      source ${pkgs.zsh-vi-mode}/share/zsh-vi-mode/zsh-vi-mode.plugin.zsh
+
 
       ${extract}
 
@@ -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}"
+
+
     '';
   };
 }