feat: nb update to 25.11
This commit is contained in:
@@ -1 +1 @@
|
|||||||
https://channels.nixos.org/nixos-25.05
|
https://channels.nixos.org/nixos-25.11
|
||||||
|
|||||||
@@ -307,7 +307,7 @@ in {
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
services.xserver.desktopManager.gnome.extraGSettingsOverrides = ''
|
services.desktopManager.gnome.extraGSettingsOverrides = ''
|
||||||
[org.gnome.desktop.interface]
|
[org.gnome.desktop.interface]
|
||||||
cursor-size=24
|
cursor-size=24
|
||||||
'';
|
'';
|
||||||
|
|||||||
@@ -115,7 +115,7 @@
|
|||||||
hardware.graphics = {
|
hardware.graphics = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraPackages = with pkgs; [
|
extraPackages = with pkgs; [
|
||||||
vaapiVdpau
|
libva-vdpau-driver
|
||||||
libvdpau-va-gl
|
libvdpau-va-gl
|
||||||
libva
|
libva
|
||||||
libva-utils
|
libva-utils
|
||||||
|
|||||||
@@ -26,14 +26,13 @@ in
|
|||||||
description = "Bitwarden Desktop";
|
description = "Bitwarden Desktop";
|
||||||
after = [ "graphical-session.target" "network-online.target" ];
|
after = [ "graphical-session.target" "network-online.target" ];
|
||||||
wantedBy = [ "graphical-session.target" ];
|
wantedBy = [ "graphical-session.target" ];
|
||||||
serviceConfig.ExecStart = "${pkgs.bitwarden}/bin/bitwarden";
|
serviceConfig.ExecStart = "${pkgs.bitwarden-desktop}/bin/bitwarden-desktop";
|
||||||
serviceConfig.Restart = "on-abort";
|
serviceConfig.Restart = "on-abort";
|
||||||
};
|
};
|
||||||
|
|
||||||
#### Handy tools #############################################################
|
#### Handy tools #############################################################
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
goldwarden
|
bitwarden-desktop
|
||||||
bitwarden
|
|
||||||
bitwarden-cli
|
bitwarden-cli
|
||||||
fprintd
|
fprintd
|
||||||
lxqt.lxqt-policykit
|
lxqt.lxqt-policykit
|
||||||
|
|||||||
@@ -57,10 +57,10 @@ in {
|
|||||||
netflix
|
netflix
|
||||||
networkmanagerapplet
|
networkmanagerapplet
|
||||||
nextcloud-client
|
nextcloud-client
|
||||||
onlyoffice-bin
|
onlyoffice-desktopeditors
|
||||||
obs-studio
|
obs-studio
|
||||||
pavucontrol
|
pavucontrol
|
||||||
pinentry
|
pinentry-gnome3
|
||||||
rbw
|
rbw
|
||||||
rofi-rbw
|
rofi-rbw
|
||||||
swayimg
|
swayimg
|
||||||
@@ -103,7 +103,7 @@ in {
|
|||||||
fonts.packages = with pkgs; [
|
fonts.packages = with pkgs; [
|
||||||
noto-fonts
|
noto-fonts
|
||||||
noto-fonts-cjk-sans
|
noto-fonts-cjk-sans
|
||||||
noto-fonts-emoji
|
noto-fonts-color-emoji
|
||||||
nerd-fonts._0xproto
|
nerd-fonts._0xproto
|
||||||
nerd-fonts.droid-sans-mono
|
nerd-fonts.droid-sans-mono
|
||||||
open-sans
|
open-sans
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ in {
|
|||||||
nixpkgs.config.android_sdk.accept_license = true;
|
nixpkgs.config.android_sdk.accept_license = true;
|
||||||
|
|
||||||
programs.adb.enable = true; # sets up udev + adb group
|
programs.adb.enable = true; # sets up udev + adb group
|
||||||
services.udev.packages = [ pkgs.android-udev-rules ];
|
# android-udev-rules removed in 25.11 - superseded by built-in systemd uaccess rules
|
||||||
|
|
||||||
users.users.dominik.extraGroups = [ "adbusers" ];
|
users.users.dominik.extraGroups = [ "adbusers" ];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -52,11 +52,6 @@ in {
|
|||||||
# Socket activation - only start when needed to save battery
|
# Socket activation - only start when needed to save battery
|
||||||
onBoot = "ignore";
|
onBoot = "ignore";
|
||||||
onShutdown = "shutdown";
|
onShutdown = "shutdown";
|
||||||
qemu = {
|
# qemu.swtpm.enable = true; # enable if you need TPM emulation, etc.
|
||||||
ovmf = {
|
|
||||||
enable = true; # Enable OVMF firmware support
|
|
||||||
};
|
|
||||||
# swtpm.enable = true; # enable if you need TPM emulation, etc.
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,6 @@
|
|||||||
|
-- Set leader key before any other mappings
|
||||||
|
vim.g.mapleader = " "
|
||||||
|
|
||||||
-- vim.opt.expandtab = true
|
-- vim.opt.expandtab = true
|
||||||
-- vim.opt.hidden = true
|
-- vim.opt.hidden = true
|
||||||
-- vim.opt.incsearch = true
|
-- vim.opt.incsearch = true
|
||||||
|
|||||||
@@ -1,54 +1,31 @@
|
|||||||
local status, lspc = pcall(require, 'lspconfig')
|
-- LSP Capabilities (for nvim-cmp integration)
|
||||||
if (not status) then return end
|
|
||||||
|
|
||||||
lspc.clangd.setup{}
|
|
||||||
|
|
||||||
local buf_map = function(bufnr, mode, lhs, rhs, opts)
|
|
||||||
vim.api.nvim_buf_set_keymap(bufnr, mode, lhs, rhs, opts or {
|
|
||||||
silent = true,
|
|
||||||
})
|
|
||||||
end
|
|
||||||
|
|
||||||
local protocol = require('vim.lsp.protocol')
|
|
||||||
|
|
||||||
local on_attach = function(client, buffnr)
|
|
||||||
if client.server.capabilities.documentFormattingProvider then
|
|
||||||
vim.api.nvim_create_autocmd("BufWritePre", {
|
|
||||||
group = vim.api.nvim_create_augroup("format", { clear = true }),
|
|
||||||
buffer = buffnr,
|
|
||||||
callback = function() vim.lsp.buf.formatting_seq_sync() end
|
|
||||||
})
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
local capabilities = vim.lsp.protocol.make_client_capabilities()
|
local capabilities = vim.lsp.protocol.make_client_capabilities()
|
||||||
capabilities.textDocument.completion.completionItem.snippetSupport = true
|
capabilities.textDocument.completion.completionItem.snippetSupport = true
|
||||||
capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
|
capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
|
||||||
|
|
||||||
local servers = { 'ts_ls', 'lua_ls', 'cssls', 'yamlls', 'intelephense', 'gopls' }
|
-- Global LSP configuration
|
||||||
for _, lsp in pairs(servers) do
|
vim.lsp.config('*', {
|
||||||
require('lspconfig')[lsp].setup {
|
|
||||||
-- on_attach = on_attach,
|
|
||||||
capabilities = capabilities,
|
capabilities = capabilities,
|
||||||
}
|
})
|
||||||
end
|
|
||||||
|
|
||||||
lspc.yamlls.setup({
|
-- Server-specific configurations
|
||||||
|
vim.lsp.config('clangd', {})
|
||||||
|
|
||||||
|
vim.lsp.config('yamlls', {
|
||||||
settings = {
|
settings = {
|
||||||
yaml = {
|
yaml = {
|
||||||
keyOrdering = false,
|
keyOrdering = false,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
});
|
})
|
||||||
|
|
||||||
-- autoformat json files with jq
|
-- Enable all LSP servers
|
||||||
|
vim.lsp.enable({ 'clangd', 'ts_ls', 'lua_ls', 'cssls', 'yamlls', 'intelephense', 'gopls' })
|
||||||
|
|
||||||
|
-- JSON file formatting with jq
|
||||||
vim.api.nvim_create_autocmd("FileType", {
|
vim.api.nvim_create_autocmd("FileType", {
|
||||||
pattern = "json",
|
pattern = "json",
|
||||||
callback = function(ev)
|
callback = function(ev)
|
||||||
vim.bo[ev.buf].formatprg = "jq"
|
vim.bo[ev.buf].formatprg = "jq"
|
||||||
print("It's a json file")
|
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
-- lspc.intelephense.setup()
|
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ config = {
|
|||||||
ignore_lsp = {},
|
ignore_lsp = {},
|
||||||
}
|
}
|
||||||
|
|
||||||
local status_ok, project = pcall(require, "project_nvim")
|
local status_ok, project = pcall(require, "project")
|
||||||
if not status_ok then
|
if not status_ok then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
vim.g.mapleader = " "
|
|
||||||
|
|
||||||
local function smart_quit()
|
local function smart_quit()
|
||||||
local bufnr = vim.api.nvim_get_current_buf()
|
local bufnr = vim.api.nvim_get_current_buf()
|
||||||
local modified = vim.api.nvim_buf_get_option(bufnr, "modified")
|
local modified = vim.api.nvim_buf_get_option(bufnr, "modified")
|
||||||
@@ -27,122 +25,77 @@ end
|
|||||||
|
|
||||||
local wk = require("which-key")
|
local wk = require("which-key")
|
||||||
|
|
||||||
wk.setup({})
|
wk.setup({
|
||||||
|
preset = "classic",
|
||||||
wk.register({
|
delay = 0,
|
||||||
["<leader>"] = {
|
triggers = {
|
||||||
|
{ "<auto>", mode = "nxso" },
|
||||||
[";"] = { "<cmd>Alpha<CR>", "Dashboard" },
|
{ " ", mode = "n" }, -- literal space character
|
||||||
["w"] = { "<cmd>w!<CR>", "Save" },
|
|
||||||
["q"] = { "<cmd>smart_quit()<CR>", "Quit" },
|
|
||||||
["/"] = { "<Plug>(comment_toggle_linewise_current)", "Comment toggle current line" },
|
|
||||||
["c"] = { "<cmd>BufferKill<CR>", "Close Buffer" },
|
|
||||||
["f"] = { find_project_files, "Find File" },
|
|
||||||
["h"] = { "<cmd>nohlsearch<CR>", "No Highlight" },
|
|
||||||
["t"] = { "<cmd>TodoTelescope keywords=TODO,FIX<CR>", "Find TODO,FIX" },
|
|
||||||
b = {
|
|
||||||
name = "Buffers",
|
|
||||||
j = { "<cmd>BufferLinePick<cr>", "Jump" },
|
|
||||||
f = { "<cmd>Telescope buffers<cr>", "Find" },
|
|
||||||
b = { "<cmd>BufferLineCyclePrev<cr>", "Previous" },
|
|
||||||
n = { "<cmd>BufferLineCycleNext<cr>", "Next" },
|
|
||||||
-- w = { "<cmd>BufferWipeout<cr>", "Wipeout" }, -- TODO: implement this for bufferline
|
|
||||||
e = {
|
|
||||||
"<cmd>BufferLinePickClose<cr>",
|
|
||||||
"Pick which buffer to close",
|
|
||||||
},
|
},
|
||||||
h = { "<cmd>BufferLineCloseLeft<cr>", "Close all to the left" },
|
|
||||||
l = {
|
|
||||||
"<cmd>BufferLineCloseRight<cr>",
|
|
||||||
"Close all to the right",
|
|
||||||
},
|
|
||||||
D = {
|
|
||||||
"<cmd>BufferLineSortByDirectory<cr>",
|
|
||||||
"Sort by directory",
|
|
||||||
},
|
|
||||||
L = {
|
|
||||||
"<cmd>BufferLineSortByExtension<cr>",
|
|
||||||
"Sort by language",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
-- " Available Debug Adapters:
|
|
||||||
-- " https://microsoft.github.io/debug-adapter-protocol/implementors/adapters/
|
|
||||||
-- " Adapter configuration and installation instructions:
|
|
||||||
-- " https://github.com/mfussenegger/nvim-dap/wiki/Debug-Adapter-installation
|
|
||||||
-- " Debug Adapter protocol:
|
|
||||||
-- " https://microsoft.github.io/debug-adapter-protocol/
|
|
||||||
-- " Debugging
|
|
||||||
g = {
|
|
||||||
name = "Git",
|
|
||||||
g = { Lazygit_toggle, "Lazygit" },
|
|
||||||
j = { "<cmd>lua require 'gitsigns'.next_hunk({navigation_message = false})<cr>", "Next Hunk" },
|
|
||||||
k = { "<cmd>lua require 'gitsigns'.prev_hunk({navigation_message = false})<cr>", "Prev Hunk" },
|
|
||||||
l = { "<cmd>lua require 'gitsigns'.blame_line()<cr>", "Blame" },
|
|
||||||
p = { "<cmd>lua require 'gitsigns'.preview_hunk()<cr>", "Preview Hunk" },
|
|
||||||
r = { "<cmd>lua require 'gitsigns'.reset_hunk()<cr>", "Reset Hunk" },
|
|
||||||
R = { "<cmd>lua require 'gitsigns'.reset_buffer()<cr>", "Reset Buffer" },
|
|
||||||
s = { "<cmd>lua require 'gitsigns'.stage_hunk()<cr>", "Stage Hunk" },
|
|
||||||
u = {
|
|
||||||
"<cmd>lua require 'gitsigns'.undo_stage_hunk()<cr>",
|
|
||||||
"Undo Stage Hunk",
|
|
||||||
},
|
|
||||||
o = { "<cmd>Telescope git_status<cr>", "Open changed file" },
|
|
||||||
b = { "<cmd>Telescope git_branches<cr>", "Checkout branch" },
|
|
||||||
c = { "<cmd>Telescope git_commits<cr>", "Checkout commit" },
|
|
||||||
C = {
|
|
||||||
"<cmd>Telescope git_bcommits<cr>",
|
|
||||||
"Checkout commit(for current file)",
|
|
||||||
},
|
|
||||||
d = {
|
|
||||||
"<cmd>Gitsigns diffthis HEAD<cr>",
|
|
||||||
"Git Diff",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
l = {
|
|
||||||
name = "LSP",
|
|
||||||
a = { "<cmd>lua vim.lsp.buf.code_action()<cr>", "Code Action" },
|
|
||||||
d = { "<cmd>Telescope diagnostics bufnr=0 theme=get_ivy<cr>", "Buffer Diagnostics" },
|
|
||||||
w = { "<cmd>Telescope diagnostics<cr>", "Diagnostics" },
|
|
||||||
-- f = { require("lvim.lsp.utils").format, "Format" },
|
|
||||||
i = { "<cmd>LspInfo<cr>", "Info" },
|
|
||||||
I = { "<cmd>Mason<cr>", "Mason Info" },
|
|
||||||
j = {
|
|
||||||
vim.diagnostic.goto_next,
|
|
||||||
"Next Diagnostic",
|
|
||||||
},
|
|
||||||
k = {
|
|
||||||
vim.diagnostic.goto_prev,
|
|
||||||
"Prev Diagnostic",
|
|
||||||
},
|
|
||||||
l = { vim.lsp.codelens.run, "CodeLens Action" },
|
|
||||||
q = { vim.diagnostic.setloclist, "Quickfix" },
|
|
||||||
r = { vim.lsp.buf.rename, "Rename" },
|
|
||||||
s = { "<cmd>Telescope lsp_document_symbols<cr>", "Document Symbols" },
|
|
||||||
S = {
|
|
||||||
"<cmd>Telescope lsp_dynamic_workspace_symbols<cr>",
|
|
||||||
"Workspace Symbols",
|
|
||||||
},
|
|
||||||
e = { "<cmd>Telescope quickfix<cr>", "Telescope Quickfix" },
|
|
||||||
},
|
|
||||||
|
|
||||||
|
|
||||||
a = { "<cmd>lua require('telescope.builtin').lsp_code_actions()<cr>", "Code Actions" },
|
|
||||||
d = { "<cmd>lua require('telescope.builtin').lsp_document_diagnostics()<cr>", "LSP Diagnostics" },
|
|
||||||
k = { "<cmd>lua vim.lsp.buf.signature_help()<cr>", "Signature Help" },
|
|
||||||
P = { "<cmd>lua require'telescope'.extensions.projects.projects{}<cr>", "Signature Help" },
|
|
||||||
}
|
|
||||||
})
|
})
|
||||||
|
|
||||||
wk.register(
|
wk.add({
|
||||||
{
|
-- Single key mappings
|
||||||
["/"] = { "<Plug>(comment_toggle_linewise_visual)", "Comment toggle linewise (visual)" },
|
{ "<leader>;", "<cmd>Alpha<CR>", desc = "Dashboard" },
|
||||||
},
|
{ "<leader>w", "<cmd>w!<CR>", desc = "Save" },
|
||||||
{
|
{ "<leader>q", smart_quit, desc = "Quit" },
|
||||||
mode = "v", -- VISUAL mode
|
{ "<leader>/", "<Plug>(comment_toggle_linewise_current)", desc = "Comment toggle current line" },
|
||||||
prefix = "<leader>",
|
{ "<leader>c", "<cmd>BufferKill<CR>", desc = "Close Buffer" },
|
||||||
buffer = nil, -- Global mappings. Specify a buffer number for buffer local mappings
|
{ "<leader>f", find_project_files, desc = "Find File" },
|
||||||
silent = true, -- use `silent` when creating keymaps
|
{ "<leader>h", "<cmd>nohlsearch<CR>", desc = "No Highlight" },
|
||||||
noremap = true, -- use `noremap` when creating keymaps
|
{ "<leader>t", "<cmd>TodoTelescope keywords=TODO,FIX<CR>", desc = "Find TODO,FIX" },
|
||||||
nowait = true, -- use `nowait` when creating keymaps
|
|
||||||
}
|
-- Buffers group
|
||||||
)
|
{ "<leader>b", group = "Buffers" },
|
||||||
|
{ "<leader>bj", "<cmd>BufferLinePick<cr>", desc = "Jump" },
|
||||||
|
{ "<leader>bf", "<cmd>Telescope buffers<cr>", desc = "Find" },
|
||||||
|
{ "<leader>bb", "<cmd>BufferLineCyclePrev<cr>", desc = "Previous" },
|
||||||
|
{ "<leader>bn", "<cmd>BufferLineCycleNext<cr>", desc = "Next" },
|
||||||
|
{ "<leader>be", "<cmd>BufferLinePickClose<cr>", desc = "Pick which buffer to close" },
|
||||||
|
{ "<leader>bh", "<cmd>BufferLineCloseLeft<cr>", desc = "Close all to the left" },
|
||||||
|
{ "<leader>bl", "<cmd>BufferLineCloseRight<cr>", desc = "Close all to the right" },
|
||||||
|
{ "<leader>bD", "<cmd>BufferLineSortByDirectory<cr>", desc = "Sort by directory" },
|
||||||
|
{ "<leader>bL", "<cmd>BufferLineSortByExtension<cr>", desc = "Sort by language" },
|
||||||
|
|
||||||
|
-- Git group
|
||||||
|
{ "<leader>g", group = "Git" },
|
||||||
|
{ "<leader>gg", Lazygit_toggle, desc = "Lazygit" },
|
||||||
|
{ "<leader>gj", "<cmd>lua require 'gitsigns'.next_hunk({navigation_message = false})<cr>", desc = "Next Hunk" },
|
||||||
|
{ "<leader>gk", "<cmd>lua require 'gitsigns'.prev_hunk({navigation_message = false})<cr>", desc = "Prev Hunk" },
|
||||||
|
{ "<leader>gl", "<cmd>lua require 'gitsigns'.blame_line()<cr>", desc = "Blame" },
|
||||||
|
{ "<leader>gp", "<cmd>lua require 'gitsigns'.preview_hunk()<cr>", desc = "Preview Hunk" },
|
||||||
|
{ "<leader>gr", "<cmd>lua require 'gitsigns'.reset_hunk()<cr>", desc = "Reset Hunk" },
|
||||||
|
{ "<leader>gR", "<cmd>lua require 'gitsigns'.reset_buffer()<cr>", desc = "Reset Buffer" },
|
||||||
|
{ "<leader>gs", "<cmd>lua require 'gitsigns'.stage_hunk()<cr>", desc = "Stage Hunk" },
|
||||||
|
{ "<leader>gu", "<cmd>lua require 'gitsigns'.undo_stage_hunk()<cr>", desc = "Undo Stage Hunk" },
|
||||||
|
{ "<leader>go", "<cmd>Telescope git_status<cr>", desc = "Open changed file" },
|
||||||
|
{ "<leader>gb", "<cmd>Telescope git_branches<cr>", desc = "Checkout branch" },
|
||||||
|
{ "<leader>gc", "<cmd>Telescope git_commits<cr>", desc = "Checkout commit" },
|
||||||
|
{ "<leader>gC", "<cmd>Telescope git_bcommits<cr>", desc = "Checkout commit(for current file)" },
|
||||||
|
{ "<leader>gd", "<cmd>Gitsigns diffthis HEAD<cr>", desc = "Git Diff" },
|
||||||
|
|
||||||
|
-- LSP group
|
||||||
|
{ "<leader>l", group = "LSP" },
|
||||||
|
{ "<leader>la", "<cmd>lua vim.lsp.buf.code_action()<cr>", desc = "Code Action" },
|
||||||
|
{ "<leader>ld", "<cmd>Telescope diagnostics bufnr=0 theme=get_ivy<cr>", desc = "Buffer Diagnostics" },
|
||||||
|
{ "<leader>lw", "<cmd>Telescope diagnostics<cr>", desc = "Diagnostics" },
|
||||||
|
{ "<leader>li", "<cmd>LspInfo<cr>", desc = "Info" },
|
||||||
|
{ "<leader>lI", "<cmd>Mason<cr>", desc = "Mason Info" },
|
||||||
|
{ "<leader>lj", vim.diagnostic.goto_next, desc = "Next Diagnostic" },
|
||||||
|
{ "<leader>lk", vim.diagnostic.goto_prev, desc = "Prev Diagnostic" },
|
||||||
|
{ "<leader>ll", vim.lsp.codelens.run, desc = "CodeLens Action" },
|
||||||
|
{ "<leader>lq", vim.diagnostic.setloclist, desc = "Quickfix" },
|
||||||
|
{ "<leader>lr", vim.lsp.buf.rename, desc = "Rename" },
|
||||||
|
{ "<leader>ls", "<cmd>Telescope lsp_document_symbols<cr>", desc = "Document Symbols" },
|
||||||
|
{ "<leader>lS", "<cmd>Telescope lsp_dynamic_workspace_symbols<cr>", desc = "Workspace Symbols" },
|
||||||
|
{ "<leader>le", "<cmd>Telescope quickfix<cr>", desc = "Telescope Quickfix" },
|
||||||
|
|
||||||
|
-- Direct LSP shortcuts
|
||||||
|
{ "<leader>a", "<cmd>lua require('telescope.builtin').lsp_code_actions()<cr>", desc = "Code Actions" },
|
||||||
|
{ "<leader>d", "<cmd>lua require('telescope.builtin').lsp_document_diagnostics()<cr>", desc = "LSP Diagnostics" },
|
||||||
|
{ "<leader>k", "<cmd>lua vim.lsp.buf.signature_help()<cr>", desc = "Signature Help" },
|
||||||
|
{ "<leader>P", "<cmd>lua require'telescope'.extensions.projects.projects{}<cr>", desc = "Projects" },
|
||||||
|
|
||||||
|
-- Visual mode mappings
|
||||||
|
{ "<leader>/", "<Plug>(comment_toggle_linewise_visual)", desc = "Comment toggle linewise (visual)", mode = "v" },
|
||||||
|
})
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ in
|
|||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
nodePackages.typescript-language-server
|
nodePackages.typescript-language-server
|
||||||
sumneko-lua-language-server
|
lua-language-server
|
||||||
nest
|
nest
|
||||||
nodePackages.intelephense
|
nodePackages.intelephense
|
||||||
nodePackages.vscode-langservers-extracted
|
nodePackages.vscode-langservers-extracted
|
||||||
@@ -105,9 +105,9 @@ in
|
|||||||
"sops"
|
"sops"
|
||||||
]);
|
]);
|
||||||
in ''
|
in ''
|
||||||
lua << EOF
|
lua << EOF
|
||||||
${luaConfig}
|
${luaConfig}
|
||||||
EOF
|
EOF
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
extraLuaPackages = luaPackages: [ luaPackages.lyaml ];
|
extraLuaPackages = luaPackages: [ luaPackages.lyaml ];
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
let
|
let
|
||||||
home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-24.11.tar.gz";
|
home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-25.11.tar.gz";
|
||||||
|
|
||||||
|
|
||||||
in
|
in
|
||||||
|
|||||||
@@ -135,11 +135,11 @@ let
|
|||||||
{ name = "q"; value = "{searchTerms}"; }
|
{ name = "q"; value = "{searchTerms}"; }
|
||||||
];
|
];
|
||||||
}];
|
}];
|
||||||
iconUpdateURL = "https://perplexity.ai/favicon.ico";
|
icon = "https://perplexity.ai/favicon.ico";
|
||||||
definedAliases = [ "@perplexity" ];
|
definedAliases = [ "@perplexity" ];
|
||||||
};
|
};
|
||||||
"Google".metaData.hidden = true;
|
"google".metaData.hidden = true;
|
||||||
"Bing".metaData.hidden = true;
|
"bing".metaData.hidden = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -301,26 +301,23 @@ in
|
|||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
lfs.enable = true;
|
lfs.enable = true;
|
||||||
package = pkgs.gitAndTools.gitFull;
|
package = pkgs.gitFull;
|
||||||
userName = "Dominik Polakovics";
|
|
||||||
userEmail = "dominik.polakovics@cloonar.com";
|
|
||||||
# signing = {
|
# signing = {
|
||||||
# key = "dominik.polakovics@cloonar.com";
|
# key = "dominik.polakovics@cloonar.com";
|
||||||
# signByDefault = false;
|
# signByDefault = false;
|
||||||
# };
|
# };
|
||||||
iniContent = {
|
settings = {
|
||||||
|
user.name = "Dominik Polakovics";
|
||||||
|
user.email = "dominik.polakovics@cloonar.com";
|
||||||
# Branch with most recent change comes first
|
# Branch with most recent change comes first
|
||||||
branch.sort = "-committerdate";
|
branch.sort = "-committerdate";
|
||||||
# Remember and auto-resolve merge conflicts
|
# Remember and auto-resolve merge conflicts
|
||||||
# https://git-scm.com/book/en/v2/Git-Tools-Rerere
|
# https://git-scm.com/book/en/v2/Git-Tools-Rerere
|
||||||
rerere.enabled = true;
|
rerere.enabled = true;
|
||||||
};
|
"url \"gitea@git.cloonar.com:\"" = {
|
||||||
extraConfig = {
|
|
||||||
"url.gitea@git.cloonar.com:" = {
|
|
||||||
insteadOf = "https://git.cloonar.com/";
|
insteadOf = "https://git.cloonar.com/";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.thunderbird = {
|
programs.thunderbird = {
|
||||||
@@ -525,7 +522,7 @@ in
|
|||||||
settings = firefoxSettings;
|
settings = firefoxSettings;
|
||||||
# userChrome = firefoxUserChrome;
|
# userChrome = firefoxUserChrome;
|
||||||
search = firefoxSearchSettings;
|
search = firefoxSearchSettings;
|
||||||
extensions = firefoxExtensions;
|
extensions.packages = firefoxExtensions;
|
||||||
};
|
};
|
||||||
social = {
|
social = {
|
||||||
id = 1;
|
id = 1;
|
||||||
@@ -560,7 +557,7 @@ in
|
|||||||
id = 3;
|
id = 3;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
extensions = firefoxExtensions;
|
extensions.packages = firefoxExtensions;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user