From 500f79cbdfebdde8ab78cd085f7a217582bdd226 Mon Sep 17 00:00:00 2001 From: Matei Adriel Date: Wed, 13 Sep 2023 18:42:37 +0300 Subject: [PATCH] Delete jupytex & add more firefox extensions --- dotfiles/neovim/ftplugin/tex.lua | 2 +- dotfiles/neovim/lua/my/plugins/jupytext.lua | 43 -------------------- flake.lock | 8 ++-- home/features/cli/default.nix | 4 +- home/features/desktop/firefox/default.nix | 8 +++- home/features/wayland/hyprland/hyprland.conf | 1 - hosts/nixos/common/optional/slambda.nix | 4 +- 7 files changed, 15 insertions(+), 55 deletions(-) delete mode 100644 dotfiles/neovim/lua/my/plugins/jupytext.lua diff --git a/dotfiles/neovim/ftplugin/tex.lua b/dotfiles/neovim/ftplugin/tex.lua index d173866..4b692dd 100644 --- a/dotfiles/neovim/ftplugin/tex.lua +++ b/dotfiles/neovim/ftplugin/tex.lua @@ -83,7 +83,7 @@ local abbreviations = { { "nope", "\\bot" }, { "yee", "\\top" }, { "ccan", "\\cancel" }, - { "comp", "\\circ" }, + { "com", "\\circ" }, { "mul", "\\cdot" }, { "smul", "\\times" }, { "card", "\\#" }, diff --git a/dotfiles/neovim/lua/my/plugins/jupytext.lua b/dotfiles/neovim/lua/my/plugins/jupytext.lua deleted file mode 100644 index f1637b2..0000000 --- a/dotfiles/neovim/lua/my/plugins/jupytext.lua +++ /dev/null @@ -1,43 +0,0 @@ -local env = require("my.helpers.env") - -local M = { - "goerz/jupytext.vim", - ft = "ipynb", - cond = env.vscode.not_active(), -} - -function M.config() - -- Use %% as cell delimiter - vim.g.jupytext_fmt = "py:percent" -end - -function M.init() - vim.cmd([[ - function GetJupytextFold(linenum) - if getline(a:linenum) =~ "^#\\s%%" - " start fold - return ">1" - elseif getline(a:linenum + 1) =~ "^#\\s%%" - return "<1" - else - return "-1" - endif - endfunction - ]]) - - -- Set the correct foldexpr - vim.api.nvim_create_autocmd("BufEnter", { - pattern = { "*.ipynb" }, - group = vim.api.nvim_create_augroup("JupytextFoldExpr", {}), - callback = function() - vim.cmd([[ - setlocal foldexpr=GetJupytextFold(v:lnum) - setlocal foldmethod=expr - " Deletes and pastes all text. Used to refresh folds. - :norm ggVGdpggdd - ]]) - end, - }) -end - -return M diff --git a/flake.lock b/flake.lock index d6b7f3e..848b38d 100644 --- a/flake.lock +++ b/flake.lock @@ -433,11 +433,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1686838518, - "narHash": "sha256-MqwA95DbSSCmk1mgL12TEdc1rQ7uyqxUDGLikrfj9yw=", + "lastModified": 1694585600, + "narHash": "sha256-X+3lxErOk5DNuyJZM7dNAaIpxadv8wMjj6pYxwpjPkc=", "ref": "refs/heads/master", - "rev": "c063e239e617477b89a320349bfbf6c1a243c642", - "revCount": 2928, + "rev": "1d028825099440cd83f934967dd20cf1f0a453f5", + "revCount": 3084, "type": "git", "url": "https://gitlab.com/rycee/nur-expressions?dir=pkgs/firefox-addons" }, diff --git a/home/features/cli/default.nix b/home/features/cli/default.nix index 804f881..cfc8591 100644 --- a/home/features/cli/default.nix +++ b/home/features/cli/default.nix @@ -24,11 +24,9 @@ fd # Better find sd # Better sed httpie # Better curl + ouch # Unified compression / decompression tool mkpasswd # Hash passwords neofetch # Display system information - zip # Zipping files - unzip # Unzipping files - unrar # For extracting shit from rars tokei # Useless but fun line of code counter (sloc alternative) bottom # System monitor tldr # Example based cli docs diff --git a/home/features/desktop/firefox/default.nix b/home/features/desktop/firefox/default.nix index 733c01a..aced79a 100644 --- a/home/features/desktop/firefox/default.nix +++ b/home/features/desktop/firefox/default.nix @@ -3,9 +3,12 @@ let # {{{ Global extensions extensions = with inputs.firefox-addons.packages.${pkgs.system}; [ buster-captcha-solver - bypass-paywalls-clean + # REASON: returns 404 for now + # bypass-paywalls-clean clearurls # removes ugly args from urls + cliget # Generates curl commands for downloading account-protected things don-t-fuck-with-paste # disallows certain websites from disabling pasting + decentraleyes # Serves local copies of a bunch of things instead of reaching a CDN gesturefy # mouse gestures i-dont-care-about-cookies localcdn # caches libraries locally @@ -44,6 +47,9 @@ in # }}} # {{{ Extensions extensions = with inputs.firefox-addons.packages.${pkgs.system}; extensions ++ [ + augmented-steam # Adds more info to steam + blocktube # Lets you block youtube channels + dearrow # Crowdsourced clickbait remover 💀 firenvim # summon a nvim instance inside the browser lovely-forks # displays forks on github octolinker # github import to link thingy diff --git a/home/features/wayland/hyprland/hyprland.conf b/home/features/wayland/hyprland/hyprland.conf index b5018db..7d8f957 100644 --- a/home/features/wayland/hyprland/hyprland.conf +++ b/home/features/wayland/hyprland/hyprland.conf @@ -55,7 +55,6 @@ misc { # Execute apps at launch exec-once = wezterm & firefox & discocss & spotify & obsidian - # {{{ Window rules # {{{ Automatically move stuff to workspaces windowrulev2 = workspace 2 silent, title:^(.*Firefox.*)$ diff --git a/hosts/nixos/common/optional/slambda.nix b/hosts/nixos/common/optional/slambda.nix index 44e006d..3370d88 100644 --- a/hosts/nixos/common/optional/slambda.nix +++ b/hosts/nixos/common/optional/slambda.nix @@ -1,4 +1,3 @@ -{ lib, ... }: let chord = from: to: { inherit from to; }; unmap = from: chord from [ ]; @@ -46,7 +45,8 @@ let (chord [ "n" "l" "s" ] [ "leftmeta" "6" ]) (chord [ "n" "l" "d" ] [ "leftmeta" "7" ]) (chord [ "n" "l" "f" ] [ "leftmeta" "8" ]) - (chord [ "n" "k" "l" ] [ "leftmeta" "p" ]) + (chord [ "n" "l" "z" ] [ "leftmeta" "9" ]) + (chord [ "n" "l" "x" ] [ "leftmeta" "0" ]) # }}} # {{{ Handled by vim (chord [ "j" "k" ] [ "f10" ])