diff --git a/README.md b/README.md index 3468157..5f4699b 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,3 @@ My flake based nixos configuration. To use this, just rebuild your system using - automatically save/restore state using continuum - customize status bar - clean out the mess I made for installing fish themes -- customize picom -- vim: - - configure lualine more diff --git a/dotfiles/neovim/lua/my/plugins/lualine.lua b/dotfiles/neovim/lua/my/plugins/lualine.lua index c8a24c0..ea277fd 100644 --- a/dotfiles/neovim/lua/my/plugins/lualine.lua +++ b/dotfiles/neovim/lua/my/plugins/lualine.lua @@ -3,7 +3,18 @@ local M = {} function M.setup() require('lualine').setup({ theme = vim.g.lualineTheme, - + options = { + section_separators = {left = '', right = ''}, + component_separators = {left = '', right = ''} + }, + sections = { + lualine_a = {'mode'}, + lualine_b = {'branch', 'diff', 'diagnostics'}, + lualine_c = {'filename'}, + lualine_x = {}, + lualine_y = {'encoding', 'fileformat', 'filetype'}, + lualine_z = {'location'} + }, -- Integration with other plugins extensions = {"nvim-tree"} }) diff --git a/dotfiles/neovim/lua/my/plugins/null-ls.lua b/dotfiles/neovim/lua/my/plugins/null-ls.lua index e73518f..d741f4b 100644 --- a/dotfiles/neovim/lua/my/plugins/null-ls.lua +++ b/dotfiles/neovim/lua/my/plugins/null-ls.lua @@ -6,9 +6,7 @@ function M.setup() local null_ls = require("null-ls") local sources = { - null_ls.builtins.formatting.prettierd.with({ - extra_filetypes = {"markdown"} - }), -- format ts files + null_ls.builtins.formatting.prettierd.with({extra_filetypes = {}}), -- format ts files null_ls.builtins.formatting.lua_format -- format lua code } diff --git a/modules/applications/misc.nix b/modules/applications/misc.nix index fb637cc..41adda3 100644 --- a/modules/applications/misc.nix +++ b/modules/applications/misc.nix @@ -42,7 +42,7 @@ # chat apps discord # deluge - # slack + slack tdesktop # telegram for the desktop zoom-us # teams diff --git a/modules/applications/neovim.nix b/modules/applications/neovim.nix index 69bf683..00e154c 100644 --- a/modules/applications/neovim.nix +++ b/modules/applications/neovim.nix @@ -52,7 +52,6 @@ let --prefix PATH : ${lib.makeBinPath extraPackages} ''; }; - in { home-manager.users.adrielus = diff --git a/modules/applications/xmonad/Main.hs b/modules/applications/xmonad/Main.hs index b5d0136..63dd991 100644 --- a/modules/applications/xmonad/Main.hs +++ b/modules/applications/xmonad/Main.hs @@ -14,6 +14,7 @@ import XMonad.Layout.Spacing import XMonad.Layout.ThreeColumns import XMonad.Operations import XMonad.Util.EZConfig +import XMonad.Layout.NoBorders kdeOn :: Bool kdeOn = False @@ -31,7 +32,8 @@ main = manageHook = manageDocks <+> myManagerHook <+> manageHook kdeConfig, handleEventHook = handleEventHook kdeConfig <+> fullscreenEventHook, terminal = myTerminal, - workspaces = myWorkspaces + workspaces = myWorkspaces, + borderWidth = 0 } `additionalKeysP` keymap where diff --git a/modules/applications/xmonad/default.nix b/modules/applications/xmonad/default.nix index 3022ca9..ed6f579 100644 --- a/modules/applications/xmonad/default.nix +++ b/modules/applications/xmonad/default.nix @@ -12,6 +12,18 @@ # home.file.".config/plasma-workspace/env/set_window_manager.sh".text = # "export KDEWM=/home/adrielus/.nix-profile/bin/xmonad"; - services.picom = { enable = true; }; + services.picom = { + enable = true; + blur = true; + shadow = true; + extraOptions = '' + blur: + { + method = "gaussian"; + size = 10; + deviation = 5.0; + }; + ''; + }; }; } diff --git a/modules/themes/catppuccin/default.nix b/modules/themes/catppuccin/default.nix index e63cd44..46e577f 100644 --- a/modules/themes/catppuccin/default.nix +++ b/modules/themes/catppuccin/default.nix @@ -53,8 +53,8 @@ in import = [ "${foreign.alacritty}/catppuccin.yml" ]; window = { padding = { - x = 0; - y = 0; + x = 4; + y = 4; }; gtk_theme_variant = "dark";