neovim plugins

neovim - completion and snippets
neovim - change line number colors
2024-02-25 22:35:52 -05:00 · 2024-02-25 21:48:51 -05:00 · 2024-02-24 16:45:06 -05:00 · 2024-02-24 16:22:39 -05:00 · 2024-02-24 16:14:11 -05:00 · 2024-02-24 14:48:57 -05:00
13 changed files with 160 additions and 592 deletions
--- a/flake.lock
+++ b/flake.lock
@ -21,27 +21,6 @@
        "type": "github"
      }
    },
-    "crane": {
-      "inputs": {
-        "nixpkgs": [
-          "helix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1701025348,
-        "narHash": "sha256-42GHmYH+GF7VjwGSt+fVT1CQuNpGanJbNgVHTAZppUM=",
-        "owner": "ipetkov",
-        "repo": "crane",
-        "rev": "42afaeb1a0325194a7cdb526332d2cb92fddd07b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ipetkov",
-        "repo": "crane",
-        "type": "github"
-      }
-    },
    "darwin": {
      "inputs": {
        "nixpkgs": [
@ -135,24 +114,6 @@
      "inputs": {
        "systems": "systems_2"
      },
-      "locked": {
-        "lastModified": 1694529238,
-        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_3"
-      },
      "locked": {
        "lastModified": 1701680307,
        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
@ -189,28 +150,6 @@
        "type": "github"
      }
    },
-    "helix": {
-      "inputs": {
-        "crane": "crane",
-        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_2",
-        "rust-overlay": "rust-overlay"
-      },
-      "locked": {
-        "lastModified": 1708526834,
-        "narHash": "sha256-dcE2cal0dLwomM977zsZpL/i9O3zloaMPkC4oor2yYc=",
-        "owner": "helix-editor",
-        "repo": "helix",
-        "rev": "98ebeeebd8c7462409f82d34ff4ac0a7ae9116c7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "helix-editor",
-        "ref": "master",
-        "repo": "helix",
-        "type": "github"
-      }
-    },
    "home-manager": {
      "inputs": {
        "nixpkgs": [
@ -239,11 +178,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1708558280,
-        "narHash": "sha256-w1ns8evB6N9VTrAojcdXLWenROtd77g3vyClrqeFdG8=",
+        "lastModified": 1708591310,
+        "narHash": "sha256-8mQGVs8JccWTnORgoLOTh9zvf6Np+x2JzhIc+LDcJ9s=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "0b69d574162cfa6eb7919d5614a48d0185550891",
+        "rev": "0e0e9669547e45ea6cca2de4044c1a384fd0fe55",
        "type": "github"
      },
      "original": {
@ -260,11 +199,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1707919853,
-        "narHash": "sha256-qxmBGDzutuJ/tsX4gp+Mr7fjxOZBbeT9ixhS5o4iFOw=",
+        "lastModified": 1708558280,
+        "narHash": "sha256-w1ns8evB6N9VTrAojcdXLWenROtd77g3vyClrqeFdG8=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "043ba285c6dc20f36441d48525402bcb9743c498",
+        "rev": "0b69d574162cfa6eb7919d5614a48d0185550891",
        "type": "github"
      },
      "original": {
@ -281,11 +220,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1707707289,
-        "narHash": "sha256-YuDt/eSTXMEHv8jS8BEZJgqCcG8Tr3cyqaZjJFXZHsw=",
+        "lastModified": 1708231718,
+        "narHash": "sha256-IZdieFWvhBkxoOFMDejqLUYqD94WN6k0YSpw0DFy+4g=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "44f50a5ecaab72a61d5fd8e5c5717bc4bf9c25dd",
+        "rev": "0e6857fa1d632637488666c08e7b02c08e3178f8",
        "type": "github"
      },
      "original": {
@ -302,11 +241,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1708527729,
-        "narHash": "sha256-quEEqEH4ftM9VFMB4kRzcjcNIlRKZ++DKNwmwR4kWq4=",
+        "lastModified": 1708786913,
+        "narHash": "sha256-48S/znQt945Vt49VzJf+3jnSaOZnGy7yDkvuywCJxsE=",
        "owner": "doronbehar",
        "repo": "nix-matlab",
-        "rev": "ecd097ea7d4fefc4fc51e3402578a12ee7e312f7",
+        "rev": "54d0aeceaab86b56bcd2dea4c6c0238d36178fa2",
        "type": "gitlab"
      },
      "original": {
@ -317,11 +256,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1708091350,
-        "narHash": "sha256-o28BJYi68qqvHipT7V2jkWxDiMS1LF9nxUsou+eFUPQ=",
+        "lastModified": 1708594753,
+        "narHash": "sha256-c/gH7iXS/IYH9NrFOT+aJqTq+iEBkvAkpWuUHGU3+f0=",
        "owner": "NixOs",
        "repo": "nixos-hardware",
-        "rev": "106d3fec43bcea19cb2e061ca02531d54b542ce3",
+        "rev": "3f7d0bca003eac1a1a7f4659bbab9c8f8c2a0958",
        "type": "github"
      },
      "original": {
@ -349,27 +288,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1700794826,
-        "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=",
+        "lastModified": 1708655239,
+        "narHash": "sha256-ZrP/yACUvDB+zbqYJsln4iwotbH6CTZiTkANJ0AgDv4=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1708475490,
-        "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "0e74ca98a74bc7270d28838369593635a5db3260",
+        "rev": "cbc4211f0afffe6dfd2478a62615dd5175a13f9a",
        "type": "github"
      },
      "original": {
@ -391,11 +314,11 @@
        "pre-commit-hooks": "pre-commit-hooks"
      },
      "locked": {
-        "lastModified": 1708562079,
-        "narHash": "sha256-tTTT/7411SIDdmdse2TsaF4Td6oIhrN28asyI4htxEI=",
+        "lastModified": 1708614940,
+        "narHash": "sha256-36muWApzetaV4WAEeqKsWxW4k2l0u3E841RI4sHPiz0=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "66c019d638aae024d7ad36fcf608ee3181ffeeff",
+        "rev": "060a05138ca1a46fc0a0f79ef27f080cac57a59e",
        "type": "github"
      },
      "original": {
@ -406,11 +329,11 @@
    },
    "nur": {
      "locked": {
-        "lastModified": 1708564227,
-        "narHash": "sha256-6uKGopOaw+pdkdq1ooZDCZ8rjjRQ1YHpHWnIBW8D9/U=",
+        "lastModified": 1708793180,
+        "narHash": "sha256-TCu1L+Msied0BLUDXStChcz3e1yvd2no/DxLjyffYVI=",
        "owner": "nix-community",
        "repo": "nur",
-        "rev": "65a4caef6f81f8c48f24117df7358c200d792d35",
+        "rev": "6eb0394958661a7b8a16e7e670170d1908631d8f",
        "type": "github"
      },
      "original": {
@ -422,7 +345,7 @@
    "pre-commit-hooks": {
      "inputs": {
        "flake-compat": "flake-compat_3",
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils",
        "gitignore": "gitignore",
        "nixpkgs": [
          "nixvim",
@ -434,11 +357,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1707297608,
-        "narHash": "sha256-ADjo/5VySGlvtCW3qR+vdFF4xM9kJFlRDqcC9ZGI8EA=",
+        "lastModified": 1708018599,
+        "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=",
        "owner": "cachix",
        "repo": "pre-commit-hooks.nix",
-        "rev": "0db2e67ee49910adfa13010e7f012149660af7f0",
+        "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431",
        "type": "github"
      },
      "original": {
@ -450,40 +373,14 @@
    "root": {
      "inputs": {
        "agenix": "agenix",
-        "helix": "helix",
        "home-manager": "home-manager_2",
        "nix-matlab": "nix-matlab",
        "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_2",
        "nixvim": "nixvim",
        "nur": "nur"
      }
    },
-    "rust-overlay": {
-      "inputs": {
-        "flake-utils": [
-          "helix",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "helix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1701137803,
-        "narHash": "sha256-0LcPAdql5IhQSUXJx3Zna0dYTgdIoYO7zUrsKgiBd04=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "9dd940c967502f844eacea52a61e9596268d4f70",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
    "systems": {
      "locked": {
        "lastModified": 1681028828,
@ -513,21 +410,6 @@
        "repo": "default",
        "type": "github"
      }
-    },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
    }
  },
  "root": "root",
--- a/flake.nix
+++ b/flake.nix
@ -6,17 +6,14 @@
    extra-substituters = [
      # Nix community's cache server
      "https://nix-community.cachix.org"
-      "https://helix.cachix.org"
    ];
    extra-trusted-public-keys = [
      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-      "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs="
    ];
  };

  inputs = {
    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    helix.url = "github:helix-editor/helix/master";
    home-manager = {
      url = "github:nix-community/home-manager";
      inputs.nixpkgs.follows = "nixpkgs";
@ -40,7 +37,6 @@
    self,
    nixpkgs,
    home-manager,
-    helix,
    nixos-hardware,
    nur,
    agenix,
--- a/users/tacocat/helix/default.nix
+++ b/users/tacocat/helix/default.nix
@ -1,53 +0,0 @@
-{
-  # config,
-  pkgs,
-  inputs,
-  ...
-}: {
-  imports = [
-    ./languages.nix
-  ];
-
-  programs.helix = {
-    enable = true;
-    package = inputs.helix.packages.${pkgs.system}.default;
-    extraPackages = with pkgs; [
-      clang-tools
-      marksman
-      nil
-      nodePackages.bash-language-server
-      shellcheck
-      texlab
-      tectonic
-      lua-language-server
-      zathura
-      vhdl-ls
-    ];
-    settings = {
-      theme = "catppuccin_frappe";
-      editor = {
-        line-number = "relative";
-        lsp.display-messages = true;
-        scrolloff = 10;
-        middle-click-paste = false;
-        cursorline = true;
-        auto-format = false;
-        idle-timeout = 400;
-        color-modes = true;
-        soft-wrap.enable = true;
-        whitespace = {
-          render = {
-            space = "none";
-            tab = "none";
-            newline = "none";
-          };
-        };
-        indent-guides = {
-          render = true;
-          character = "▏";
-          rainbow-option = "dim";
-        };
-      };
-    };
-  };
-}
--- a/users/tacocat/helix/languages.nix
+++ b/users/tacocat/helix/languages.nix
@ -1,55 +0,0 @@
-{
-  pkgs,
-  lib,
-  ...
-}: {
-  programs.helix.languages = {
-    language = [
-      {
-        name = "latex";
-        indent = {
-          tab-width = 2;
-          unit = "\t";
-        };
-      }
-
-      {
-        name = "c";
-        indent = {
-          tab-width = 2;
-          unit = "\t";
-        };
-      }
-    ];
-    language-server = {
-      nil = {
-        config.nil.formatting.command = ["${lib.getExe pkgs.alejandra}" "-q"];
-      };
-
-      texlab = {
-        config.texlab = {
-          forwardSearch.executable = "zathura";
-          forwardSearch.args = ["--synctex-forward" "%l:1:%f" "%p"];
-          build = {
-            executable = "tectonic";
-            onSave = true;
-            forwardSearchAfter = true;
-            auxDirectory = "build";
-            logDirectory = "build";
-            pdfDirectory = "build";
-            args = [
-              "-X"
-              "compile"
-              "%f"
-              "--synctex"
-              "--keep-logs"
-              "--keep-intermediates"
-              "--outdir"
-              "build"
-            ];
-          };
-        };
-      };
-    };
-  };
-}
--- a/users/tacocat/home.nix
+++ b/users/tacocat/home.nix
@ -3,7 +3,6 @@
    ./programs
    ./services
    ./shell
-    ./helix
    ./wayland
    ./email.nix
    ./lf
@ -24,11 +23,12 @@
      "$HOME/.dotnet"
    ];
    packages = with pkgs; [
+      fd
+      ripgrep
      matlab
      octave
      mpv
      krita
-      notesnook
      tree
      gimp
      r2modman
@ -43,7 +43,6 @@
      discord
      libreoffice
      notify-desktop
-      texlive.combined.scheme-medium
      libsixel
      aspell
      aspellDicts.en
--- a/users/tacocat/neovim/default.nix
+++ b/users/tacocat/neovim/default.nix
@ -1,19 +1,26 @@
 {
  pkgs,
-  lib,
  ...
 }: {
  programs.nixvim = {
    enable = true;
-    colorschemes.nord = {
+    colorschemes.ayu = {
      enable = true;
-      borders = true;
-      contrast = true;
+      settings = {
+        mirage = true;
+        overrides = {
+          LineNr = { fg = "#707A8C"; };
+        };
+      };
    };
    clipboard = {
      providers.wl-copy.enable = true;
      register = "unnamedplus";
    };
+    extraPackages = with pkgs; [
+      latexrun
+      zathura
+    ];
    options = {
      number = true;
      relativenumber = true;
@ -29,22 +36,123 @@
      showmode = false;
    };
    plugins = {
-      lightline = {
+      telescope = {
        enable = true;
-        colorscheme = "nord";
      };
+      comment-nvim = {
+        enable = true;
+      };
+      markdown-preview = {
+        enable = true;
+        browser = "firefox";
+      };
+      lualine = {
+        enable = true;
+        sectionSeparators = {
+          left = "";
+          right = "";
+        };
+        componentSeparators = {
+          left = "╱";
+          right = "╲";
+        };
+      };
+      lsp = {
+        enable = true;
+        servers = {
+          nil_ls = {
+            enable = true;
+          };
+        };
+      };
+      nvim-cmp = {
+        enable = true;
+        sources = [
+          { name = "nvim_lsp"; }
+          { name = "treesitter"; }
+          { name = "luasnip"; }
+          { name = "latex_symbols"; }
+          { name = "path"; }
+          { name = "buffer"; }
+        ];
+        snippet.expand = "luasnip";
+        completion = {
+          autocomplete = false;
+        };
+        mapping = {
+          "<C-Space>" = "cmp.mapping.complete()";
+          "<C-e>" = "cmp.mapping.close()";
+          "<CR>" = "cmp.mapping.confirm({ select = true })";
+          "<C-b>" = "cmp.mapping.scroll_docs(-4)";
+          "<C-f>" = "cmp.mapping.scroll_docs(4)";
+          "<C-p>" = {
+            action = "cmp.mapping.select_prev_item()";
+            modes = [
+              "i"
+              "s"
+            ];
+          };
+          "<C-n>" = {
+            action = "cmp.mapping.select_next_item()";
+            modes = [
+              "i"
+              "s"
+            ];
+          };
+        };
+      };
+      luasnip = {
+        enable = true;
+      };
+      friendly-snippets.enable = true;
      gitsigns = {
        enable = true;
      };
      treesitter = {
        enable = true;
        nixvimInjections = true;
+        indent = true;
+        disabledLanguages = [
+          "latex"
+        ];
+        ignoreInstall = [
+          "latex"
+        ];
+      };
+      vimtex = {
+        enable = true;
+        texlivePackage = pkgs.texliveFull;
+        settings = {
+          compiler_method = "latexrun";
+          view_method = "zathura";
+        };
      };
    };
-    #    filetype.extension = {
-    #    	".md" = ''
-    #    		vim.bo.spell = true
-    #    	'';
-    #    };
+    files = {
+      "ftplugin/nix.lua" = {
+        options = {
+          expandtab = true;
+          shiftwidth = 2;
+          tabstop = 2;
+        };
+      };
+      "ftplugin/markdown.lua" = {
+        options = {
+          spell = true;
+        };
+      };
+      "ftplugin/tex.lua" = {
+        options = {
+          spell = true;
+        };
+      };
+    };
+    keymaps = [
+      {
+        action = "<cmd>nohl<CR>";
+        key = "<C-q>";
+        options.silent = true;
+      }
+    ];
  };
 }
--- a/users/tacocat/programs/default.nix
+++ b/users/tacocat/programs/default.nix
@ -8,8 +8,8 @@
    ./fzf.nix
    ./tmux.nix
    ./tiny.nix
-    ./vim.nix
    ./radioboat.nix
+    ./zoxide.nix
  ];

  programs.eza = {
--- a/users/tacocat/programs/tmux.nix
+++ b/users/tacocat/programs/tmux.nix
@ -4,6 +4,7 @@
    escapeTime = 0;
    clock24 = true;
    mouse = true;
+    keyMode = "vi";
    newSession = true;
    shell = "${pkgs.fish}/bin/fish";
    sensibleOnTop = true;
@ -12,6 +13,7 @@
      set -g focus-events on
      set -g allow-passthrough on
      set -g set-clipboard on
+      set -sa terminal-features ',foot:RGB'
    '';
  };
 }
--- a/users/tacocat/programs/vim.nix
+++ b/users/tacocat/programs/vim.nix
@ -1,99 +0,0 @@
-{pkgs, ...}: let
-  rose-pine-vim = pkgs.vimUtils.buildVimPlugin {
-    name = "rose-pine-vim";
-    src = pkgs.fetchFromGitHub {
-      owner = "rose-pine";
-      repo = "vim";
-      rev = "d149980cfa5cdec487df23b2e9963c3256f3a9f3";
-      sha256 = "a+RCmgSG+snwBVQCzSnp8wVxSoQcLqoJjnTiDviTGqc=";
-    };
-  };
-
-  vim-spell-en-utf8-dictionary = builtins.fetchurl {
-    url = "http://ftp.vim.org/vim/runtime/spell/en.utf-8.spl";
-    sha256 = "0w1h9lw2c52is553r8yh5qzyc9dbbraa57w9q0r9v8xn974vvjpy";
-  };
-
-  vim-spell-en-utf8-suggestions = builtins.fetchurl {
-    url = "http://ftp.vim.org/vim/runtime/spell/en.utf-8.sug";
-    sha256 = "1v1jr4rsjaxaq8bmvi92c93p4b14x2y1z95zl7bjybaqcmhmwvjv";
-  };
-
-  vim-spell-en-latin1-dictionary = builtins.fetchurl {
-    url = "http://ftp.vim.org/vim/runtime/spell/en.latin1.spl";
-    sha256 = "0i8q2si2bm8c0556j3c0gjin3bixgs055yqqk1irvz4wszy9w3b2";
-  };
-
-  vim-spell-en-latin1-suggestions = builtins.fetchurl {
-    url = "http://ftp.vim.org/vim/runtime/spell/en.latin1.sug";
-    sha256 = "00ibcbj2b2krwd5zl9zl671db44k3fl59sz1yymb9ydkpkj9gpp6";
-  };
-in {
-  programs.vim = {
-    enable = true;
-    settings = {
-      copyindent = true;
-      expandtab = false;
-      hidden = true;
-      history = 100;
-      ignorecase = false;
-      modeline = true;
-      mousefocus = false;
-      number = true;
-      relativenumber = true;
-      shiftwidth = 2;
-      tabstop = 2;
-    };
-    plugins = with pkgs.vimPlugins; [
-      everforest
-      catppuccin-vim
-      sonokai
-      vim-colors-solarized
-      gruvbox
-      rose-pine-vim
-      terminus
-      vim-fugitive
-      vim-gitgutter
-      tabular
-      vim-markdown
-    ];
-    extraConfig = ''
-      if has('termguicolors')
-        set termguicolors
-      endif
-      set background=dark
-      colorscheme rosepine_moon
-
-      set scrolloff=5
-      set hlsearch
-      set signcolumn=yes
-      set updatetime=100
-      set cursorline
-      set autoindent
-      set belloff=all
-
-      nnoremap <C-@> :call system("wl-copy", @")<CR>
-      nnoremap <C-q> :nohlsearch<CR>
-
-      let g:vim_markdown_folding_disabled = 1
-      let g:vim_markdown_math = 1
-    '';
-  };
-
-  home.file.".vim/after/plugin/terminus.vim".text = ''
-     let &t_SI="\e[6 q"
-     let &t_EI="\e[2 q"
-     let &t_Cs = "\e[4:3m"
-    let &t_Ce = "\e[4:0m"
-  '';
-
-  home.file.".vim/after/ftplugin/markdown.vim".text = ''
-    setlocal spell spelllang=en_us
-    setlocal nomodeline
-  '';
-
-  home.file."/.vim/spell/en.utf-8.spl".source = vim-spell-en-utf8-dictionary;
-  home.file."/.vim/spell/en.utf-8.sug".source = vim-spell-en-utf8-suggestions;
-  home.file."/.vim/spell/en.latin1.spl".source = vim-spell-en-latin1-dictionary;
-  home.file."/.vim/spell/en.latin1.sug".source = vim-spell-en-latin1-suggestions;
-}
--- a/users/tacocat/programs/zoxide.nix
+++ b/users/tacocat/programs/zoxide.nix
@ -0,0 +1,6 @@
+{...}: {
+  programs.zoxide = {
+    enable = true;
+    enableFishIntegration = true;
+  };
+}
--- a/users/tacocat/shell/fish.nix
+++ b/users/tacocat/shell/fish.nix
@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{...}: {
  programs.fish = {
    enable = true;
    interactiveShellInit = ''
@ -11,19 +11,5 @@
        tmux attach
      end
    '';
-    shellAliases = {
-      xilinx-env = "distrobox enter --additional-flags '--env _JAVA_AWT_WM_NONREPARENTING=1' arch";
-    };
-    plugins = [
-      {
-        name = "z";
-        src = pkgs.fetchFromGitHub {
-          owner = "jethrokuan";
-          repo = "z";
-          rev = "85f863f20f24faf675827fb00f3a4e15c7838d76";
-          sha256 = "+FUBM7CodtZrYKqU542fQD+ZDGrd2438trKM0tIESs0=";
-        };
-      }
-    ];
  };
 }
--- a/users/tacocat/wayland/river/init
+++ b/users/tacocat/wayland/river/init
@ -1,188 +0,0 @@
-#!/usr/bin/env bash
-
-# See the river(1), riverctl(1), and rivertile(1) man pages for complete
-# documentation.
-
-# Note: the "Super" modifier is also known as Logo, GUI, Windows, Mod4, etc.
-
-# riverctl spawn "dbus-update-activation-environment SEATD_SOCK DISPLAY WAYLAND _DISPLAY XDG_CURRENT_DESKTOP=river"
-riverctl spawn "dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP"
-
-riverctl map normal Super+Shift Return spawn 'foot'
-riverctl map normal Super D spawn 'rofi -show drun'
-
-# firefox
-riverctl map normal Super+Shift F spawn "firefox"
-
-# screenshot utility
-riverctl map normal None Print spawn 'IMG=~/Pictures/screenshots/$(date | sed "s/\s/-/g" | sed "s/--/-/g").png&&grim -g "$(slurp)" $IMG && cat $IMG | wl-copy && notify-send "Screenshot has been saved and copied to your clipboard" -a "grim" -u normal -t 2000'
-
-# Super+Q to close the focused view
-riverctl map normal Super Q close
-
-# Super+Shift+E to exit river
-riverctl map normal Super+Shift E exit
-
-# Super+J and Super+K to focus the next/previous view in the layout stack
-riverctl map normal Super J focus-view next
-riverctl map normal Super K focus-view previous
-
-# Super+Shift+J and Super+Shift+K to swap the focused view with the next/previous
-# view in the layout stack
-riverctl map normal Super+Shift J swap next
-riverctl map normal Super+Shift K swap previous
-
-# Super+Period and Super+Comma to focus the next/previous output
-riverctl map normal Super Period focus-output next
-riverctl map normal Super Comma focus-output previous
-
-# Super+Shift+{Period,Comma} to send the focused view to the next/previous output
-riverctl map normal Super+Shift Period send-to-output next
-riverctl map normal Super+Shift Comma send-to-output previous
-
-# Super+Return to bump the focused view to the top of the layout stack
-riverctl map normal Super Return zoom
-
-# Super+H and Super+L to decrease/increase the main ratio of rivertile(1)
-riverctl map normal Super H send-layout-cmd rivertile "main-ratio -0.05"
-riverctl map normal Super L send-layout-cmd rivertile "main-ratio +0.05"
-
-# Super+Shift+H and Super+Shift+L to increment/decrement the main count of rivertile(1)
-riverctl map normal Super+Shift H send-layout-cmd rivertile "main-count +1"
-riverctl map normal Super+Shift L send-layout-cmd rivertile "main-count -1"
-
-# Super+Alt+{H,J,K,L} to move views
-riverctl map normal Super+Alt H move left 100
-riverctl map normal Super+Alt J move down 100
-riverctl map normal Super+Alt K move up 100
-riverctl map normal Super+Alt L move right 100
-
-# Super+Alt+Control+{H,J,K,L} to snap views to screen edges
-riverctl map normal Super+Alt+Control H snap left
-riverctl map normal Super+Alt+Control J snap down
-riverctl map normal Super+Alt+Control K snap up
-riverctl map normal Super+Alt+Control L snap right
-
-# Super+Alt+Shift+{H,J,K,L} to resize views
-riverctl map normal Super+Alt+Shift H resize horizontal -100
-riverctl map normal Super+Alt+Shift J resize vertical 100
-riverctl map normal Super+Alt+Shift K resize vertical -100
-riverctl map normal Super+Alt+Shift L resize horizontal 100
-
-# Super + Left Mouse Button to move views
-riverctl map-pointer normal Super BTN_LEFT move-view
-
-# Super + Right Mouse Button to resize views
-riverctl map-pointer normal Super BTN_RIGHT resize-view
-
-# Super + Middle Mouse Button to toggle float
-riverctl map-pointer normal Super BTN_MIDDLE toggle-float
-
-for i in $(seq 1 9)
-do
-    tags=$((1 << ($i - 1)))
-
-    # Super+[1-9] to focus tag [0-8]
-    riverctl map normal Super $i set-focused-tags $tags
-
-    # Super+Shift+[1-9] to tag focused view with tag [0-8]
-    riverctl map normal Super+Shift $i set-view-tags $tags
-
-    # Super+Control+[1-9] to toggle focus of tag [0-8]
-    riverctl map normal Super+Control $i toggle-focused-tags $tags
-
-    # Super+Shift+Control+[1-9] to toggle tag [0-8] of focused view
-    riverctl map normal Super+Shift+Control $i toggle-view-tags $tags
-done
-
-# Super+0 to focus all tags
-# Super+Shift+0 to tag focused view with all tags
-all_tags=$(((1 << 32) - 1))
-riverctl map normal Super 0 set-focused-tags $all_tags
-riverctl map normal Super+Shift 0 set-view-tags $all_tags
-
-# Super+Space to toggle float
-riverctl map normal Super Space toggle-float
-
-# Super+F to toggle fullscreen
-riverctl map normal Super F toggle-fullscreen
-
-# Super+{Up,Right,Down,Left} to change layout orientation
-riverctl map normal Super Up    send-layout-cmd rivertile "main-location top"
-riverctl map normal Super Right send-layout-cmd rivertile "main-location right"
-riverctl map normal Super Down  send-layout-cmd rivertile "main-location bottom"
-riverctl map normal Super Left  send-layout-cmd rivertile "main-location left"
-
-# Declare a passthrough mode. This mode has only a single mapping to return to
-# normal mode. This makes it useful for testing a nested wayland compositor
-riverctl declare-mode passthrough
-
-# Super+F11 to enter passthrough mode
-riverctl map normal Super F11 enter-mode passthrough
-
-# Super+F11 to return to normal mode
-riverctl map passthrough Super F11 enter-mode normal
-
-# Various media key mapping examples for both normal and locked mode which do
-# not have a modifier
-for mode in normal locked
-do
-    # Eject the optical drive (well if you still have one that is)
-    riverctl map $mode None XF86Eject spawn 'eject -T'
-
-    # Control pulse audio volume with pamixer (https://github.com/cdemoulins/pamixer)
-    riverctl map $mode None XF86AudioRaiseVolume  spawn 'pamixer -i 5'
-    riverctl map $mode None XF86AudioLowerVolume  spawn 'pamixer -d 5'
-    riverctl map $mode None XF86AudioMute         spawn 'pamixer --toggle-mute'
-
-    # Control MPRIS aware media players with playerctl (https://github.com/altdesktop/playerctl)
-    riverctl map $mode None XF86AudioMedia spawn 'playerctl play-pause'
-    riverctl map $mode None XF86AudioPlay  spawn 'playerctl play-pause'
-    riverctl map $mode None XF86AudioPrev  spawn 'playerctl previous'
-    riverctl map $mode None XF86AudioNext  spawn 'playerctl next'
-
-    # Control screen backlight brightness with light (https://github.com/haikarainen/light)
-    riverctl map $mode None XF86MonBrightnessUp   spawn 'brightnessctl s +5%'
-    riverctl map $mode None XF86MonBrightnessDown spawn 'brightnessctl s 5%-'
-done
-
-# Set background and border color
-riverctl background-color 0x002b36
-riverctl border-color-focused 0x93a1a1
-riverctl border-color-unfocused 0x586e75
-riverctl spawn "wbg $HOME/.config/river/background.jpg"
-
-# Set keyboard repeat rate
-riverctl set-repeat 50 300
-
-
-# Make all views with an app-id that starts with "float" and title "foo" start floating.
-riverctl rule-add float -app-id 'float*' -title 'foo'
-
-# Make all views with app-id "bar" and any title use client-side decorations
-riverctl rule-add csd -app-id "bar"
-
-# Set the default layout generator to be rivertile and start it.
-# River will send the process group of the init executable SIGTERM on exit.
-riverctl default-layout rivertile
-
-if [ -n "$(pgrep rivertile)" ]
-then
-  printf 'RIVERCTL: rivertile already running with pid %s\n' "$(pidof rivertile)"
-else
-  rivertile \
-    -view-padding 6 \
-    -outer-padding 6 \
-    -main-count 1 \
-    -main-ratio 0.5 >/dev/null 2>&1 &
-fi
-
-# autostart apps
-# riverctl spawn "$HOME/.config/river/process"
-riverctl spawn 'dunst'
-riverctl spawn 'gammastep-indicator'
-riverctl spawn 'nm-applet --indicator'
-riverctl spawn 'waybar'
-riverctl spawn "swayidle -w \
-    timeout 600 'swaylock -f -c 14171d' \
-    before-sleep 'swaylock -f -c 14171d'"
--- a/users/tacocat/wayland/river/process
+++ b/users/tacocat/wayland/river/process
@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-dunst &
-gammastep-indicator &
-nm-applet --indicator &
-waybar &
-
-# void linux specific setup
-# if test -f ~/.config/river/void-setup; then
-#   exec ~/.config/river/void-setup
-#   exit
-# fi
-
-exec swayidle -w \
-    timeout 600 'swaylock -f -c 14171d' \
-    before-sleep 'swaylock -f -c 14171d'
Author	SHA1	Message	Date
Aria Nolan	5534fb4321	neovim plugins	2024-02-25 22:35:52 -05:00
Aria Nolan	5ff463bab3	neovim - completion and snippets	2024-02-25 21:48:51 -05:00
Aria Nolan	3ae435fcd4	neovim - change line number colors	2024-02-24 16:45:06 -05:00
Aria Nolan	5fb569e3aa	zoxide	2024-02-24 16:22:39 -05:00
Aria Nolan	3fc5f87f03	added lsp	2024-02-24 16:14:11 -05:00
Aria Nolan	6113cb2132	RGB support for tmux	2024-02-24 14:48:57 -05:00
Aria Nolan	f3b84d39ff	configured neovim for latex, removed vim and helix	2024-02-24 13:24:17 -05:00
Aria Nolan	081e95317d	updated flake	2024-02-24 12:14:50 -05:00
Aria Nolan	8d436b570e	neovim filetype options	2024-02-24 11:55:49 -05:00