Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
9e7e81984a
|
|||
|
29352f19b3
|
|||
|
c84bc62917
|
|||
|
6fb7bf10f3
|
|||
|
07a47245ad
|
|||
|
1c999a538a
|
|||
|
21c07defb7
|
|||
|
f854ddf67d
|
|||
|
baf44e0e00
|
|||
|
b1c22ae65e
|
|||
|
9daf46b125
|
|||
|
3768b8211a
|
Generated
+805
-150
File diff suppressed because it is too large
Load Diff
@@ -81,8 +81,9 @@
|
||||
};
|
||||
niri.url = "github:sodiboo/niri-flake";
|
||||
noctalia = {
|
||||
url = "github:noctalia-dev/noctalia-shell/v4.5.0";
|
||||
url = "github:noctalia-dev/noctalia-shell/v4.7.0";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.noctalia-qs.inputs.treefmt-nix.follows = "";
|
||||
};
|
||||
zen.inputs.nixpkgs.follows = "nixpkgs";
|
||||
zen.url = "github:0xc000022070/zen-browser-flake";
|
||||
|
||||
@@ -73,7 +73,6 @@ in
|
||||
jq
|
||||
keep-sorted
|
||||
lsd
|
||||
neofetch
|
||||
ripgrep
|
||||
socat
|
||||
typos
|
||||
|
||||
@@ -31,6 +31,8 @@ in
|
||||
vscode-langservers-extracted
|
||||
taplo
|
||||
typos-lsp
|
||||
# render-markdown.nvim
|
||||
python3Packages.pylatexenc
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,44 +1,44 @@
|
||||
{
|
||||
"Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
|
||||
"LuaSnip": { "branch": "master", "commit": "de10d8414235b0a8cabfeba60d07c24304e71f5c" },
|
||||
"blink.cmp": { "branch": "main", "commit": "f9e855c4d96e1264f7c818844f5a0166ad48c212" },
|
||||
"LuaSnip": { "branch": "master", "commit": "dae4f5aaa3574bd0c2b9dd20fb9542a02c10471c" },
|
||||
"blink.cmp": { "branch": "main", "commit": "b4d379393882561f9055abe780342ee00f02c573" },
|
||||
"bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
|
||||
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "c7d37ca22b461f64e26f8f6701b2586128ed0bef" },
|
||||
"friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "9f3c6dd7868bcc116e9c1c1929ce063b978fa519" },
|
||||
"glance.nvim": { "branch": "master", "commit": "bf86d8b79dce808e65fdb6e9269d0b4ed6d2eefc" },
|
||||
"guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" },
|
||||
"indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
|
||||
"inlay-hints.nvim": { "branch": "master", "commit": "990e1f96699b8293b6665b9e73b16128c66684e6" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
|
||||
"indent-blankline.nvim": { "branch": "master", "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03" },
|
||||
"inlay-hints.nvim": { "branch": "master", "commit": "11be32be3761c6263df2311afb6baa0de0863967" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
|
||||
"lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" },
|
||||
"leap.nvim": { "branch": "main", "commit": "02bf52e49c72cc5dabb53ec9494d10d304f0b2c9" },
|
||||
"lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" },
|
||||
"lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" },
|
||||
"mini.nvim": { "branch": "main", "commit": "8c40d95931cbe6138391af9180e59439ed2e69df" },
|
||||
"leap.nvim": { "branch": "main", "commit": "eda0138a408a5600c45e324c69fe73c9df30939c" },
|
||||
"lspkind.nvim": { "branch": "master", "commit": "c7274c48137396526b59d86232eabcdc7fed8a32" },
|
||||
"lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
|
||||
"mini.nvim": { "branch": "main", "commit": "0a6fe4ec57377526e9056fffb4204dbdfe860ebc" },
|
||||
"neo-tree.nvim": { "branch": "main", "commit": "f3df514fff2bdd4318127c40470984137f87b62e" },
|
||||
"noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" },
|
||||
"noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" },
|
||||
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
|
||||
"nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" },
|
||||
"nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" },
|
||||
"nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "276ce3bc878243dc63c32b75790c4296d11848f6" },
|
||||
"nvim-notify": { "branch": "master", "commit": "397c7c1184745fca649e5104de659e6392ef5a4d" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "5a855bcfec7973767a1a472335684bbd71d2fa2b" },
|
||||
"nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" },
|
||||
"nvim-osc52": { "branch": "main", "commit": "04cfaba1865ae5c53b6f887c3ca7304973824fb2" },
|
||||
"nvim-tmux-navigation": { "branch": "main", "commit": "4898c98702954439233fdaf764c39636681e2861" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
|
||||
"nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "3362099de3368aa620a8105b19ed04c2053e38c0" },
|
||||
"outline.nvim": { "branch": "main", "commit": "0eb9289ab39c91caf8b3ed0e3a17764809d69558" },
|
||||
"nvim-treesitter-textobjects": { "branch": "master", "commit": "5ca4aaa6efdcc59be46b95a3e876300cfead05ef" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "746ffbb17975ebd6c40142362eee1b0249969c5c" },
|
||||
"outline.nvim": { "branch": "main", "commit": "ead1820d49c8e79ce89cab1c2c318981b695c9d2" },
|
||||
"pest.vim": { "branch": "master", "commit": "7cfcb43f824e74d13dfe631359fff2ec23836a77" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
|
||||
"rainbow-delimiters.nvim": { "branch": "master", "commit": "97bf4b8ef9298644a29fcd9dd41a0210cf08cac7" },
|
||||
"render-markdown.nvim": { "branch": "main", "commit": "3da7bb459f6cff03980dd1e106c46f3e62ff4d9f" },
|
||||
"ripgrep": { "branch": "master", "commit": "119a58a400ea948c2d2b0cd4ec58361e74478641" },
|
||||
"telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
|
||||
"todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
|
||||
"tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" },
|
||||
"tree-sitter-nu": { "branch": "main", "commit": "6544c4383643cf8608d50def2247a7af8314e148" },
|
||||
"trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
|
||||
"vim-floaterm": { "branch": "master", "commit": "fd4bdd66eca56c6cc59f2119e4447496d8cde2ea" },
|
||||
"vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" },
|
||||
"workspace-diagnostics.nvim": { "branch": "main", "commit": "60f9175b2501ae3f8b1aba9719c0df8827610c8e" }
|
||||
"rainbow-delimiters.nvim": { "branch": "master", "commit": "e2858c43caafec291f915ef25fbed27bbe78abbd" },
|
||||
"registers": { "branch": "main", "commit": "c217f8f369e0886776cda6c94eab839b30a8940d" },
|
||||
"render-markdown.nvim": { "branch": "main", "commit": "48b4175dbca8439d30c1f52231cbe5a712c8f9d9" },
|
||||
"ripgrep": { "branch": "master", "commit": "cb66736f146f093497f4dc537b33d0826f9af33c" },
|
||||
"telescope.nvim": { "branch": "master", "commit": "5255aa27c422de944791318024167ad5d40aad20" },
|
||||
"todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
|
||||
"tokyonight.nvim": { "branch": "main", "commit": "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd" },
|
||||
"tree-sitter-nu": { "branch": "main", "commit": "bb3f533e5792260291945e1f329e1f0a779def6e" },
|
||||
"trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
|
||||
"vim-floaterm": { "branch": "master", "commit": "0ab5eb8135dc884bc543a819ac7033c15e72a76b" },
|
||||
"vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" }
|
||||
}
|
||||
|
||||
@@ -24,7 +24,6 @@ keymap.set("i", "<pageup>", string.rep("<up>", 9), opt)
|
||||
keymap.set("i", "<pagedown>", string.rep("<down>", 9), opt)
|
||||
|
||||
keymap.set("n", "<leader>ww", ":w<CR>", opt)
|
||||
keymap.set("n", "<leader>so", ":so<CR>", opt)
|
||||
keymap.set("n", "<leader>qq", ":q<CR>", opt)
|
||||
keymap.set("n", "<leader>qa", ":qa<CR>", opt)
|
||||
keymap.set("n", "<leader>c", function()
|
||||
|
||||
@@ -22,6 +22,7 @@ opt.smartcase = true
|
||||
opt.termguicolors = true
|
||||
opt.signcolumn = "yes"
|
||||
opt.colorcolumn = "110"
|
||||
opt.textwidth = 110
|
||||
opt.scrolloff = 8
|
||||
opt.sidescrolloff = 8
|
||||
|
||||
|
||||
@@ -257,6 +257,7 @@ local plugins = {
|
||||
dependencies = { "tpope/vim-repeat" },
|
||||
config = function()
|
||||
vim.keymap.set({ "n", "x", "o" }, "s", "<Plug>(leap)")
|
||||
vim.keymap.set({ "n", "x", "o" }, "<leader>s", "<Plug>(leap)")
|
||||
vim.keymap.set("n", "S", "<Plug>(leap-from-window)")
|
||||
-- Exclude whitespace and the middle of alphabetic words from preview:
|
||||
-- foobar[baaz] = quux
|
||||
@@ -278,7 +279,17 @@ local plugins = {
|
||||
"MeanderingProgrammer/render-markdown.nvim",
|
||||
dependencies = { "nvim-treesitter/nvim-treesitter", "nvim-tree/nvim-web-devicons" },
|
||||
event = "BufEnter *.md",
|
||||
opts = {},
|
||||
--- @type render.md.UserConfig
|
||||
opts = {
|
||||
completions = {
|
||||
blink = {
|
||||
enabled = true,
|
||||
},
|
||||
lsp = {
|
||||
enabled = true,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
"folke/noice.nvim",
|
||||
@@ -333,6 +344,17 @@ local plugins = {
|
||||
event = "VeryLazy",
|
||||
opts = {},
|
||||
},
|
||||
|
||||
{
|
||||
"tversteeg/registers.nvim",
|
||||
cmd = "Registers",
|
||||
config = true,
|
||||
keys = {
|
||||
{ '"', mode = { "n", "v" } },
|
||||
{ "<C-R>", mode = "i" },
|
||||
},
|
||||
name = "registers",
|
||||
},
|
||||
}
|
||||
|
||||
require("lazy").setup(plugins, {})
|
||||
|
||||
@@ -40,8 +40,8 @@ in
|
||||
nix.settings = {
|
||||
experimental-features = "nix-command flakes pipe-operators";
|
||||
substituters = [
|
||||
"https://mirrors.sjtug.sjtu.edu.cn/nix-channels/store"
|
||||
"https://mirror.sjtu.edu.cn/nix-channels/store"
|
||||
"https://mirrors.sjtug.sjtu.edu.cn/nix-channels/store"
|
||||
"https://mirrors.ustc.edu.cn/nix-channels/store"
|
||||
"https://nix-community.cachix.org"
|
||||
"https://cache.garnix.io"
|
||||
|
||||
@@ -14,10 +14,18 @@ in
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
assertions = [
|
||||
{
|
||||
assertion = hostname == "imxyy-nix";
|
||||
message = "XDG migration not done! Check
|
||||
https://github.com/0xc000022070/zen-browser-flake?tab=readme-ov-file#missing-configuration-after-update
|
||||
for details";
|
||||
}
|
||||
];
|
||||
|
||||
my.hm.programs.zen-browser = {
|
||||
enable = true;
|
||||
nativeMessagingHosts = [ pkgs.firefoxpwa ];
|
||||
suppressXdgMigrationWarning = hostname == "imxyy-nix";
|
||||
policies = {
|
||||
# find more options here: https://mozilla.github.io/policy-templates/
|
||||
DisableAppUpdate = true;
|
||||
|
||||
@@ -9,6 +9,7 @@ in
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
my.desktop.media = {
|
||||
cine.enable = true;
|
||||
mpv.enable = true;
|
||||
loupe.enable = true;
|
||||
thunderbird.enable = true;
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.my.desktop.media.cine;
|
||||
in
|
||||
{
|
||||
options.my.desktop.media.cine = {
|
||||
enable = lib.mkEnableOption "cine";
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
my.hm.home.packages = [ pkgs.cine ];
|
||||
};
|
||||
}
|
||||
@@ -95,7 +95,7 @@ in
|
||||
draw-border-with-background = false;
|
||||
}
|
||||
{
|
||||
matches = [ { app-id = "kitty|foot|Alacritty|ghostty|chromium-browser|zen-beta|wofi"; } ];
|
||||
matches = [ { app-id = "kitty|foot|Alacritty|ghostty|wofi"; } ];
|
||||
opacity = 0.8;
|
||||
}
|
||||
{
|
||||
@@ -171,6 +171,7 @@ in
|
||||
"Mod+R".action.spawn = noctalia "launcher toggle";
|
||||
"Mod+V".action.spawn = noctalia "launcher clipboard";
|
||||
"Mod+W".action.spawn = noctalia "launcher windows";
|
||||
"Ctrl+Alt+Escape".action.spawn = [ "missioncenter" ];
|
||||
|
||||
"XF86AudioRaiseVolume" = {
|
||||
allow-when-locked = true;
|
||||
@@ -284,9 +285,13 @@ in
|
||||
"Mod+Shift+Minus".action.set-window-height = "-10%";
|
||||
"Mod+Shift+Equal".action.set-window-height = "+10%";
|
||||
|
||||
"Ctrl+Alt+A".action.screenshot = [ ];
|
||||
"Ctrl+Alt+A".action.screenshot = {
|
||||
show-pointer = false;
|
||||
};
|
||||
# "Ctrl+Alt+A".action = screenshot;
|
||||
"Print".action.screenshot-screen = [ ];
|
||||
"Print".action.screenshot-screen = {
|
||||
show-pointer = false;
|
||||
};
|
||||
"Alt+Print".action.screenshot-window = [ ];
|
||||
# "Alt+Print".action = screenshot-window;
|
||||
|
||||
|
||||
@@ -67,6 +67,7 @@ in
|
||||
brightnessctl
|
||||
|
||||
nautilus
|
||||
mission-center
|
||||
|
||||
noctalia-shell
|
||||
xdg-terminal-exec
|
||||
@@ -80,21 +81,21 @@ in
|
||||
# modified from official Tokyo-Night theme
|
||||
colors = {
|
||||
mError = "#f7768e";
|
||||
mHover = "#bb9af7";
|
||||
mOnError = "#16161e";
|
||||
mOnHover = "#16161e";
|
||||
mOnPrimary = "#16161e";
|
||||
mOnSecondary = "#16161e";
|
||||
mOnSurface = "#c0caf5";
|
||||
mOnSurfaceVariant = "#9aa5ce";
|
||||
mOnTertiary = "#16161e";
|
||||
mOutline = "#565f89";
|
||||
mOutline = "#353D57";
|
||||
mPrimary = "#7aa2f7";
|
||||
mSecondary = "#9a9ef7";
|
||||
mTertiary = "#bb9af7";
|
||||
# mSecondary = "#bb9af7";
|
||||
# mTertiary = "#9ece6a";
|
||||
mShadow = "#15161e";
|
||||
mSurface = "#1a1b26";
|
||||
mSurfaceVariant = "#24283b";
|
||||
mTertiary = "#bb9af7";
|
||||
};
|
||||
settings = {
|
||||
appLauncher = {
|
||||
|
||||
Reference in New Issue
Block a user