Compare commits
3 Commits
c9f22e24ad
...
dcc35d45a1
| Author | SHA1 | Date |
|---|---|---|
 Pegasust
|
dcc35d45a1 | |
|
Pegasust
|
dce680f2a8 | |
|
Pegasust
|
0a947801ab |
|
|
@ -19,10 +19,6 @@ if empty(glob(plug_path))
|
|||
endif
|
||||
]])
|
||||
|
||||
local function truthy(v) return v ~= nil end
|
||||
|
||||
local function cfg(cfg_var, do_fn) if truthy(cfg_var) then do_fn() end end
|
||||
|
||||
-- vim-plug
|
||||
local Plug = vim.fn['plug#']
|
||||
|
||||
|
|
@ -132,8 +128,8 @@ vim.api.nvim_create_autocmd({ "VimEnter" }, {
|
|||
})
|
||||
|
||||
|
||||
vim.g.gruvbox_contrast_dark="soft";
|
||||
vim.g.gruvbox_contrast_light="soft";
|
||||
vim.g.gruvbox_contrast_dark = "soft";
|
||||
vim.g.gruvbox_contrast_light = "soft";
|
||||
vim.opt.ignorecase = true;
|
||||
vim.opt.smartcase = true;
|
||||
vim.opt.incsearch = true;
|
||||
|
|
@ -159,8 +155,8 @@ vim.api.nvim_create_user_command('Dark', function(opts)
|
|||
local contrast = (opts.args and string.len(opts.args) > 0) and opts.args or vim.g.gruvbox_contrast_dark;
|
||||
vim.g.gruvbox_contrast_dark = contrast;
|
||||
vim.opt.background = "dark";
|
||||
end,
|
||||
{nargs = "?";})
|
||||
end,
|
||||
{ nargs = "?", })
|
||||
|
||||
vim.api.nvim_create_user_command('Light', function(opts)
|
||||
-- opts: {name, args: str, fargs: Splited<str>, range, ...}
|
||||
|
|
@ -168,8 +164,8 @@ vim.api.nvim_create_user_command('Light', function(opts)
|
|||
local contrast = (opts.args and string.len(opts.args) > 0) and opts.args or vim.g.gruvbox_contrast_dark;
|
||||
vim.g.gruvbox_contrast_light = contrast;
|
||||
vim.opt.background = "light";
|
||||
end,
|
||||
{nargs = "?";})
|
||||
end,
|
||||
{ nargs = "?", })
|
||||
|
||||
vim.opt.lazyredraw = true
|
||||
vim.opt.termguicolors = true
|
||||
|
|
@ -177,7 +173,7 @@ vim.opt.cursorline = true
|
|||
-- some plugins misbehave when we do swap files
|
||||
vim.opt.swapfile = false
|
||||
vim.opt.backup = false
|
||||
vim.opt.undodir = vim.fn.stdpath('state')..'/.vim/undodir'
|
||||
vim.opt.undodir = vim.fn.stdpath('state') .. '/.vim/undodir'
|
||||
vim.opt.undofile = true
|
||||
vim.opt.completeopt = 'menuone,noselect'
|
||||
-- vim.opt.clipboard = "unnamedplus"
|
||||
|
|
@ -359,7 +355,9 @@ end, { desc = '[Z]ettelkasten [G]rep' })
|
|||
require 'treesitter-context'
|
||||
require('nvim-treesitter.configs').setup {
|
||||
yati = {
|
||||
enable = true, default_lazy = true, default_fallback = "auto",
|
||||
enable = true,
|
||||
default_lazy = true,
|
||||
default_fallback = "auto",
|
||||
disable = { "nix" }
|
||||
},
|
||||
indent = { enable = false },
|
||||
|
|
@ -506,12 +504,10 @@ local on_attach = function(client, bufnr)
|
|||
nmap('<leader>wr', vim.lsp.buf.remove_workspace_folder, '[W]orkspace [R]emove Folder')
|
||||
nmap('<leader>wl', function()
|
||||
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
|
||||
|
||||
end, '[W]orkspace [L]ist Folders')
|
||||
|
||||
-- enable inlay hints if available
|
||||
require('inlay-hints').on_attach(client, bufnr)
|
||||
|
||||
end
|
||||
-- nvim-cmp
|
||||
local cmp = require 'cmp'
|
||||
|
|
@ -624,7 +620,7 @@ require("mason").setup({
|
|||
-- Which means Mason's installed path is prioritized against our local install
|
||||
-- see: https://git.pegasust.com/pegasust/aoc/commit/b45dc32c74d84c9f787ebce7a174c9aa1d411fc2
|
||||
-- This introduces some pitfalls, so we'll take the approach of trusting user's local installation
|
||||
PATH = "append";
|
||||
PATH = "append",
|
||||
})
|
||||
require('mason-lspconfig').setup({
|
||||
ensure_installed = servers,
|
||||
|
|
@ -678,6 +674,37 @@ require('mason-lspconfig').setup_handlers({
|
|||
}
|
||||
}
|
||||
end,
|
||||
["pyright"] = function()
|
||||
require('lspconfig').pyright.setup {
|
||||
on_attach = on_attach,
|
||||
capabilities = capabilities,
|
||||
settings = {
|
||||
pyright = {
|
||||
disableLanguageServices = false,
|
||||
disableOrganizeImports = false,
|
||||
},
|
||||
python = {
|
||||
analysis = {
|
||||
autoImportCompletions = true,
|
||||
autoSearchPaths = true,
|
||||
diagnosticMode = "openFilesOnly",
|
||||
-- diagnosticSeverityOverrides =
|
||||
extraPaths = {},
|
||||
logLevel = "Information",
|
||||
stubPath = "typings",
|
||||
typeCheckingMode = "basic",
|
||||
typeshedPaths = {},
|
||||
useLibraryCodeForTypes = false,
|
||||
pythonPath = "python",
|
||||
venvPath = "",
|
||||
},
|
||||
linting = {
|
||||
mypyEnabled = true,
|
||||
}
|
||||
},
|
||||
},
|
||||
}
|
||||
end,
|
||||
["tsserver"] = function()
|
||||
require('lspconfig').tsserver.setup {
|
||||
on_attach = on_attach,
|
||||
|
|
@ -701,6 +728,17 @@ require('mason-lspconfig').setup_handlers({
|
|||
root_dir = require('lspconfig.util').root_pattern("deno.json", "deno.jsonc"),
|
||||
}
|
||||
end,
|
||||
["yamlls"] = function()
|
||||
require('lspconfig').yamlls.setup {
|
||||
on_attach = on_attach,
|
||||
capabilities = capabilities,
|
||||
settings = {
|
||||
yaml = {
|
||||
keyOrdering = false,
|
||||
}
|
||||
},
|
||||
}
|
||||
end,
|
||||
-- ["rust_analyzer"] = function()
|
||||
-- require('lspconfig').rust_analyzer.setup {
|
||||
-- on_attach = on_attach,
|
||||
|
|
@ -727,61 +765,48 @@ require('mason-lspconfig').setup_handlers({
|
|||
-- end
|
||||
})
|
||||
require("rust-tools").setup {
|
||||
tools = { -- rust-tools options
|
||||
tools = {
|
||||
-- rust-tools options
|
||||
|
||||
-- how to execute terminal commands
|
||||
-- options right now: termopen / quickfix
|
||||
executor = require("rust-tools/executors").termopen,
|
||||
|
||||
-- callback to execute once rust-analyzer is done initializing the workspace
|
||||
-- The callback receives one parameter indicating the `health` of the server: "ok" | "warning" | "error"
|
||||
on_initialized = function()
|
||||
require('inlay-hints').set_all()
|
||||
end,
|
||||
|
||||
-- automatically call RustReloadWorkspace when writing to a Cargo.toml file.
|
||||
reload_workspace_from_cargo_toml = true,
|
||||
|
||||
-- These apply to the default RustSetInlayHints command
|
||||
inlay_hints = {
|
||||
-- automatically set inlay hints (type hints)
|
||||
-- default: true
|
||||
auto = false,
|
||||
|
||||
-- Only show inlay hints for the current line
|
||||
only_current_line = false,
|
||||
|
||||
-- whether to show parameter hints with the inlay hints or not
|
||||
-- default: true
|
||||
show_parameter_hints = true,
|
||||
|
||||
-- prefix for parameter hints
|
||||
-- default: "<-"
|
||||
parameter_hints_prefix = "<- ",
|
||||
|
||||
-- prefix for all the other hints (type, chaining)
|
||||
-- default: "=>"
|
||||
other_hints_prefix = "=> ",
|
||||
|
||||
-- whether to align to the length of the longest line in the file
|
||||
max_len_align = false,
|
||||
|
||||
-- padding from the left if max_len_align is true
|
||||
max_len_align_padding = 1,
|
||||
|
||||
-- whether to align to the extreme right or not
|
||||
right_align = false,
|
||||
|
||||
-- padding from the right if right_align is true
|
||||
right_align_padding = 7,
|
||||
|
||||
-- The color of the hints
|
||||
highlight = "Comment",
|
||||
},
|
||||
|
||||
-- options same as lsp hover / vim.lsp.util.open_floating_preview()
|
||||
hover_actions = {
|
||||
|
||||
-- the border that is used for the hover window
|
||||
-- see vim.api.nvim_open_win()
|
||||
border = {
|
||||
|
|
@ -794,12 +819,10 @@ require("rust-tools").setup {
|
|||
{ "╰", "FloatBorder" },
|
||||
{ "│", "FloatBorder" },
|
||||
},
|
||||
|
||||
-- whether the hover action window gets automatically focused
|
||||
-- default: false
|
||||
auto_focus = false,
|
||||
},
|
||||
|
||||
-- settings for showing the crate graph based on graphviz and the dot
|
||||
-- command
|
||||
crate_graph = {
|
||||
|
|
@ -815,7 +838,6 @@ require("rust-tools").setup {
|
|||
-- crates
|
||||
-- default: true
|
||||
full = true,
|
||||
|
||||
-- List of backends found on: https://graphviz.org/docs/outputs/
|
||||
-- Is used for input validation and autocompletion
|
||||
-- Last updated: 2021-08-26
|
||||
|
|
@ -896,7 +918,6 @@ require("rust-tools").setup {
|
|||
on_attach(client, bufnr)
|
||||
require('inlay-hints').on_attach(client, bufnr)
|
||||
nmap('K', require 'rust-tools'.hover_actions.hover_actions, 'Hover Documentation')
|
||||
|
||||
end,
|
||||
capabilities = capabilities,
|
||||
settings = {
|
||||
|
|
@ -904,7 +925,6 @@ require("rust-tools").setup {
|
|||
command = "clippy",
|
||||
}
|
||||
}
|
||||
|
||||
}, -- rust-analyzer options
|
||||
|
||||
-- debugging stuff
|
||||
|
|
@ -979,7 +999,8 @@ require('lualine').setup {
|
|||
lualine_a = { 'mode' },
|
||||
lualine_b = { 'branch', 'diff', 'diagnostics' },
|
||||
lualine_c = {
|
||||
{ 'filename',
|
||||
{
|
||||
'filename',
|
||||
file_status = true,
|
||||
newfile_status = false,
|
||||
path = 1,
|
||||
|
|
|
|||
|
|
@ -14,7 +14,15 @@ setw -g pane-base-index 1
|
|||
set-option -g renumber-windows on
|
||||
|
||||
# status bar
|
||||
set -g status-style 'bg=#333333 fg=#5eacd3'
|
||||
# set -g status-style 'bg=#333333 fg=#5eacd3'
|
||||
# set -g status-interval 60
|
||||
# set -g status-right-style 'bg=#333333 fg=#5eacd3'
|
||||
# set -g status-right-length 50
|
||||
set -g status-right '#{cpu_bg_color} CPU: #{cpu_icon} #{cpu_percentage} | %a %h-%d %H:%M '
|
||||
# set -g status-left " "
|
||||
|
||||
# Keybinds
|
||||
set-window-option -g mode-keys vi
|
||||
|
||||
# # Log
|
||||
# set-option -g history-file /tmp/.tmux.log
|
||||
|
|
|
|||
|
|
@ -63,6 +63,7 @@ in
|
|||
};
|
||||
};
|
||||
config = lib.mkIf config.base.neovim.enable {
|
||||
# home-manager
|
||||
programs.neovim = {
|
||||
enable = true;
|
||||
package = my_neovim;
|
||||
|
|
@ -85,8 +86,8 @@ in
|
|||
# extraConfig actually writes to init-home-manager.vim (not lua)
|
||||
# https://github.com/nix-community/home-manager/pull/3287
|
||||
# extraConfig = builtins.readFile "${proj_root}/neovim/init.lua";
|
||||
extraLuaConfig = (builtins.readFile "${proj_root.config.path}//neovim/init.lua");
|
||||
};
|
||||
# home.packages = nvim_pkgs;
|
||||
xdg.configFile."nvim/init.lua".source = "${proj_root.config.path}//neovim/init.lua";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -53,6 +53,9 @@ in
|
|||
programs.tmux = {
|
||||
enable = true;
|
||||
extraConfig = builtins.readFile "${proj_root.config.path}/tmux/tmux.conf";
|
||||
plugins =
|
||||
let inherit (pkgs.tmuxPlugins) cpu net-speed;
|
||||
in [ cpu net-speed ];
|
||||
};
|
||||
programs.exa = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1673405853,
|
||||
"narHash": "sha256-6Nq9DuOo+gE2I8z5UZaKuumykz2xxZ9JGYmUthOuwSA=",
|
||||
"lastModified": 1677892403,
|
||||
"narHash": "sha256-/Wi0L1spSWLFj+UQxN3j0mPYMoc7ZoAujpUF/juFVII=",
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"rev": "b13963c8c18026aa694acd98d14f66d24666f70b",
|
||||
"rev": "105e27adb70a9890986b6d543a67761cbc1964a2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -40,11 +40,11 @@
|
|||
"flake-compat_2": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1668681692,
|
||||
"narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
|
||||
"lastModified": 1673956053,
|
||||
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "009399224d5e398d03b22badca40a37ac85412a1",
|
||||
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -56,11 +56,11 @@
|
|||
"flake-compat_3": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1668681692,
|
||||
"narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
|
||||
"lastModified": 1673956053,
|
||||
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "009399224d5e398d03b22badca40a37ac85412a1",
|
||||
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -87,11 +87,11 @@
|
|||
},
|
||||
"flake-utils": {
|
||||
"locked": {
|
||||
"lastModified": 1667395993,
|
||||
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
|
||||
"lastModified": 1676283394,
|
||||
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
|
||||
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -117,11 +117,11 @@
|
|||
},
|
||||
"flake-utils_3": {
|
||||
"locked": {
|
||||
"lastModified": 1667395993,
|
||||
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
|
||||
"lastModified": 1676283394,
|
||||
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
|
||||
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -132,11 +132,11 @@
|
|||
},
|
||||
"flake-utils_4": {
|
||||
"locked": {
|
||||
"lastModified": 1667395993,
|
||||
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
|
||||
"lastModified": 1676283394,
|
||||
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
|
||||
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -205,11 +205,11 @@
|
|||
"utils": "utils"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1673948101,
|
||||
"narHash": "sha256-cD0OzFfnLFeeaz4jVszH9QiMTn+PBxmcYzrp+xujpwM=",
|
||||
"lastModified": 1678571066,
|
||||
"narHash": "sha256-MrlMr2A3tK1MY/JUGWMVzMwois8+mHWXm/1yYdwQSIc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "bd3efacb82c721edad1ce9eda583df5fb62ab00a",
|
||||
"rev": "bf5712c5865e543fb3f4796511d4cf51efd841b1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -244,11 +244,11 @@
|
|||
},
|
||||
"locked": {
|
||||
"dir": "contrib",
|
||||
"lastModified": 1673937267,
|
||||
"narHash": "sha256-zixnItZtMZRKK0bEh8UOBeh8JT4jeMzPR2TtacfXmyE=",
|
||||
"lastModified": 1678516523,
|
||||
"narHash": "sha256-DpcG4CT542aSmLmK7bmZFumKfMwBQowWrJns895TvyU=",
|
||||
"owner": "neovim",
|
||||
"repo": "neovim",
|
||||
"rev": "2093e574c6c934a718f96d0a173aa965d3958a8b",
|
||||
"rev": "236c20795eb9f11e21e0719b735ea741711acc08",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -265,11 +265,11 @@
|
|||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1673943288,
|
||||
"narHash": "sha256-TDo9wDfZH+MJ/tTeCtZ67jdHqtVvIxetLpFN9+vqZ7g=",
|
||||
"lastModified": 1678522422,
|
||||
"narHash": "sha256-g565cBceeJTBGYSRO4Gr5mGz46RapgLolYUMXpFDBFU=",
|
||||
"owner": "nix-community",
|
||||
"repo": "neovim-nightly-overlay",
|
||||
"rev": "3c0bb335936754a2683a84ddf081594ddb567a89",
|
||||
"rev": "3e253022630b30c44c0246d2a83bf2c1f1b185c7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -287,11 +287,11 @@
|
|||
"rust-overlay": "rust-overlay_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1676039663,
|
||||
"narHash": "sha256-fkIg8rJcnvT0kEdd4lqwp90rAe5RsxSOrWsmlXzD3Uo=",
|
||||
"lastModified": 1678475794,
|
||||
"narHash": "sha256-wBS87BjBhQb7aw4+GbCl2+hKN1JCrNeXT4BISD99eeo=",
|
||||
"owner": "tweag",
|
||||
"repo": "nickel",
|
||||
"rev": "38ca87438918b84ebe7287a040729e4afd8c75b1",
|
||||
"rev": "085545cd673dfb6f87238f71be34f0d3d092469c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -307,11 +307,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1673752441,
|
||||
"narHash": "sha256-/g4ImZWV05CrXRWTSJsda6ztIp7LAPxs2L6RCrbQ66U=",
|
||||
"lastModified": 1678591454,
|
||||
"narHash": "sha256-uEjRsVJIkfyRjTIYHscit8CAUw4kygdzJGplNiV25l8=",
|
||||
"owner": "mic92",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "391180f77505c1c8cdd45fe1a59dc89d3e40300a",
|
||||
"rev": "caf85d1716e1ce6d7a0da2b7f1ab1c46d9497662",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -370,11 +370,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1674211260,
|
||||
"narHash": "sha256-xU6Rv9sgnwaWK7tgCPadV6HhI2Y/fl4lKxJoG2+m9qs=",
|
||||
"lastModified": 1677932085,
|
||||
"narHash": "sha256-+AB4dYllWig8iO6vAiGGYl0NEgmMgGHpy9gzWJ3322g=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5ed481943351e9fd354aeb557679624224de38d5",
|
||||
"rev": "3c5319ad3aa51551182ac82ea17ab1c6b0f0df89",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -400,11 +400,11 @@
|
|||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1673796341,
|
||||
"narHash": "sha256-1kZi9OkukpNmOaPY7S5/+SlCDOuYnP3HkXHvNDyLQcc=",
|
||||
"lastModified": 1678470307,
|
||||
"narHash": "sha256-OEeMUr3ueLIXyW/OaFUX5jUdimyQwMg/7e+/Q0gC/QE=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "6dccdc458512abce8d19f74195bb20fdb067df50",
|
||||
"rev": "0c4800d579af4ed98ecc47d464a5e7b0870c4b1f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -445,11 +445,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1674122161,
|
||||
"narHash": "sha256-9QM4rvgUSEwO8DWtJN9sR/afEqrH1s3b6ACsZT5wiAM=",
|
||||
"lastModified": 1677832802,
|
||||
"narHash": "sha256-XQf+k6mBYTiQUjWRf/0fozy5InAs03O1b30adCpWeXs=",
|
||||
"owner": "cachix",
|
||||
"repo": "pre-commit-hooks.nix",
|
||||
"rev": "53e766957b73298fa68b47478c48cbcc005cc18a",
|
||||
"rev": "382bee738397ca005206eefa36922cc10df8a21c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -486,11 +486,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1672712534,
|
||||
"narHash": "sha256-8S0DdMPcbITnlOu0uA81mTo3hgX84wK8S9wS34HEFY4=",
|
||||
"lastModified": 1677812689,
|
||||
"narHash": "sha256-EakqhgRnjVeYJv5+BJx/NZ7/eFTMBxc4AhICUNquhUg=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "69fb7bf0a8c40e6c4c197fa1816773774c8ac59f",
|
||||
"rev": "e53e8853aa7b0688bc270e9e6a681d22e01cf299",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -511,11 +511,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1674267882,
|
||||
"narHash": "sha256-53sIczqxA5BbrhgO6l54DSisDqHvQ3UUwbSqBryA/k0=",
|
||||
"lastModified": 1677896940,
|
||||
"narHash": "sha256-F4YW6/+35dwctY4Ogb/vvMfvA6O0UwhDbXE7urDhk4A=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "1fd6d280c132f4facad8cd023543fb10121e6487",
|
||||
"rev": "c25d3e1951863ac0061d47a3fabf9aa7c91db5e5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -530,11 +530,11 @@
|
|||
"nixpkgs": "nixpkgs_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1673922364,
|
||||
"narHash": "sha256-U0XIY/Y/x4fFtlCZKMtWlqOYUnLiXj4F42GQHxWuPow=",
|
||||
"lastModified": 1678588194,
|
||||
"narHash": "sha256-IYEfP8On6ZFV69mXg2LOYFp8xleyZVJHolunVq+HEbI=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "4e0f9b8a5102387f8d19901bced16a256a6ccdc7",
|
||||
"rev": "2ffce3e9c3da6c756a7862c7de2f6f9813c02aba",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -545,11 +545,11 @@
|
|||
},
|
||||
"utils": {
|
||||
"locked": {
|
||||
"lastModified": 1667395993,
|
||||
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
|
||||
"lastModified": 1676283394,
|
||||
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
|
||||
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@
|
|||
in
|
||||
cross_platform (system:
|
||||
let
|
||||
overlays = import ./../../overlays.nix (flake_inputs // {inherit system;});
|
||||
overlays = import ./../../overlays.nix (flake_inputs // { inherit system; });
|
||||
# pkgs = nixpkgs.legacyPackages.${system}.appendOverlays overlays;
|
||||
pkgs = import nixpkgs {
|
||||
inherit system overlays;
|
||||
|
|
@ -159,6 +159,11 @@
|
|||
{
|
||||
base.private_chromium.enable = false;
|
||||
}
|
||||
{
|
||||
home.packages = [
|
||||
pkgs.postman
|
||||
];
|
||||
}
|
||||
];
|
||||
extraSpecialArgs = mkModuleArgs {
|
||||
inherit pkgs;
|
||||
|
|
@ -181,7 +186,7 @@
|
|||
base.graphics.enable = false;
|
||||
# don't want to deal with GL stuffs on mac yet :/
|
||||
base.graphics.useNixGL.defaultPackage = null;
|
||||
# NOTE: this actually does not exist
|
||||
# FIXME: this actually does not exist
|
||||
base.keepass.path = "/Users/htran/keepass.kdbx";
|
||||
base.alacritty.font.size = 11.0;
|
||||
base.git.name = "Hung";
|
||||
|
|
|
|||
|
|
@ -31,3 +31,6 @@ else
|
|||
fi
|
||||
|
||||
|
||||
# Attempt to reload running instances
|
||||
tmux source-file ~/.config/tmux/tmux.conf
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue