Compare commits

..

No commits in common. "126a2076cc9fb1466d9ed57538a54ffc06ff0623" and "29eacd05bbce414747948f0349b0d00d92c8aa44" have entirely different histories.

10 changed files with 17 additions and 69 deletions

View file

@ -45,10 +45,7 @@
(editor == "nano")) then
"exec " + term + " -e " + editor
else
(if (editor == "neovide") then
"neovide -- --listen /tmp/nvimsocket"
else
editor));
editor);
};
# create patched nixpkgs

View file

@ -115,7 +115,6 @@ if (os.path.isfile(secretFile)):
import qutesecrets
secretsExists = True
config.set('scrolling.smooth',True)
config.set('qt.args',['ignore-gpu-blacklist','enable-gpu-rasterization','enable-native-gpu-memory-buffers','num-raster-threads=4'])
config.load_autoconfig(True)

View file

@ -48,6 +48,9 @@ in
home.packages = (with pkgs-emacs; [
emacs-lsp-booster
nil
nixfmt
kotlin-language-server
file
wmctrl
jshon

View file

@ -11,8 +11,6 @@ if vim.g.neovide then
vim.g.neovide_transparency = 0.8
vim.g.neovide_floating_blur_amount_x = 8.0
vim.g.neovide_floating_blur_amount_y = 8.0
vim.g.neovide_refresh_rate = 120
vim.g.neovide_cursor_vfx_mode = "pixiedust"
end
vim.g.neovide_scale_factor = 1.0

View file

@ -14,19 +14,4 @@ M.base46 = {
-- },
}
M.ui = {
theme = "stylix",
nvdash = {
load_on_startup = true,
buttons = {
{ " Find File", "Spc .", "Telescope find_files" },
{ "󰙅 Nvimtree", "SPC e", "NvimTreeToggle" },
{ " Projects ", "Spc p p", "Telescope workspaces" },
{ "󰯌 Vsplit ", "Spc w v", "vsplit" },
{ "󰯋 Split ", "Spc w s", "split" },
{ "󰋗 Help", "Spc c h", "NvCheatsheet" },
},
}
}
return M

View file

@ -4,7 +4,7 @@ require("nvchad.configs.lspconfig").defaults()
local lspconfig = require "lspconfig"
-- EXAMPLE
local servers = { "html", "cssls", "nil_ls", "marksman", "clangd", "pylsp", "ts_ls", "java_language_server", "dockerls", "docker_compose_language_service", "jsonls", "kotlin_language_server", "bashls", "yamlls", "sqls" }
local servers = { "html", "cssls" }
local nvlsp = require "nvchad.configs.lspconfig"
-- lsps with default config
@ -15,9 +15,6 @@ for _, lsp in ipairs(servers) do
capabilities = nvlsp.capabilities,
}
end
lspconfig.gdscript.setup {
cmd = { "ncat", "localhost", "6005"}
}
-- configuring single server, example: typescript
-- lspconfig.ts_ls.setup {

View file

@ -17,30 +17,10 @@ vim.keymap.set("n", "<C-->", function()
end)
map("n", ";", ":", { desc = "CMD enter command mode" })
map({"n", "t", "v", "i"}, "<A-x>", ":", { desc = "CMD enter command mode" })
map({"n", "t", "v", "i"}, "<C-n>", "<Down>", { desc = "up" })
map({"n", "t", "v", "i"}, "<C-p>", "<Up>", { desc = "down" })
map({"n", "t", "v", "i"}, "<C-h>", "<C-w>h", { desc = "switch window left" })
map({"n", "t", "v", "i"}, "<C-l>", "<C-w>l", { desc = "switch window right" })
map({"n", "t", "v", "i"}, "<C-j>", "<C-w>j", { desc = "switch window down" })
map({"n", "t", "v", "i"}, "<C-k>", "<C-w>k", { desc = "switch window up" })
map({"n", "v", "i"}, "<A-x>", ":", { desc = "CMD enter command mode" })
map("n", "<leader>.", "<cmd>Telescope find_files<cr>", { desc = "telescope find files" })
map("n", "<leader>/", "<cmd>Telescope live_grep<cr>", { desc = "telescope live grep" })
map("n", "<leader>gg", "<cmd>Neogit<cr>", { desc = "Neogit status buffer" })
map("n", "<leader>c", "gcc", { desc = "Toggle Comment", remap = true })
map("v", "<leader>c", "gc", { desc = "Toggle comment", remap = true })
map("n", "<leader>pp", "<cmd>Telescope workspaces<cr>", { desc = "telescope workspaces" })
map("n", "<leader>pf", "<cmd>Telescope find_files<cr>", { desc = "telescope find files" })
map("n", "<A-w>", "<cmd>q<cr>", { desc = "quit" })
map("n", "<leader>wd>", "<cmd>q<cr>", { desc = "quit" })
map("n", "<leader>ws", "<cmd>split<cr>", { desc = "horizontal split" })
map("n", "<leader>wS", "<cmd>split<cr>", { desc = "horizontal split" })
map("n", "<leader>wv", "<cmd>vsplit<cr>", { desc = "vertical split" })
map("n", "<leader>wV", "<cmd>vsplit<cr>", { desc = "vertical split" })
map({ "n", "t", "i", "v" }, "<A-f>", "<cmd>NvimTreeToggle<CR>", { desc = "nvimtree toggle window" })
map({ "n", "t", "i", "v" }, "<A-z>", function()
require("nvchad.term").toggle { pos = "sp", id = "htoggleTerm" }
end, { desc = "terminal toggleable horizontal term" })
map("i", "jk", "<ESC>")
-- map({ "n", "i", "v" }, "<C-s>", "<cmd> w <cr>")

View file

@ -18,7 +18,7 @@ return {
opts = {
ensure_installed = {
"vim", "lua", "vimdoc",
"html", "css", 'gdscript'
"html", "css"
},
},
},

View file

@ -3,28 +3,9 @@
{
home.packages = with pkgs; [
neovim
neovim-remote
neovide
lua-language-server
vscode-langservers-extracted
nil
clang-tools
marksman
python311Packages.python-lsp-server
typescript-language-server
java-language-server
dockerfile-language-server-nodejs
docker-compose-language-service
kotlin-language-server
bash-language-server
yaml-language-server
sqls
nmap
];
programs.neovim = {
viAlias = true;
vimAlias = true;
};
home.file.".config/nvim".source = ./.;
home.file.".config/nvim".recursive = true;
home.file.".config/nvim/lua/themes/stylix.lua".source = config.lib.stylix.colors {

View file

@ -49,6 +49,7 @@ in
exec-once = hyprprofile Default
exec-once = emacs --daemon
exec-once = ydotoold
#exec-once = STEAM_FRAME_FORCE_CLOSE=1 steam -silent
exec-once = nm-applet
@ -549,7 +550,14 @@ in
if pgrep -x nixos-rebuild > /dev/null || pgrep -x home-manager > /dev/null || pgrep -x kdenlive > /dev/null || pgrep -x FL64.exe > /dev/null || pgrep -x blender > /dev/null || pgrep -x flatpak > /dev/null;
then echo "Shouldn't suspend"; sleep 10; else echo "Should suspend"; systemctl suspend; fi
'')
])
(pkgs.makeDesktopItem {
name = "emacsclientnewframe";
desktopName = "Emacs Client New Frame";
exec = "emacsclient -c -a emacs";
terminal = false;
icon = "emacs";
type = "Application";
})])
++
(with pkgs-hyprland; [ ])
++ (with pkgs-nwg-dock-hyprland; [
@ -600,7 +608,7 @@ in
home.file.".config/nwg-dock-pinned".text = ''
nwggrid
Alacritty
neovide
emacsclientnewframe
qutebrowser
brave-browser
writer