A shit ton of stuff
This commit is contained in:
parent
7cbe73ad5b
commit
c01ce48abe
|
@ -19,6 +19,7 @@ Table of my own keybinds. Here as documentation for myself. I am yet to include
|
||||||
| _cp_ | Use system clipboard | |
|
| _cp_ | Use system clipboard | |
|
||||||
| _jl_ | Save | |
|
| _jl_ | Save | |
|
||||||
| _jk_ | Exit insert mode | |
|
| _jk_ | Exit insert mode | |
|
||||||
|
| _rw_ | Rename word under cursor | |
|
||||||
| _\<leader>k_ | Insert digraph | |
|
| _\<leader>k_ | Insert digraph | |
|
||||||
| _\<leader>a_ | Swap last 2 used buffers | |
|
| _\<leader>a_ | Swap last 2 used buffers | |
|
||||||
| C-n | Open tree | nvim-tree |
|
| C-n | Open tree | nvim-tree |
|
||||||
|
@ -35,10 +36,6 @@ Table of my own keybinds. Here as documentation for myself. I am yet to include
|
||||||
| \<leader>rn | Rename | lspconfig |
|
| \<leader>rn | Rename | lspconfig |
|
||||||
| \<leader>f | format | lspconfig |
|
| \<leader>f | format | lspconfig |
|
||||||
|
|
||||||
### Lh-brackets
|
|
||||||
|
|
||||||
The default brackets I load in each buffer are (), [], "", '', {} and \`\`. Different brackets are added in different filetypes.
|
|
||||||
|
|
||||||
### Telescope
|
### Telescope
|
||||||
|
|
||||||
| Keybind | Description | Plugins |
|
| Keybind | Description | Plugins |
|
||||||
|
@ -60,13 +57,13 @@ The default brackets I load in each buffer are (), [], "", '', {} and \`\`. Diff
|
||||||
|
|
||||||
| Keybind | Description |
|
| Keybind | Description |
|
||||||
| ------- | ------------------- |
|
| ------- | ------------------- |
|
||||||
| _sc_ | Case split |
|
| _isc_ | Case split |
|
||||||
| _mc_ | Make case |
|
| _imc_ | Make case |
|
||||||
| _ml_ | Make lemma |
|
| _iml_ | Make lemma |
|
||||||
| _es_ | Expression search |
|
| _ies_ | Expression search |
|
||||||
| _gd_ | Generate definition |
|
| _igd_ | Generate definition |
|
||||||
| _rh_ | Refine hole |
|
| _irh_ | Refine hole |
|
||||||
| _ac_ | Add clause |
|
| _iac_ | Add clause |
|
||||||
|
|
||||||
### Purescript
|
### Purescript
|
||||||
|
|
||||||
|
@ -75,6 +72,12 @@ The default brackets I load in each buffer are (), [], "", '', {} and \`\`. Diff
|
||||||
| _vb_ | Make tmux run spago build in sepearate pane |
|
| _vb_ | Make tmux run spago build in sepearate pane |
|
||||||
| _vt_ | Make tmux run spago test in separate pane |
|
| _vt_ | Make tmux run spago test in separate pane |
|
||||||
|
|
||||||
|
### Nix
|
||||||
|
|
||||||
|
| Keybind | Description |
|
||||||
|
| ------- | ------------------------------------------- |
|
||||||
|
| _ug_ | Run nix-fetchgit on the current file |
|
||||||
|
|
||||||
### Lean
|
### Lean
|
||||||
|
|
||||||
- Extra brackets: ⟨⟩
|
- Extra brackets: ⟨⟩
|
||||||
|
|
12
dotfiles/neovim/ftplugin/nix.lua
Normal file
12
dotfiles/neovim/ftplugin/nix.lua
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
local A = require("my.plugins.arpeggio")
|
||||||
|
local C = require("my.plugins.comment")
|
||||||
|
|
||||||
|
print("Initializing nix keybinds...")
|
||||||
|
|
||||||
|
-- Use _ug_ to fetchgit stuff
|
||||||
|
A.chordSilent("n", "ug",
|
||||||
|
":lua require('my.helpers.update-nix-fetchgit').update()<CR>",
|
||||||
|
{ settings = "b" })
|
||||||
|
|
||||||
|
-- Idk why this isn't here by default
|
||||||
|
C.setCommentString("nix", "# %s")
|
|
@ -1,5 +1,7 @@
|
||||||
local arpeggio = require("my.plugins.arpeggio")
|
local arpeggio = require("my.plugins.arpeggio")
|
||||||
|
|
||||||
|
print("Initializing nix keybinds...")
|
||||||
|
|
||||||
-- Use vt to test
|
-- Use vt to test
|
||||||
arpeggio.chordSilent("n", "vt", ":VimuxRunCommand \"clear && spago test\"<CR>",
|
arpeggio.chordSilent("n", "vt", ":VimuxRunCommand \"clear && spago test\"<CR>",
|
||||||
{ settings = "b" })
|
{ settings = "b" })
|
||||||
|
|
|
@ -31,7 +31,9 @@ function M.setup()
|
||||||
arpeggio.chord("i", "jk", "<Esc>") -- Remap Esc to jk
|
arpeggio.chord("i", "jk", "<Esc>") -- Remap Esc to jk
|
||||||
arpeggio.chord("i", "<Leader>k", "<C-k><cr>") -- Rebind digraph insertion to leader+k
|
arpeggio.chord("i", "<Leader>k", "<C-k><cr>") -- Rebind digraph insertion to leader+k
|
||||||
arpeggio.chord("inv", "<Leader>a", "<C-6><cr>") -- Rebind switching to the last pane using leader+a
|
arpeggio.chord("inv", "<Leader>a", "<C-6><cr>") -- Rebind switching to the last pane using leader+a
|
||||||
|
arpeggio.chord("inv", "<Leader>a", "<C-6><cr>") -- Rebind switching to the last pane using leader+a
|
||||||
arpeggio.chord("nv", "cp", "\"+") -- Press cp to use the global clipboard
|
arpeggio.chord("nv", "cp", "\"+") -- Press cp to use the global clipboard
|
||||||
|
arpeggio.chord("n", "rw", ":%s/<C-r><C-w>/") -- Press rt to rename word under cursor
|
||||||
end
|
end
|
||||||
|
|
||||||
return M
|
return M
|
||||||
|
|
|
@ -10,9 +10,11 @@ function M.setup()
|
||||||
"nvim-telescope/telescope.nvim", -- fuzzy search for say opening files
|
"nvim-telescope/telescope.nvim", -- fuzzy search for say opening files
|
||||||
"purescript-contrib/purescript-vim", -- purescript support
|
"purescript-contrib/purescript-vim", -- purescript support
|
||||||
"terrortylor/nvim-comment", -- allows toggling line comments
|
"terrortylor/nvim-comment", -- allows toggling line comments
|
||||||
{"nvim-treesitter/nvim-treesitter", run = ":TSUpdate"}, -- use treesitter for syntax highlighting
|
-- This gets installed by nix now!
|
||||||
{"nvim-treesitter/nvim-treesitter-textobjects", run = ":TSUpdate"}, -- the lean plugin wants me to install this, lol
|
-- {"nvim-treesitter/nvim-treesitter", run = ":TSUpdate"}, -- use treesitter for syntax highlighting
|
||||||
"startup-nvim/startup.nvim", -- splash screen
|
"nvim-treesitter/nvim-treesitter-textobjects", -- the lean plugin wants me to install this, lol
|
||||||
|
-- "startup-nvim/startup.nvim", -- splash screen
|
||||||
|
"glepnir/dashboard-nvim", -- similar to startup.nvim
|
||||||
"kyazdani42/nvim-web-devicons", -- nice looking icons
|
"kyazdani42/nvim-web-devicons", -- nice looking icons
|
||||||
"nvim-lualine/lualine.nvim", -- customizable status line
|
"nvim-lualine/lualine.nvim", -- customizable status line
|
||||||
"kyazdani42/nvim-tree.lua", -- file tree
|
"kyazdani42/nvim-tree.lua", -- file tree
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
local A = require("my.helpers.augroup")
|
local A = require("my.helpers.augroup")
|
||||||
local M = {}
|
local M = {}
|
||||||
|
|
||||||
local extraCommentStrings = {nix = "# %s", lean = "/- %s -/", bkf = "-- %s"}
|
local extraCommentStrings = { lean = "/- %s -/", bkf = "-- %s" }
|
||||||
|
|
||||||
-- Update comments for certain languages
|
-- Update comments for certain languages
|
||||||
local function setCommentString(extension, commentString)
|
function M.setCommentString(extension, commentString)
|
||||||
A.augroup('set-commentstring-' .. extension, function()
|
A.augroup('set-commentstring-' .. extension, function()
|
||||||
local action =
|
local action =
|
||||||
':lua vim.api.nvim_buf_set_option(0, "commentstring", "' ..
|
':lua vim.api.nvim_buf_set_option(0, "commentstring", "' ..
|
||||||
|
@ -19,7 +19,7 @@ function M.setup()
|
||||||
require('nvim_comment').setup()
|
require('nvim_comment').setup()
|
||||||
|
|
||||||
for lang, commentString in pairs(extraCommentStrings) do
|
for lang, commentString in pairs(extraCommentStrings) do
|
||||||
setCommentString(lang, commentString)
|
M.setCommentString(lang, commentString)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
32
dotfiles/neovim/lua/my/plugins/dashboard.lua
Normal file
32
dotfiles/neovim/lua/my/plugins/dashboard.lua
Normal file
|
@ -0,0 +1,32 @@
|
||||||
|
local M = {}
|
||||||
|
|
||||||
|
function M.setup()
|
||||||
|
local db = require("dashboard")
|
||||||
|
-- db.custom_header = {
|
||||||
|
-- "", "",
|
||||||
|
-- [[ /\ \ /\ \ /\ \ /\ \ /\ \ ]],
|
||||||
|
-- [[ /::\____\ /::\ \ /::\ \ /::\ \ /::\ \ ]],
|
||||||
|
-- [[ /:::/ / /::::\ \ \:::\ \ /::::\ \ /::::\ \ ]],
|
||||||
|
-- [[ /:::/ _/___ /::::::\ \ \:::\ \ /::::::\ \ /::::::\ \ ]],
|
||||||
|
-- [[ /:::/ /\ \ /:::/\:::\ \ \:::\ \ /:::/\:::\ \ /:::/\:::\ \ ]],
|
||||||
|
-- [[ /:::/ /::\____\ /:::/__\:::\ \ \:::\ \ /:::/__\:::\ \ /:::/__\:::\ \ ]],
|
||||||
|
-- [[ /:::/ /:::/ / /::::\ \:::\ \ /::::\ \ /::::\ \:::\ \ /::::\ \:::\ \ ]],
|
||||||
|
-- [[ /:::/ /:::/ _/___ /::::::\ \:::\ \ /::::::\ \ /::::::\ \:::\ \ /::::::\ \:::\ \ ]],
|
||||||
|
-- [[ /:::/___/:::/ /\ \ /:::/\:::\ \:::\ \ /:::/\:::\ \ /:::/\:::\ \:::\ \ /:::/\:::\ \:::\____\ ]],
|
||||||
|
-- [[|:::| /:::/ /::\____\/:::/ \:::\ \:::\____\ /:::/ \:::\____\/:::/__\:::\ \:::\____\/:::/ \:::\ \:::| |]],
|
||||||
|
-- [[|:::|__/:::/ /:::/ /\::/ \:::\ /:::/ / /:::/ \::/ /\:::\ \:::\ \::/ /\::/ |::::\ /:::|____|]],
|
||||||
|
-- [[ \:::\/:::/ /:::/ / \/____/ \:::\/:::/ / /:::/ / \/____/ \:::\ \:::\ \/____/ \/____|:::::\/:::/ / ]],
|
||||||
|
-- [[ \::::::/ /:::/ / \::::::/ / /:::/ / \:::\ \:::\ \ |:::::::::/ / ]],
|
||||||
|
-- [[ \::::/___/:::/ / \::::/ / /:::/ / \:::\ \:::\____\ |::|\::::/ / ]],
|
||||||
|
-- [[ \:::\__/:::/ / /:::/ / \::/ / \:::\ \::/ / |::| \::/____/ ]],
|
||||||
|
-- [[ \::::::::/ / /:::/ / \/____/ \:::\ \/____/ |::| ~| ]],
|
||||||
|
-- [[ \::::::/ / /:::/ / \:::\ \ |::| | ]],
|
||||||
|
-- [[ \::::/ / /:::/ / \:::\____\ \::| | ]],
|
||||||
|
-- [[ \::/____/ \::/ / \::/ / \:| | ]],
|
||||||
|
-- [[ ~~ \/____/ \/____/ \|___| ]],
|
||||||
|
-- ""
|
||||||
|
-- }
|
||||||
|
|
||||||
|
end
|
||||||
|
|
||||||
|
return M
|
|
@ -3,7 +3,7 @@ local M = {}
|
||||||
function M.setup()
|
function M.setup()
|
||||||
-- Other unconfigured plugins
|
-- Other unconfigured plugins
|
||||||
require('nvim-autopairs').setup()
|
require('nvim-autopairs').setup()
|
||||||
require("startup").setup()
|
-- require("startup").setup()
|
||||||
require("presence"):setup({}) -- wtf does the : do here?
|
require("presence"):setup({}) -- wtf does the : do here?
|
||||||
-- require("which-key").setup()
|
-- require("which-key").setup()
|
||||||
|
|
||||||
|
@ -12,6 +12,7 @@ function M.setup()
|
||||||
-- require("my.plugins.fzf-lua").setup()
|
-- require("my.plugins.fzf-lua").setup()
|
||||||
-- require("my.plugins.nerdtree").setup()
|
-- require("my.plugins.nerdtree").setup()
|
||||||
require("my.plugins.treesitter").setup()
|
require("my.plugins.treesitter").setup()
|
||||||
|
require("my.plugins.dashboard").setup()
|
||||||
require("my.plugins.cmp").setup()
|
require("my.plugins.cmp").setup()
|
||||||
require("my.plugins.lspconfig").setup()
|
require("my.plugins.lspconfig").setup()
|
||||||
require("my.plugins.null-ls").setup()
|
require("my.plugins.null-ls").setup()
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
local A = require("my.plugins.arpeggio")
|
|
||||||
|
|
||||||
local M = {}
|
local M = {}
|
||||||
|
|
||||||
local function map(buf, mode, lhs, rhs, opts)
|
local function map(buf, mode, lhs, rhs, opts)
|
||||||
|
@ -60,14 +58,6 @@ local function on_attach_typescript(client, bufnr)
|
||||||
M.on_attach(client, bufnr)
|
M.on_attach(client, bufnr)
|
||||||
end
|
end
|
||||||
|
|
||||||
local function on_attach_nix(c, b)
|
|
||||||
A.chordSilent("n", "ug",
|
|
||||||
":lua require('my.helpers.update-nix-fetchgit').update()<CR>",
|
|
||||||
{settings = "b"})
|
|
||||||
|
|
||||||
M.on_attach(c, b)
|
|
||||||
end
|
|
||||||
|
|
||||||
-- General server config
|
-- General server config
|
||||||
local servers = {
|
local servers = {
|
||||||
tsserver = { on_attach = on_attach_typescript },
|
tsserver = { on_attach = on_attach_typescript },
|
||||||
|
@ -105,13 +95,13 @@ local servers = {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
rnix = {on_attach = on_attach_nix},
|
|
||||||
hls = {
|
hls = {
|
||||||
haskell = {
|
haskell = {
|
||||||
-- set formatter
|
-- set formatter
|
||||||
formattingProvider = "ormolu"
|
formattingProvider = "ormolu"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
rnix = {},
|
||||||
cssls = {}
|
cssls = {}
|
||||||
-- agda = {}, Haven't gotten this one to work yet
|
-- agda = {}, Haven't gotten this one to work yet
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,7 +7,7 @@ function M.setup()
|
||||||
|
|
||||||
local sources = {
|
local sources = {
|
||||||
null_ls.builtins.formatting.prettierd.with({extra_filetypes = {}}), -- format ts files
|
null_ls.builtins.formatting.prettierd.with({extra_filetypes = {}}), -- format ts files
|
||||||
null_ls.builtins.formatting.lua_format -- format lua code
|
-- null_ls.builtins.formatting.lua_format -- format lua code
|
||||||
}
|
}
|
||||||
|
|
||||||
null_ls.setup({sources = sources, on_attach = lspconfig.on_attach})
|
null_ls.setup({sources = sources, on_attach = lspconfig.on_attach})
|
||||||
|
|
|
@ -10,7 +10,7 @@ function M.setup()
|
||||||
sync_install = false,
|
sync_install = false,
|
||||||
indent = { enable = true },
|
indent = { enable = true },
|
||||||
highlight = {
|
highlight = {
|
||||||
enable = false,
|
enable = true,
|
||||||
|
|
||||||
-- Setting this to true will run `:h syntax` and tree-sitter at the same time.
|
-- Setting this to true will run `:h syntax` and tree-sitter at the same time.
|
||||||
-- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
|
-- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
|
||||||
|
|
24
flake.lock
24
flake.lock
|
@ -275,11 +275,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1654113405,
|
"lastModified": 1656169755,
|
||||||
"narHash": "sha256-VpK+0QaWG2JRgB00lw77N9TjkE3ec0iMYIX1TzGpxa4=",
|
"narHash": "sha256-Nlnm4jeQWEGjYrE6hxi/7HYHjBSZ/E0RtjCYifnNsWk=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "ac2287df5a2d6f0a44bbcbd11701dbbf6ec43675",
|
"rev": "4a3d01fb53f52ac83194081272795aa4612c2381",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -555,11 +555,11 @@
|
||||||
},
|
},
|
||||||
"nixos-unstable": {
|
"nixos-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1653407748,
|
"lastModified": 1658161305,
|
||||||
"narHash": "sha256-g9puJaILRTb9ttlLQ7IehpV7Wcy0n+vs8LOFu6ylQcM=",
|
"narHash": "sha256-X/nhnMCa1Wx4YapsspyAs6QYz6T/85FofrI6NpdPDHg=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "5ce6597eca7d7b518c03ecda57d45f9404b5e060",
|
"rev": "e4d49de45a3b5dbcb881656b4e3986e666141ea9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -571,11 +571,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1654605205,
|
"lastModified": 1658237535,
|
||||||
"narHash": "sha256-aRTGBWpAr6DlLMoUyIvctWRcL59vpW98CdWUl+BhnXg=",
|
"narHash": "sha256-z3Ff9oSXEPSZMfXdM+r29oJxtyKUnlUOc18U9E6Q48g=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "daa78e40e9592dbbcfd53937cbd9aae9e69a2999",
|
"rev": "e732e1fdbf79bec59f7ade4a3675b091b4a9f6d6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -587,11 +587,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1653326962,
|
"lastModified": 1658150454,
|
||||||
"narHash": "sha256-W8feCYqKTsMre4nAEpv5Kx1PVFC+hao/LwqtB2Wci/8=",
|
"narHash": "sha256-dhyOQvRT8oYWN0SwsNyujohBsJqwF5W7fnhEcfgBk7E=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "41cc1d5d9584103be4108c1815c350e07c807036",
|
"rev": "3110964916469ad6ed9fea72a0a3119a0959a14e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
./tmux.nix
|
./tmux.nix
|
||||||
./kmonad.nix
|
./kmonad.nix
|
||||||
./direnv.nix
|
./direnv.nix
|
||||||
./chromium.nix
|
# ./chromium.nix
|
||||||
./vieb.nix
|
./vieb.nix
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,10 +40,11 @@
|
||||||
vimclip # use neovim anywhere
|
vimclip # use neovim anywhere
|
||||||
|
|
||||||
# chat apps
|
# chat apps
|
||||||
discord
|
unstable.discord
|
||||||
# deluge
|
|
||||||
slack
|
slack
|
||||||
|
signal-desktop
|
||||||
tdesktop # telegram for the desktop
|
tdesktop # telegram for the desktop
|
||||||
|
# deluge
|
||||||
# zoom-us
|
# zoom-us
|
||||||
# teams
|
# teams
|
||||||
|
|
||||||
|
|
|
@ -17,12 +17,13 @@ let
|
||||||
sumneko-lua-language-server # lua
|
sumneko-lua-language-server # lua
|
||||||
rnix-lsp # nix
|
rnix-lsp # nix
|
||||||
haskell-language-server # haskell
|
haskell-language-server # haskell
|
||||||
vscode-langservers-extracted # css and shit
|
# vscode-langservers-extracted # css and shit
|
||||||
|
|
||||||
# Formatters
|
# Formatters
|
||||||
luaformatter # lua
|
luaformatter # lua
|
||||||
ormolu # haskell
|
ormolu # haskell
|
||||||
prettierd # prettier but faster
|
easy-purescript-nix.purs-tidy
|
||||||
|
# prettierd # prettier but faster
|
||||||
|
|
||||||
# Others
|
# Others
|
||||||
wakatime # time tracking
|
wakatime # time tracking
|
||||||
|
@ -31,6 +32,7 @@ let
|
||||||
nodePackages.typescript # typescript language
|
nodePackages.typescript # typescript language
|
||||||
update-nix-fetchgit # useful for nix stuff
|
update-nix-fetchgit # useful for nix stuff
|
||||||
tree-sitter # syntax highlighting
|
tree-sitter # syntax highlighting
|
||||||
|
libstdcxx5 # required by treesitter aparently
|
||||||
|
|
||||||
texlive.combined.scheme-full # latex stuff
|
texlive.combined.scheme-full # latex stuff
|
||||||
python38Packages.pygments # required for latex syntax highlighting
|
python38Packages.pygments # required for latex syntax highlighting
|
||||||
|
@ -54,20 +56,20 @@ let
|
||||||
--prefix PATH : ${lib.makeBinPath extraPackages}
|
--prefix PATH : ${lib.makeBinPath extraPackages}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
nvim-treesitter = pkgs.vimPlugins.nvim-treesitter.withPlugins (plugins: pkgs.tree-sitter.allGrammars);
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
home-manager.users.adrielus =
|
home-manager.users.adrielus =
|
||||||
{
|
{
|
||||||
home.file.".local/share/nvim/site/pack/paqs/start/paq-nvim".source = paq;
|
home.file.".local/share/nvim/site/pack/paqs/start/paq-nvim".source = paq;
|
||||||
|
home.file.".local/share/nvim/site/pack/treesitter/start/nvim-treesitter".source = nvim-treesitter;
|
||||||
xdg.configFile."nvim/init.lua".text = myConfig;
|
xdg.configFile."nvim/init.lua".text = myConfig;
|
||||||
xdg.configFile."nvim/lua/my/theme.lua".source = theme.neovim.theme;
|
xdg.configFile."nvim/lua/my/theme.lua".source = theme.neovim.theme;
|
||||||
|
|
||||||
|
programs.neovim.enable = false;
|
||||||
|
|
||||||
home.packages = [
|
home.packages = [
|
||||||
neovim
|
neovim
|
||||||
];
|
];
|
||||||
|
|
||||||
programs.neovim = {
|
|
||||||
enable = false;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,5 +14,5 @@ in
|
||||||
home-manager.users.adrielus.home.sessionVariables = theme.env or { };
|
home-manager.users.adrielus.home.sessionVariables = theme.env or { };
|
||||||
}];
|
}];
|
||||||
|
|
||||||
home-manager.users.adrielus = { home.sessionVariables = variables; };
|
home-manager.users.adrielus.home.sessionVariables = variables;
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,7 +22,7 @@ in
|
||||||
sddm.path = "${foreign.sddm}";
|
sddm.path = "${foreign.sddm}";
|
||||||
grub.path = pkgs.nixos-grub2-theme;
|
grub.path = pkgs.nixos-grub2-theme;
|
||||||
|
|
||||||
xresources = builtins.readFile "${foreign.xresources}/Xresources";
|
xresources = builtins.readFile "${foreign.xresources}/${variant}.Xresources";
|
||||||
|
|
||||||
rofi = {
|
rofi = {
|
||||||
theme = builtins.readFile "${foreign.rofi}/.local/share/rofi/themes/catppuccin.rasi";
|
theme = builtins.readFile "${foreign.rofi}/.local/share/rofi/themes/catppuccin.rasi";
|
||||||
|
@ -55,15 +55,17 @@ in
|
||||||
|
|
||||||
alacritty.settings = {
|
alacritty.settings = {
|
||||||
import = [ "${foreign.alacritty}/catppuccin.yml" ];
|
import = [ "${foreign.alacritty}/catppuccin.yml" ];
|
||||||
|
# colors = variant;
|
||||||
window = {
|
window = {
|
||||||
padding = {
|
padding = {
|
||||||
x = 4;
|
x = 4;
|
||||||
y = 4;
|
y = 4;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
opacity = transparency;
|
||||||
|
|
||||||
gtk_theme_variant = v "light" "dark";
|
gtk_theme_variant = v "light" "dark";
|
||||||
};
|
};
|
||||||
|
|
||||||
background_opacity = transparency;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,49 +2,49 @@
|
||||||
tmux = fetchFromGitHub {
|
tmux = fetchFromGitHub {
|
||||||
owner = "catppuccin";
|
owner = "catppuccin";
|
||||||
repo = "tmux";
|
repo = "tmux";
|
||||||
sha256 = "0frqk3g85licwl06qnck1bpxm9c7h9mj5law5vq28i2kv24qvv9n";
|
sha256 = "1vz6srk4zfgsjpwb7xa7n9mg5kfb3x7aq963mwqnl8m4zvmcy8vz";
|
||||||
rev = "87c33d683cf2b40e1340a10fa9049af2d28f5606";
|
rev = "1c87a9e1d2fac21815497ed7f599a1c1208d40cd";
|
||||||
};
|
};
|
||||||
sddm = fetchFromGitHub {
|
sddm = fetchFromGitHub {
|
||||||
owner = "catppuccin";
|
owner = "catppuccin";
|
||||||
repo = "sddm";
|
repo = "sddm";
|
||||||
sha256 = "19r04g28w17cg4c520qnz4gdf133vz8wlgjv6538wymh13pazh84";
|
sha256 = "065g331issjw8jh0hjqfhc98sqhb4i77mwx7y9v5wdy32pmym9i1";
|
||||||
rev = "da92da8ba221c85a3d0722cd35efece616c487cf";
|
rev = "cfe861c1ea9c92e4b4cd5acb3627021e1d2f5e6c";
|
||||||
};
|
};
|
||||||
grub = fetchFromGitHub {
|
grub = fetchFromGitHub {
|
||||||
owner = "catppuccin";
|
owner = "catppuccin";
|
||||||
repo = "grub";
|
repo = "grub";
|
||||||
sha256 = "06ji9w3n36c5kdkqavpnx1bb9xz4l83i1fx059a4gwkvni5lapkp";
|
sha256 = "0ra1psb37wsgdag5swfwwzcgy73014j34c9njnvxz1jdv0k56qlc";
|
||||||
rev = "3f62cd4174465631b40269a7c5631e5ee86dec45";
|
rev = "b2919a93ef37ea1b220bab90fa0a5fa3a26eec0b";
|
||||||
};
|
};
|
||||||
gtk = fetchFromGitHub {
|
gtk = fetchFromGitHub {
|
||||||
owner = "catppuccin";
|
owner = "catppuccin";
|
||||||
repo = "gtk";
|
repo = "gtk";
|
||||||
sha256 = "16dnfaj2w34m9i0b1jcg8wpaz5zdscl56gl3hqs4b7nkap1lan01";
|
sha256 = "1l8xr651mh4lf26s5d7jfk7vv1jxh9qld0w5hgcnqsa13lncsd5h";
|
||||||
rev = "359c584f607c021fcc657ce77b81c181ebaff6de";
|
rev = "7bfea1f0d569010998302c8242bb857ed8a83058";
|
||||||
};
|
};
|
||||||
rofi = fetchFromGitHub {
|
rofi = fetchFromGitHub {
|
||||||
owner = "catppuccin";
|
owner = "catppuccin";
|
||||||
repo = "rofi";
|
repo = "rofi";
|
||||||
sha256 = "063qwhy9hpy7i7wykliccpy9sdxhj77v6ry3ys69dwcchmspyn3j";
|
sha256 = "076xkxxmwhffns35n3cnbn6lz9i4w6hvma1g4mdw0zmayvy5rmpj";
|
||||||
rev = "b5ebfaf11bb90f1104b3d256e4671c6abb66d060";
|
rev = "2e14344b789d70d42853ffe2abe79b3b85b16e24";
|
||||||
};
|
};
|
||||||
alacritty = fetchFromGitHub {
|
alacritty = fetchFromGitHub {
|
||||||
owner = "catppuccin";
|
owner = "catppuccin";
|
||||||
repo = "alacritty";
|
repo = "alacritty";
|
||||||
sha256 = "0x90ac9v9j93i8l92nn1lhzwn6kzcg55v5xv7mg6g8rcrxlsm0xk";
|
sha256 = "0ka3a79i4iv2ahkc3hy41b4s220z8ydkrma52fvcqmphw1y3h7ml";
|
||||||
rev = "8f6b261375302657136c75569bdbd6dc3e2c67c4";
|
rev = "c2d27714b43984e47347c6d81216b7670a3fe07f";
|
||||||
};
|
};
|
||||||
wallpapers = fetchFromGitHub {
|
wallpapers = fetchFromGitHub {
|
||||||
owner = "catppuccin";
|
owner = "catppuccin";
|
||||||
repo = "wallpapers";
|
repo = "wallpapers";
|
||||||
sha256 = "055080z71zf752psmgywhkm51jhba5a1b23nnb9wqhksxd5saa0n";
|
sha256 = "0p1xfr6hv4w0zw04jpbylwiy3n2w9zpxfq041ql8j3jh4inn0w1g";
|
||||||
rev = "61d997b8f4c33f6890b0d138bfed6329f3aff794";
|
rev = "72f67e1e198cf07bdfd30f70c074a946e5dc64b4";
|
||||||
};
|
};
|
||||||
xresources = fetchFromGitHub {
|
xresources = fetchFromGitHub {
|
||||||
owner = "catppuccin";
|
owner = "catppuccin";
|
||||||
repo = "xresources";
|
repo = "xresources";
|
||||||
sha256 = "0jj30xhpdgpl2ii67rv181c8pdgy88jzqnc584z4zpq4am3z4yip";
|
sha256 = "1ffx73l6s0pkf4d4g5lp2d0cfxjrbczsr5fy45i0503sa279fan7";
|
||||||
rev = "8caaef8e506f1a1da185ee46685dd791f0efffd1";
|
rev = "a9cd582faeef2f7410eb7d4b5a83d026e3f2b865";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,6 +6,7 @@ function M.setup()
|
||||||
local catppuccin = require("catppuccin")
|
local catppuccin = require("catppuccin")
|
||||||
|
|
||||||
catppuccin.setup({
|
catppuccin.setup({
|
||||||
|
compile = { enable = true },
|
||||||
transparent_background = false,
|
transparent_background = false,
|
||||||
integrations = { nvimtree = { transparent_panel = false } }
|
integrations = { nvimtree = { transparent_panel = false } }
|
||||||
})
|
})
|
||||||
|
|
|
@ -7,13 +7,13 @@ lib.lists.map (theme: pkgs.callPackage theme { }) [
|
||||||
(catppuccin {
|
(catppuccin {
|
||||||
# wallpaper = "os/nix-magenta-pink-1920x1080.png";
|
# wallpaper = "os/nix-magenta-pink-1920x1080.png";
|
||||||
# wallpaper = "minimalistic/tetris.png";
|
# wallpaper = "minimalistic/tetris.png";
|
||||||
# wallpaper = "os/nix-black-4k.png";
|
wallpaper = "os/nix-black-4k.png";
|
||||||
# wallpaper = "landscapes/forrest.png";
|
# wallpaper = "landscapes/forrest.png";
|
||||||
# wallpaper = "landscapes/salty_mountains.png";
|
# wallpaper = "landscapes/salty_mountains.png";
|
||||||
wallpaper = "misc/rainbow.png";
|
# wallpaper = "misc/rainbow.png";
|
||||||
# wallpaper.foreign = ./wallpapers/eye.png;
|
# wallpaper.foreign = ./wallpapers/eye.png;
|
||||||
transparency = 0.93;
|
transparency = 0.93;
|
||||||
variant = "latte";
|
variant = "frappe";
|
||||||
})
|
})
|
||||||
(githubVariant {
|
(githubVariant {
|
||||||
variant = "light";
|
variant = "light";
|
||||||
|
|
Loading…
Reference in a new issue