Merge branch 'pc' of ssh://server/nico/nix-files into pc

packages/nvim/default.nix~

@@ -1,31 +0,0 @@
-{ pkgs, config, lib,... }:
-{
-
- home.packages = with pkgs; [
-    
- ];
-
-programs.neovim = {
-  enable = true;
-  vimAlias = true;
-};
-
-
-programs.neovim.plugins = [
-  pkgs.vimPlugins.lazy-nvim
-];
-
- home.file =
-  lib.mkMerge [
-   {
-    ".config/nvim/init.lua".source = ./init.lua;
-    ".config/nvim/lua/config/lazy.lua".source = ./lua/config/lazy.lua;
-    ".config/nvim/lua/plugins/flutter.lua".source = ./lua/plugins/flutter.lua;
-    ".config/nvim/lua/plugins/coq.lua".source = ./lua/plugins/coq.lua;
-    ".config/nvim/lua/plugins/treesitter.lua".source = ./lua/plugins/treesitter.lua;
-    ".config/nvim/lua/plugins/catppuccin.lua".source = ./lua/plugins/catppuccin.lua;
-    ".config/nvim/lua/plugins/telescope.lua".source = ./lua/plugins/telescope.lua;
-    ".config/nvim/lua/plugins/highlight-colors.lua".source = ./lua/plugins/highlight-colors.lua;
-   }
-  ];
-}

packages/nvim/init.lua~

@@ -1,113 +0,0 @@
--- Tab
-vim.opt.tabstop = 2                 -- number of visual spaces per TAB
-vim.opt.softtabstop = 2             -- number of spacesin tab when editing
-vim.opt.shiftwidth = 2              -- insert 4 spaces on a tab
-vim.opt.expandtab = true            -- tabs are spaces, mainly because of python
-
--- UI config
-vim.opt.number = true               -- show absolute number
-vim.opt.relativenumber = true       -- add numbers to each line on the left side
-vim.opt.splitbelow = true           -- open new vertical split bottom
-vim.opt.splitright = true           -- open new horizontal splits right
--- vim.opt.termguicolors = true        -- enabl 24-bit RGB color in the TUI
-vim.opt.showmode = false            -- we are experienced, wo don't need the "-- INSERT --" mode hint
-
--- Searching
-vim.opt.incsearch = true            -- search as characters are entered
-vim.opt.hlsearch = false            -- do not highlight matches
-vim.opt.ignorecase = true           -- ignore case in searches by default
-vim.opt.smartcase = true            -- but make it case sensitive if an uppercase is entered
-
--- -- Keybinds
-vim.keymap.set('n', '<C-h>', '<C-w>h', opts)
-vim.keymap.set('n', '<C-j>', '<C-w>j', opts)
-vim.keymap.set('n', '<C-k>', '<C-w>k', opts)
-vim.keymap.set('n', '<C-l>', '<C-w>l', opts)
-
--- Resize with arrows
--- delta: 2 lines
-vim.keymap.set('n', '<C-Up>', ':resize -2<CR>', opts)
-vim.keymap.set('n', '<C-Down>', ':resize +2<CR>', opts)
-vim.keymap.set('n', '<C-Left>', ':vertical resize -2<CR>', opts)
-vim.keymap.set('n', '<C-Right>', ':vertical resize +2<CR>', opts)
-
--- Telescope binds
-vim.keymap.set("n", "<space>fb", ":Telescope file_browser<CR>")
-
-
-vim.keymap.set('i', 'jk', '<Esc>', opts)
-
--- Lazy
-require("config.lazy")
--- require("flutter-tools").setup {} -- use defaults
-require("catppuccin").setup({
-    integrations = {
-        cmp = false,
-        gitsigns = true,
-        nvimtree = true,
-        treesitter = true,
-        notify = false,
-        mini = {
-            enabled = false,
-            indentscope_color = "",
-        },
-    }
-})
-
--- css colors
-vim.opt.termguicolors = true
-require('nvim-highlight-colors').setup({})
-
-vim.cmd.colorscheme "catppuccin"
-
-
-
-
--- lsp
-local on_attach = function(_, bufnr)
-
-  local bufmap = function(keys, func)
-    vim.keymap.set('n', keys, func, { buffer = bufnr })
-  end
-
-  bufmap('<leader>r', vim.lsp.buf.rename)
-  bufmap('<leader>a', vim.lsp.buf.code_action)
-
-  bufmap('gd', vim.lsp.buf.definition)
-  bufmap('gD', vim.lsp.buf.declaration)
-  bufmap('gI', vim.lsp.buf.implementation)
-  bufmap('<leader>D', vim.lsp.buf.type_definition)
-
-  bufmap('gr', require('telescope.builtin').lsp_references)
-  bufmap('<leader>s', require('telescope.builtin').lsp_document_symbols)
-  bufmap('<leader>S', require('telescope.builtin').lsp_dynamic_workspace_symbols)
-
-  bufmap('K', vim.lsp.buf.hover)
-
-  vim.api.nvim_buf_create_user_command(bufnr, 'Format', function(_)
-    vim.lsp.buf.format()
-  end, {})
-end
-
-local capabilities = vim.lsp.protocol.make_client_capabilities()
-capabilities = require('coq').lsp_ensure_capabilities(capabilities)
-
-require('lspconfig').lua_ls.setup {
-    on_attach = on_attach,
-    capabilities = capabilities,
-	root_dir = function()
-        return vim.loop.cwd()
-    end,
-	cmd = { "lua-lsp" },
-    settings = {
-        Lua = {
-            workspace = { checkThirdParty = false },
-            telemetry = { enable = false },
-        },
-    }
-}
-
-require('lspconfig').nil_ls.setup {
-    on_attach = on_attach,
-    capabilities = capabilities,
-}

packages/waybar/config

@@ -52,7 +52,7 @@
 
 
   "pulseaudio": {
-    "format": "{icon}   {volume}%",
+    "format": "{icon}    {volume}%",
     "format-muted": " Muted",
     "format-icons": ["", "", ""]
   },

packages/waybar/style.css

@@ -39,7 +39,7 @@ window#waybar {
 	background: @crust;
 	color: @mauve;
 	padding: 0px 2px ;
-	margin: 1px 0px;
+	margin: 3px 0px;
 }
 
 #workspaces button{