diff --git a/flake.nix b/flake.nix index c96002a..e355b19 100755 --- a/flake.nix +++ b/flake.nix @@ -29,6 +29,12 @@ gruvbox-plus-icon-pack.url = "github:SylEleuth/gruvbox-plus-icon-pack"; gruvbox-plus-icon-pack.flake = false; + + openmw-git.url = "gitlab:OpenMW/openmw"; + openmw-git.flake = false; + + mygui-git.url = "github:mygui/MyGUI/dae9ac4be5a09e672bec509b1a8552b107c40214"; + mygui-git.flake = false; }; outputs = { diff --git a/overlay.nix b/overlay.nix index 133e7c9..0c4d127 100755 --- a/overlay.nix +++ b/overlay.nix @@ -10,8 +10,22 @@ fonts = ["JetBrainsMono"]; }; + mygui-openmw = prev.mygui.overrideAttrs (old: { + version = "3.4.3"; + src = inputs.mygui-git; + patches = []; + cmakeFlags = old.cmakeFlags ++ ["-DMYGUI_DONT_USE_OBSOLETE=ON"]; #fix openmw link error + }); + + openmw = prev.openmw.overrideAttrs (old: { + version = "9999"; + src = inputs.openmw-git; + buildInputs = (prev.lib.lists.remove prev.mygui old.buildInputs) ++ [prev.libyamlcpp prev.luajit prev.collada-dom final.mygui-openmw]; + patches = []; + }); + kitty = prev.kitty.overrideAttrs (old: { - patches = old.patches ++ [./pkgs/kitty/0011-fix-test_fish_integration.patch]; + patches = [./pkgs/kitty/0011-fix-test_fish_integration.patch]; }); steam = prev.steam.override { @@ -26,5 +40,11 @@ prev.mpg123 ]; }; + + nvim-hmts = prev.vimUtils.buildVimPlugin { + pname = "nvim-hmts"; + version = "1"; + src = inputs.nvim-hmts; + }; }; } diff --git a/system/configuration.nix b/system/configuration.nix index 059e4b5..77d8208 100755 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -92,6 +92,11 @@ } ]; }; + + pam.services.kwallet = { + name = "kwallet"; + enableKwallet = true; + }; }; users.users.manuel = { diff --git a/system/services/default.nix b/system/services/default.nix index 36c9e86..16dd6ea 100644 --- a/system/services/default.nix +++ b/system/services/default.nix @@ -12,7 +12,6 @@ avahi.enable = true; blueman.enable = true; flatpak.enable = true; - # gnome.gnome-keyring.enable = true; gvfs.enable = true; openssh.enable = true; udisks2.enable = true; diff --git a/system/services/podman/default.nix b/system/services/podman/default.nix index a2ac480..7a72396 100644 --- a/system/services/podman/default.nix +++ b/system/services/podman/default.nix @@ -2,12 +2,12 @@ virtualisation = { podman = { enable = true; - - # Create a `docker` alias for podman, to use it as a drop-in replacement dockerCompat = true; - - # Required for containers under podman-compose to be able to talk to each other. defaultNetwork.settings.dns_enabled = true; + + extraPackages = [ + pkgs.busybox + ]; }; }; } diff --git a/user/configs/neovim/config/lua/plugins/init.lua b/user/configs/neovim/config/lua/plugins/init.lua index 9a18531..ca34915 100755 --- a/user/configs/neovim/config/lua/plugins/init.lua +++ b/user/configs/neovim/config/lua/plugins/init.lua @@ -8,11 +8,12 @@ require("plugins.dressing") require("plugins.ibl") require("plugins.lspconfig") require("plugins.lualine") -require("plugins.notify") require("plugins.noice") +require("plugins.notify") require("plugins.smartsplits") require("plugins.surround") require("plugins.telescope") require("plugins.treesitter") require("plugins.trouble") +require("plugins.ufo") require("plugins.which-key") diff --git a/user/configs/neovim/config/lua/plugins/ufo.lua b/user/configs/neovim/config/lua/plugins/ufo.lua new file mode 100644 index 0000000..cae6337 --- /dev/null +++ b/user/configs/neovim/config/lua/plugins/ufo.lua @@ -0,0 +1,13 @@ +vim.o.foldlevel = 99 -- Using ufo provider need a large value, feel free to decrease the value +vim.o.foldlevelstart = 99 +vim.o.foldenable = true + +-- Using ufo provider need remap `zR` and `zM`. If Neovim is 0.6.1, remap yourself +vim.keymap.set('n', 'zR', require('ufo').openAllFolds) +vim.keymap.set('n', 'zM', require('ufo').closeAllFolds) + +require('ufo').setup({ + provider_selector = function(bufnr, filetype, buftype) + return {'treesitter', 'indent'} + end +}) diff --git a/user/configs/neovim/default.nix b/user/configs/neovim/default.nix index a5e47c2..94baa32 100755 --- a/user/configs/neovim/default.nix +++ b/user/configs/neovim/default.nix @@ -19,6 +19,7 @@ nvim-colorizer-lua nvim-notify nvim-surround + nvim-ufo nvim-web-devicons smart-splits-nvim vim-easy-align diff --git a/user/configs/wayland/hyprland/settings.nix b/user/configs/wayland/hyprland/settings.nix index 547e626..632fa44 100644 --- a/user/configs/wayland/hyprland/settings.nix +++ b/user/configs/wayland/hyprland/settings.nix @@ -93,6 +93,7 @@ in { "${pkgs.openrgb}/bin/openrgb --startminimized --profile autorun.orp" "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1" "${pkgs.ydotool}/bin/ydotoold" + "${pkgs.libsForQt5.kwallet}/bin/kwalletd5" ]; exec = [ diff --git a/user/home.nix b/user/home.nix index adc25de..af69f4f 100755 --- a/user/home.nix +++ b/user/home.nix @@ -34,6 +34,7 @@ bottom calcurse electron + filezilla gamescope_git gimp gnome.gnome-boxes @@ -46,6 +47,7 @@ libsForQt5.ark libsForQt5.dolphin libsForQt5.dolphin-plugins + libsForQt5.kwallet lutris mangohud mesa-demos