More workspaces, firenvim tweaks and firefox extensions
This commit is contained in:
Matei Adriel
parent
7b45cb7697
commit
271daab72d
1
dotfiles/neovim/ftplugin/markdown.lua
Normal file
1
dotfiles/neovim/ftplugin/markdown.lua
Normal file
|
|
@ -0,0 +1 @@
|
|||
require("my.helpers.wrapMovement").setup()
|
||||
|
|
@ -4,7 +4,6 @@ local scrap = require("scrap")
|
|||
require("my.helpers.wrapMovement").setup()
|
||||
|
||||
vim.opt.conceallevel = 0
|
||||
vim.opt.wrap = true
|
||||
|
||||
-- vim.opt.foldcolumn = "1"
|
||||
vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@ local function swap(key)
|
|||
end
|
||||
|
||||
function M.setup()
|
||||
vim.opt.wrap = true
|
||||
|
||||
swap("j")
|
||||
swap("k")
|
||||
swap("0")
|
||||
|
|
|
|||
|
|
@ -33,10 +33,6 @@ function M.config()
|
|||
-- {{{ Disable status line
|
||||
vim.opt.laststatus = 0
|
||||
-- }}}
|
||||
-- {{{ Enable wrapping
|
||||
vim.opt.wrap = true
|
||||
require("my.helpers.wrapMovement").setup()
|
||||
-- }}}
|
||||
end
|
||||
|
||||
return M
|
||||
|
|
|
|||
69
flake.lock
69
flake.lock
|
|
@ -56,6 +56,29 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"firefox-addons": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"dir": "pkgs/firefox-addons",
|
||||
"lastModified": 1678050445,
|
||||
"narHash": "sha256-hb5npDiqf7JjrBzLxjT537n4cQ3Doc4HFdJsdDbY8QE=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "fdf844be089a42aa3a2c9450bc769b33de5856a2",
|
||||
"revCount": 2738,
|
||||
"type": "git",
|
||||
"url": "https://gitlab.com/rycee/nur-expressions?dir=pkgs%2ffirefox-addons"
|
||||
},
|
||||
"original": {
|
||||
"dir": "pkgs/firefox-addons",
|
||||
"type": "git",
|
||||
"url": "https://gitlab.com/rycee/nur-expressions?dir=pkgs%2ffirefox-addons"
|
||||
}
|
||||
},
|
||||
"flake-compat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -73,6 +96,21 @@
|
|||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"locked": {
|
||||
"lastModified": 1629284811,
|
||||
"narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "c5d161cc0af116a2e17f54316f0bf43f0819785c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_2": {
|
||||
"locked": {
|
||||
"lastModified": 1667395993,
|
||||
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
|
||||
|
|
@ -95,11 +133,11 @@
|
|||
"utils": "utils"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1671966569,
|
||||
"narHash": "sha256-jbLgfSnmLchARBNFRvCic63CFQ9LAyvlXnBpc2kwjQc=",
|
||||
"lastModified": 1678019241,
|
||||
"narHash": "sha256-ntj0u3guaIu9dT8aZ3HtnEVhIsibtM7EaG/2VteKaTw=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "c55fa26ce05fee8e063db22918d05a73d430b2ea",
|
||||
"rev": "e314f6cf211e480ab8fa101a017e593a9bb9f21b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -145,7 +183,7 @@
|
|||
},
|
||||
"neovim-flake": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"flake-utils": "flake-utils_2",
|
||||
"nixpkgs": [
|
||||
"neovim-nightly-overlay",
|
||||
"nixpkgs"
|
||||
|
|
@ -191,11 +229,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1671883564,
|
||||
"narHash": "sha256-C15oAtyupmLB3coZY7qzEHXjhtUx/+77olVdqVMruAg=",
|
||||
"lastModified": 1677779205,
|
||||
"narHash": "sha256-6DBjL9wjq86p2GczmwnHtFRnWPBPItc67gapWENBgX8=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "dac57a4eccf1442e8bf4030df6fcbb55883cb682",
|
||||
"rev": "96e18717904dfedcd884541e5a92bf9ff632cf39",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -205,16 +243,33 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nur": {
|
||||
"locked": {
|
||||
"lastModified": 1678056369,
|
||||
"narHash": "sha256-uTm5WNE6u3cjSmAbqV3WVt7vIYkJ8Tg6fgYmjYRPYtA=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "716074f750700c6e2917017c9d51e494babf58ff",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"agenix": "agenix",
|
||||
"base16": "base16",
|
||||
"catppuccin-base16": "catppuccin-base16",
|
||||
"firefox-addons": "firefox-addons",
|
||||
"home-manager": "home-manager",
|
||||
"homeage": "homeage",
|
||||
"impermanence": "impermanence",
|
||||
"neovim-nightly-overlay": "neovim-nightly-overlay",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nur": "nur",
|
||||
"rosepine-base16": "rosepine-base16",
|
||||
"slambda": "slambda"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,6 +5,13 @@
|
|||
# Nixpkgs
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11";
|
||||
|
||||
# NUR
|
||||
nur.url = "github:nix-community/NUR";
|
||||
|
||||
# Firefox addons
|
||||
firefox-addons.url = "git+https://gitlab.com/rycee/nur-expressions?dir=pkgs/firefox-addons";
|
||||
firefox-addons.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
# Home manager
|
||||
home-manager.url = "github:nix-community/home-manager";
|
||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, ... }:
|
||||
{ pkgs, inputs, ... }:
|
||||
let
|
||||
mkBasicSearchEngine = { aliases, url, param }: {
|
||||
urls = [{
|
||||
|
|
@ -39,6 +39,24 @@ in
|
|||
# Set default search engine
|
||||
search.default = "Google";
|
||||
|
||||
extensions = with inputs.firefox-addons.packages.${pkgs.system}; [
|
||||
bypass-paywalls-clean
|
||||
clearurls # removes ugly args from urls
|
||||
firenvim # summon a nvim instance inside the browser
|
||||
gesturefy # mouse gestures
|
||||
localcdn # caches libraries locally
|
||||
lovely-forks # displays forks on github
|
||||
octolinker # github import to link thingy
|
||||
octotree # github file tree
|
||||
privacy-badger # blocks some trackers
|
||||
privacy-pass # captcha stuff
|
||||
return-youtube-dislikes
|
||||
ublock-origin # ad blocker
|
||||
vimium-c # vim keybinds
|
||||
sponsorblock # skip youtube sponsors
|
||||
translate-web-pages
|
||||
];
|
||||
|
||||
# Specify custom search engines
|
||||
search.engines = {
|
||||
"Nix Packages" = mkNixPackagesEngine {
|
||||
|
|
@ -111,4 +129,5 @@ in
|
|||
displayName = "Asana";
|
||||
id = 1;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -69,6 +69,8 @@ icon-1 = 2:browser;
|
|||
icon-2 = 3:chat;ﭮ
|
||||
icon-3 = 4:terminal;
|
||||
icon-4 = 5:reading;
|
||||
icon-5 = 6:music;
|
||||
icon-6 = 7:gaming;
|
||||
icon-default =
|
||||
|
||||
format = <label-state>
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ let
|
|||
imports = [
|
||||
inputs.base16.homeManagerModule
|
||||
inputs.homeage.homeManagerModules.homeage
|
||||
inputs.nur.nixosModules.nur
|
||||
# inputs.impermanence.nixosModules.home-manager.impermanence
|
||||
|
||||
../features/cli
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ let
|
|||
inputs.agenix.nixosModule
|
||||
inputs.base16.nixosModule
|
||||
inputs.slambda.nixosModule
|
||||
inputs.nur.nixosModules.nur
|
||||
# inputs.impermanence.nixosModule
|
||||
|
||||
./nix.nix
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
{
|
||||
boot.plymouth = {
|
||||
enable = true;
|
||||
themePackages = [ pkgs.plymouthThemes.cuts_alt ];
|
||||
themePackages = [ pkgs.plymouthThemeCutsAlt ];
|
||||
theme = "cuts_alt";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ main =
|
|||
`additionalKeysP` keymap
|
||||
where
|
||||
myWorkspaces =
|
||||
["1:dev", "2:browser", "3:chat", "4:terminal", "5:reading", "6:gaming"]
|
||||
["1:dev", "2:browser", "3:chat", "4:terminal", "5:reading", "6:music", "7:gaming"]
|
||||
|
||||
myTerminal = "alacritty"
|
||||
myBrowser = "firefox"
|
||||
|
|
|
|||
|
|
@ -1,10 +1,12 @@
|
|||
# Custom packages, that can be defined similarly to ones from nixpkgs
|
||||
# You can build them using 'nix build .#example' or (legacy) 'nix-build -A example'
|
||||
|
||||
{ pkgs ? (import ../nixpkgs.nix) { } }: {
|
||||
{ pkgs ? (import ../nixpkgs.nix) { } }:
|
||||
let plymouthThemes = pkgs.callPackage (import ./plymouth-themes.nix) { }; in
|
||||
{
|
||||
# example = pkgs.callPackage (import ./example.nix) {};
|
||||
vimclip = pkgs.callPackage (import ./vimclip.nix) { };
|
||||
sherlock = pkgs.callPackage (import ./sherlock.nix) { };
|
||||
|
||||
plymouthThemes = pkgs.callPackage (import ./plymouth-themes.nix) {};
|
||||
plymouthThemeCutsAlt = plymouthThemes.cuts_alt;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue