diff --git a/flake.nix b/flake.nix index ac02d7d..14bf36d 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,7 @@ }; outputs = { self, nixpkgs, home-manager, ... }@inputs: let - stateVersion = "23.11"; + stateVersion = "23.05"; in rec { nixosConfigurations = { diff --git a/home-manager/cli/neovim/default.nix b/home-manager/cli/neovim/default.nix index c1eecbe..ab93cf2 100644 --- a/home-manager/cli/neovim/default.nix +++ b/home-manager/cli/neovim/default.nix @@ -65,15 +65,7 @@ in type = "lua"; config = (builtins.readFile ./files/luasnip.lua); } - { - plugin = indent-blankline-nvim; - type = "lua"; - config ='' - require("ibl").setup{ - indent = { char = "│"}, - } - ''; - } + indent-blankline-nvim { plugin = nvim-lspconfig; type = "lua"; diff --git a/home-manager/cli/neovim/files/options.lua b/home-manager/cli/neovim/files/options.lua index 193fe24..0fe083d 100644 --- a/home-manager/cli/neovim/files/options.lua +++ b/home-manager/cli/neovim/files/options.lua @@ -15,16 +15,8 @@ vim.opt.hlsearch = true -- search: hightlight terms vim.opt.ignorecase = true vim.opt.incsearch = true vim.opt.laststatus = 1 - -- show special character -vim.opt.listchars = { - tab = '→ ', - trail = '␣', - space = '·', - eol = '', - extends = '…', - precedes = "<" -} +vim.opt.listchars = {tab = '→ ', trail = '␣', eol = '', extends = '…' } vim.opt.signcolumn = "yes" -- alway show sign column vim.opt.number = true diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 9829481..19370ec 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -5,11 +5,9 @@ dejavu_fonts emojione font-awesome - grim lato liberation_ttf libertine - libnotify (nerdfonts.override { fonts = [ "FiraCode" @@ -17,7 +15,8 @@ }) noto-fonts-emoji noto-fonts-cjk - slurp + + libnotify wl-clipboard xdg-utils ]; diff --git a/nixos/includes/desktop/xdg-portal.nix b/nixos/includes/desktop/xdg-portal.nix index 9d2b049..130f664 100644 --- a/nixos/includes/desktop/xdg-portal.nix +++ b/nixos/includes/desktop/xdg-portal.nix @@ -1,18 +1,9 @@ -{ pkgs, ...}: +{ config, pkgs, ...}: { xdg.portal = { enable = true; wlr.enable = true; # gtk portal needed to make gtk apps happy extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; - config = { - common = { - default = [ - "gtk" - ]; - "org.freedesktop.impl.portal.ScreenCast" = "wlr"; - "org.freedesktop.impl.portal.Screenshot" = "wlr"; - }; - }; }; }