lean & prusa-slicer

2024-05-02 08:43:29 +02:00
parent 45932905cb
commit f1fad8c870
26 changed files with 192 additions and 338 deletions
--- a/home/default.nix
+++ b/home/default.nix
@@ -8,6 +8,7 @@
      # archives
      unzip
      zip
+      fuse

      # misc
      tree
@@ -17,8 +18,7 @@
      lm_sensors
      arandr
      pavucontrol
-      sshf
-      sshfss
+      sshfs

      obsidian
      lean4
@@ -31,6 +31,9 @@
  };
  programs = { home-manager.enable = true; };

+  home.file."git/minlog".source =
+    config.lib.file.mkOutOfStoreSymlink "${pkgs.minlog}/share/minlog";
+
  nixpkgs.config = {
    allowUnfree = true;
    permittedInsecurePackages = [ "electron-25.9.0" ];
--- a/home/programs/default.nix
+++ b/home/programs/default.nix
@@ -3,14 +3,17 @@
    ./alacritty
    ./anki
    ./discord
+    ./dolphin
    ./element
    ./git
    ./ktouch
    ./libreoffice
-    ./nemo
+    ./maestral
    ./neovim
    ./obs
    ./planify
+    ./prusa-slicer
+    ./pulseaudio
    ./rofi
    ./signal
    ./spotify
@@ -21,5 +24,6 @@
    ./zathura
    ./zoom
    ./zsh
+    ./zulip
  ];
 }
--- a/home/programs/dolphin/default.nix
+++ b/home/programs/dolphin/default.nix
@@ -0,0 +1,9 @@
+{ pkgs, config, ... }:
+
+{
+  home.packages = with pkgs; [
+    libsForQt5.dolphin
+    libsForQt5.dolphin-plugins
+    samba
+  ];
+}
--- a/home/programs/maestral/default.nix
+++ b/home/programs/maestral/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }:
+
+{
+  home.packages = with pkgs; [ maestral maestral-gui ];
+}
--- a/home/programs/nemo/default.nix
+++ b/home/programs/nemo/default.nix
@@ -1,30 +0,0 @@
-{ pkgs, config, ... }:
-
-{
-  home.packages = with pkgs; [
-    cinnamon.nemo-with-extensions
-    gnome.gnome-themes-extra
-    dconf
-  ];
-  gtk = {
-    enable = true;
-    theme = {
-      name = "Catppuccin-Mocha-Compact-Flamingo-Dark";
-      package = pkgs.catppuccin-gtk.override {
-        accents = [ "flamingo" ];
-        size = "compact";
-        tweaks = [ "rimless" "black" ];
-        variant = "mocha";
-      };
-    };
-  };
-
-  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";
-  };
-}
--- a/home/programs/neovim/coc-settings.json
+++ b/home/programs/neovim/coc-settings.json
@@ -1,28 +0,0 @@
-{
-  "languageserver": {
-    "haskell": {
-      "command": "haskell-language-server-wrapper",
-      "args": ["--lsp"],
-      "rootPatterns": [
-        "*.cabal",
-        "stack.yaml",
-        "cabal.project",
-        "package.yaml",
-        "hie.yaml"
-      ],
-      "filetypes": ["haskell", "lhaskell"],
-      // Settings are optional, here are some example values
-      "settings": {
-        "haskell": {
-          "checkParents": "CheckOnSave",
-          "checkProject": true,
-          "maxCompletions": 40,
-          "formattingProvider": "ormolu",
-          "plugin": {
-            "stan": { "globalOn": true }
-          }
-        }
-      }
-    }
-  }
-}
--- a/home/programs/neovim/default.nix
+++ b/home/programs/neovim/default.nix
@@ -111,6 +111,7 @@ in {

    extraLuaConfig = ''
      vim.g.mapleader = " "
+      vim.g.maplocalleader = ","
      require("lazy").setup({
        spec = {
          -- Import plugins from lua/plugins
@@ -127,7 +128,7 @@ in {
            pkgs.vimUtils.packDir
            config.programs.neovim.finalPackage.passthru.packpathDirs
          }/pack/myNeovimPackages/start",
-          patterns = {"arkav", "Bekaboo", "catppuccin", "epwalsh", "folke", "ggandor", "HiPhish", "hrsh7th", "iamcco", "Joosep", "Julian", "karb94", "kylechui", "L3MON4D3", "lervag", "neoclide", "neovim", "numToStr", "nvim-lua", "nvim-lualine", "nvim-telescope", "nvim-tree", "nvim-treesitter", "Olical", "onsails", "PaterJason", "rafamadiz", "saadparwaiz1", "skanehira", "stevearc", "tpope", "windwp"},
+          patterns = {"arkav", "Bekaboo", "catppuccin", "epwalsh", "folke", "ggandor", "HiPhish", "hrsh7th", "iamcco", "Joosep", "Julian", "karb94", "kylechui", "L3MON4D3", "lervag", "mrcjkb", "neovim", "numToStr", "nvim-lua", "nvim-lualine", "nvim-telescope", "nvim-tree", "nvim-treesitter", "Olical", "onsails", "PaterJason", "rafamadiz", "saadparwaiz1", "skanehira", "stevearc", "tpope", "windwp"},
        },
        install = {
          -- Safeguard in case we forget to install a plugin with Nix
@@ -142,6 +143,5 @@ in {
    recursive = true;
    source = ./lua;
  };
-  xdg.configFile."nvim/coc-settings.json".source = ./coc-settings.json;
 }

--- a/home/programs/neovim/lua/plugins/coc.lua
+++ b/home/programs/neovim/lua/plugins/coc.lua
@@ -1,185 +0,0 @@
-local M = {
-  "neoclide/coc.nvim",
-  branch = "master",
-  build = "yarn install --frozen-lockfile",
-}
-
-M.config = function()
-  -- Some servers have issues with backup files, see #649
-  vim.opt.backup = false
-  vim.opt.writebackup = false
-
-  -- Having longer updatetime (default is 4000 ms = 4s) leads to noticeable
-  -- delays and poor user experience
-  vim.opt.updatetime = 300
-
-  -- Always show the signcolumn, otherwise it would shift the text each time
-  -- diagnostics appeared/became resolved
-  vim.opt.signcolumn = "yes"
-
-  local keyset = vim.keymap.set
-  -- Autocomplete
-  function _G.check_back_space()
-    local col = vim.fn.col(".") - 1
-    return col == 0 or vim.fn.getline("."):sub(col, col):match("%s") ~= nil
-  end
-
-  -- Use Tab for trigger completion with characters ahead and navigate
-  -- NOTE: There's always a completion item selected by default, you may want to enable
-  -- no select by setting `"suggest.noselect": true` in your configuration file
-  -- NOTE: Use command ':verbose imap <tab>' to make sure Tab is not mapped by
-  -- other plugins before putting this into your config
-  local opts = { silent = true, noremap = true, expr = true, replace_keycodes = false }
-  keyset("i", "<TAB>", 'coc#pum#visible() ? coc#pum#next(1) : v:lua.check_back_space() ? "<TAB>" : coc#refresh()', opts)
-  keyset("i", "<S-TAB>", [[coc#pum#visible() ? coc#pum#prev(1) : "\<C-h>"]], opts)
-
-  -- Make <CR> to accept selected completion item or notify coc.nvim to format
-  -- <C-g>u breaks current undo, please make your own choice
-  keyset("i", "<cr>", [[coc#pum#visible() ? coc#pum#confirm() : "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>"]], opts)
-
-  -- Use <c-j> to trigger snippets
-  keyset("i", "<c-j>", "<Plug>(coc-snippets-expand-jump)")
-  -- Use <c-space> to trigger completion
-  keyset("i", "<c-space>", "coc#refresh()", { silent = true, expr = true })
-
-  -- Use `[g` and `]g` to navigate diagnostics
-  -- Use `:CocDiagnostics` to get all diagnostics of current buffer in location list
-  keyset("n", "[g", "<Plug>(coc-diagnostic-prev)", { silent = true })
-  keyset("n", "]g", "<Plug>(coc-diagnostic-next)", { silent = true })
-
-  -- GoTo code navigation
-  keyset("n", "gd", "<Plug>(coc-definition)", { silent = true })
-  keyset("n", "gy", "<Plug>(coc-type-definition)", { silent = true })
-  keyset("n", "gi", "<Plug>(coc-implementation)", { silent = true })
-  keyset("n", "gr", "<Plug>(coc-references)", { silent = true })
-
-  -- Use K to show documentation in preview window
-  function _G.show_docs()
-    local cw = vim.fn.expand("<cword>")
-    if vim.fn.index({ "vim", "help" }, vim.bo.filetype) >= 0 then
-      vim.api.nvim_command("h " .. cw)
-    elseif vim.api.nvim_eval("coc#rpc#ready()") then
-      vim.fn.CocActionAsync("doHover")
-    else
-      vim.api.nvim_command("!" .. vim.o.keywordprg .. " " .. cw)
-    end
-  end
-  keyset("n", "K", "<CMD>lua _G.show_docs()<CR>", { silent = true })
-
-  -- Highlight the symbol and its references on a CursorHold event(cursor is idle)
-  vim.api.nvim_create_augroup("CocGroup", {})
-  vim.api.nvim_create_autocmd("CursorHold", {
-    group = "CocGroup",
-    command = "silent call CocActionAsync('highlight')",
-    desc = "Highlight symbol under cursor on CursorHold",
-  })
-
-  -- Symbol renaming
-  keyset("n", "<leader>rn", "<Plug>(coc-rename)", { silent = true })
-
-  -- Formatting selected code
-  keyset("x", "<leader>f", "<Plug>(coc-format-selected)", { silent = true })
-  keyset("n", "<leader>f", "<Plug>(coc-format-selected)", { silent = true })
-
-  -- Setup formatexpr specified filetype(s)
-  vim.api.nvim_create_autocmd("FileType", {
-    group = "CocGroup",
-    pattern = "typescript,json",
-    command = "setl formatexpr=CocAction('formatSelected')",
-    desc = "Setup formatexpr specified filetype(s).",
-  })
-
-  -- Update signature help on jump placeholder
-  vim.api.nvim_create_autocmd("User", {
-    group = "CocGroup",
-    pattern = "CocJumpPlaceholder",
-    command = "call CocActionAsync('showSignatureHelp')",
-    desc = "Update signature help on jump placeholder",
-  })
-
-  -- Apply codeAction to the selected region
-  -- Example: `<leader>aap` for current paragraph
-  local opts = { silent = true, nowait = true }
-  keyset("x", "<leader>a", "<Plug>(coc-codeaction-selected)", opts)
-  keyset("n", "<leader>a", "<Plug>(coc-codeaction-selected)", opts)
-
-  -- Remap keys for apply code actions at the cursor position.
-  keyset("n", "<leader>ac", "<Plug>(coc-codeaction-cursor)", opts)
-  -- Remap keys for apply code actions affect whole buffer.
-  keyset("n", "<leader>as", "<Plug>(coc-codeaction-source)", opts)
-  -- Remap keys for applying codeActions to the current buffer
-  keyset("n", "<leader>ac", "<Plug>(coc-codeaction)", opts)
-  -- Apply the most preferred quickfix action on the current line.
-  keyset("n", "<leader>qf", "<Plug>(coc-fix-current)", opts)
-
-  -- Remap keys for apply refactor code actions.
-  keyset("n", "<leader>re", "<Plug>(coc-codeaction-refactor)", { silent = true })
-  keyset("x", "<leader>r", "<Plug>(coc-codeaction-refactor-selected)", { silent = true })
-  keyset("n", "<leader>r", "<Plug>(coc-codeaction-refactor-selected)", { silent = true })
-
-  -- Run the Code Lens actions on the current line
-  keyset("n", "<leader>cl", "<Plug>(coc-codelens-action)", opts)
-
-  -- Map function and class text objects
-  -- NOTE: Requires 'textDocument.documentSymbol' support from the language server
-  keyset("x", "if", "<Plug>(coc-funcobj-i)", opts)
-  keyset("o", "if", "<Plug>(coc-funcobj-i)", opts)
-  keyset("x", "af", "<Plug>(coc-funcobj-a)", opts)
-  keyset("o", "af", "<Plug>(coc-funcobj-a)", opts)
-  keyset("x", "ic", "<Plug>(coc-classobj-i)", opts)
-  keyset("o", "ic", "<Plug>(coc-classobj-i)", opts)
-  keyset("x", "ac", "<Plug>(coc-classobj-a)", opts)
-  keyset("o", "ac", "<Plug>(coc-classobj-a)", opts)
-
-  -- Remap <C-f> and <C-b> to scroll float windows/popups
-  ---@diagnostic disable-next-line: redefined-local
-  local opts = { silent = true, nowait = true, expr = true }
-  keyset("n", "<C-f>", 'coc#float#has_scroll() ? coc#float#scroll(1) : "<C-f>"', opts)
-  keyset("n", "<C-b>", 'coc#float#has_scroll() ? coc#float#scroll(0) : "<C-b>"', opts)
-  keyset("i", "<C-f>", 'coc#float#has_scroll() ? "<c-r>=coc#float#scroll(1)<cr>" : "<Right>"', opts)
-  keyset("i", "<C-b>", 'coc#float#has_scroll() ? "<c-r>=coc#float#scroll(0)<cr>" : "<Left>"', opts)
-  keyset("v", "<C-f>", 'coc#float#has_scroll() ? coc#float#scroll(1) : "<C-f>"', opts)
-  keyset("v", "<C-b>", 'coc#float#has_scroll() ? coc#float#scroll(0) : "<C-b>"', opts)
-
-  -- Use CTRL-S for selections ranges
-  -- Requires 'textDocument/selectionRange' support of language server
-  keyset("n", "<C-s>", "<Plug>(coc-range-select)", { silent = true })
-  keyset("x", "<C-s>", "<Plug>(coc-range-select)", { silent = true })
-
-  -- Add `:Format` command to format current buffer
-  vim.api.nvim_create_user_command("Format", "call CocAction('format')", {})
-
-  -- " Add `:Fold` command to fold current buffer
-  vim.api.nvim_create_user_command("Fold", "call CocAction('fold', <f-args>)", { nargs = "?" })
-
-  -- Add `:OR` command for organize imports of the current buffer
-  vim.api.nvim_create_user_command("OR", "call CocActionAsync('runCommand', 'editor.action.organizeImport')", {})
-
-  -- Add (Neo)Vim's native statusline support
-  -- NOTE: Please see `:h coc-status` for integrations with external plugins that
-  -- provide custom statusline: lightline.vim, vim-airline
-  vim.opt.statusline:prepend("%{coc#status()}%{get(b:,'coc_current_function','')}")
-
-  -- Mappings for CoCList
-  -- code actions and coc stuff
-  ---@diagnostic disable-next-line: redefined-local
-  local opts = { silent = true, nowait = true }
-  -- Show all diagnostics
-  keyset("n", "<space>a", ":<C-u>CocList diagnostics<cr>", opts)
-  -- Manage extensions
-  keyset("n", "<space>e", ":<C-u>CocList extensions<cr>", opts)
-  -- Show commands
-  keyset("n", "<space>c", ":<C-u>CocList commands<cr>", opts)
-  -- Find symbol of current document
-  keyset("n", "<space>o", ":<C-u>CocList outline<cr>", opts)
-  -- Search workspace symbols
-  keyset("n", "<space>s", ":<C-u>CocList -I symbols<cr>", opts)
-  -- Do default action for next item
-  keyset("n", "<space>j", ":<C-u>CocNext<cr>", opts)
-  -- Do default action for previous item
-  keyset("n", "<space>k", ":<C-u>CocPrev<cr>", opts)
-  -- Resume latest coc list
-  keyset("n", "<space>p", ":<C-u>CocListResume<cr>", opts)
-end
-
-return M
--- a/home/programs/neovim/lua/plugins/haskell-tools-nvim-lua
+++ b/home/programs/neovim/lua/plugins/haskell-tools-nvim-lua
@@ -0,0 +1,5 @@
+{
+  'mrccjkb/haskell-tools.nvim',
+  version = '^3',
+  lazy = false,
+}
--- a/home/programs/neovim/lua/plugins/which-key-nvim.lua
+++ b/home/programs/neovim/lua/plugins/which-key-nvim.lua
@@ -4,13 +4,9 @@ return {
    optional = true,
    event = "VeryLazy",
    init = function()
-        vim.o.timeout = true
-        vim.o.timeoutlen = 300
-      end,
-    opts = {
-      defaults = {
-        ["<localLeader>l"] = { name = "+vimtex" },
-      },
-    },
+      vim.o.timeout = true
+      vim.o.timeoutlen = 300
+    end,
+    opts = {},
  },
 }
--- a/home/programs/prusa-slicer/default.nix
+++ b/home/programs/prusa-slicer/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }:
+
+{
+  home.packages = with pkgs; [ prusa-slicer ];
+}
--- a/home/programs/pulseaudio/config
+++ b/home/programs/pulseaudio/config
@@ -0,0 +1 @@
+UPPER_THRESHOLD=200
--- a/home/programs/pulseaudio/default.nix
+++ b/home/programs/pulseaudio/default.nix
@@ -0,0 +1,5 @@
+{ config, ... }:
+
+{
+  xdg.configFile."pulseaudio-ctl/config".source = ./config;
+}
--- a/home/programs/xmonad/src/xmobar/xmobar.hs
+++ b/home/programs/xmonad/src/xmobar/xmobar.hs
@@ -18,7 +18,7 @@ config =
    , commands =
      [
        --Run $ Audio 10
-        Run $ Com "/bin/sh" ["-c", "Status=$(pulseaudio-ctl full-status); Volume=$(cut -d ' ' -f 1 <<<$Status); Mute=$(cut -d ' ' -f 2 <<<$Status); Microphone=$(cut -d ' ' -f 3 <<<$Status); SpeakerColor=\"#a6e3a1\"; MicColor=\"#a6e3a1\"; if [[ $Mute == \"yes\" ]]; then Symbol=\"\xf466\"; SpeakerColor=\"#f38ba8\"; elif [[ $Volume -le 50 ]]; then Symbol=\"\xf027\"; elseSymbol=\"\xf028\"; fi; if [[ $Microphone == \"yes\" ]]; then MicOut=\"\xf036d\"; MicColor=\"#f38ba8\"; else MicOut=\"\xf036c\"; fi; echo \"<fc=$SpeakerColor><fn=1>$Symbol</fn></fc> $Volume% <fc=$MicColor><fn=1>$MicOut</fn></fc>\""] "audio" 10
+        Run $ Com "/bin/sh" ["-c", "Status=$(pulseaudio-ctl full-status); Volume=$(cut -d ' ' -f 1 <<<$Status); Mute=$(cut -d ' ' -f 2 <<<$Status); Microphone=$(cut -d ' ' -f 3 <<<$Status); SpeakerColor=\"#a6e3a1\"; MicColor=\"#a6e3a1\"; if [[ $Mute == \"yes\" ]]; then Symbol=\"\xf466\"; SpeakerColor=\"#f38ba8\"; elif [[ $Volume -le 100 ]]; then Symbol=\"\xf027\"; elseSymbol=\"\xf028\"; fi; if [[ $Microphone == \"yes\" ]]; then MicOut=\"\xf036d\"; MicColor=\"#f38ba8\"; else MicOut=\"\xf036c\"; fi; Volume=$(( Volume/2 )); echo \"<fc=$SpeakerColor><fn=1>$Symbol</fn></fc> $Volume% <fc=$MicColor><fn=1>$MicOut</fn></fc>\""] "audio" 10
        --Run $ Com "/bin/sh" ["-c", "Status=$(pulseaudio-ctl full-status);
        --  Volume=$(cut -d ' ' -f 1 <<<$Status);
        --  Mute=$(cut -d ' ' -f 2 <<<$Status);
--- a/home/programs/xmonad/src/xmonad.hs
+++ b/home/programs/xmonad/src/xmonad.hs
@@ -54,7 +54,7 @@ myconfig = def
    , ("<XF86AudioLowerVolume>", spawn "pulseaudio-ctl down 5")
    , ("<XF86AudioMicMute>", spawn "pulseaudio-ctl mute-input")
  ]
-  `removeKeysP` [ "M-S-q" ]
+  --`removeKeysP` [ "M-S-q" ]

 myXmobarPP :: PP
 myXmobarPP = def
@@ -97,3 +97,4 @@ myManageHooks = composeAll
 myStartupHook :: X ()
 myStartupHook = do
  mapM_ spawnOnce ["xmobar -x " ++ show sid | sid <- [0..9]]
+  spawnOnce "dropbox"
--- a/home/programs/zulip/default.nix
+++ b/home/programs/zulip/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }:
+
+{
+  home.packages = with pkgs; [ zulip ];
+}
--- a/home/services/betterlockscreen/default.nix
+++ b/home/services/betterlockscreen/default.nix
@@ -4,5 +4,6 @@
  services.betterlockscreen = {
    enable = true;
    arguments = [ "blur" ];
+    inactiveInterval = 30;
  };
 }