From 9e2f88756b008c85bb738d990a703815874d52d2 Mon Sep 17 00:00:00 2001 From: Varris Date: Fri, 22 Dec 2023 17:11:01 +0100 Subject: [PATCH] update --- flake.nix | 1 - overlay.nix | 2 +- user/configs/neovim/config/lua/settings.lua | 1 - user/configs/wayland/hyprland/default.nix | 9 +++++++-- user/configs/wayland/wob/default.nix | 14 -------------- 5 files changed, 8 insertions(+), 19 deletions(-) delete mode 100755 user/configs/wayland/wob/default.nix diff --git a/flake.nix b/flake.nix index bed72e8..c96002a 100755 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,6 @@ hyprland.url = "github:hyprwm/hyprland"; hyprland-contrib.url = "github:hyprwm/contrib"; - hyprpicker.url = "github:hyprwm/hyprpicker"; ags.url = "github:Aylur/ags"; diff --git a/overlay.nix b/overlay.nix index 60c9a0e..133e7c9 100755 --- a/overlay.nix +++ b/overlay.nix @@ -11,7 +11,7 @@ }; kitty = prev.kitty.overrideAttrs (old: { - patches = [./pkgs/kitty/0011-fix-test_fish_integration.patch]; + patches = old.patches ++ [./pkgs/kitty/0011-fix-test_fish_integration.patch]; }); steam = prev.steam.override { diff --git a/user/configs/neovim/config/lua/settings.lua b/user/configs/neovim/config/lua/settings.lua index 85a892f..046aec3 100755 --- a/user/configs/neovim/config/lua/settings.lua +++ b/user/configs/neovim/config/lua/settings.lua @@ -8,7 +8,6 @@ vim.o.smartindent = true vim.o.background = "dark" vim.o.clipboard = "unnamedplus" --- vim.o.mouse = "" vim.o.termguicolors = true vim.o.ignorecase = true vim.o.smartcase = true diff --git a/user/configs/wayland/hyprland/default.nix b/user/configs/wayland/hyprland/default.nix index eeaa68b..0115068 100755 --- a/user/configs/wayland/hyprland/default.nix +++ b/user/configs/wayland/hyprland/default.nix @@ -8,7 +8,6 @@ imports = [ ./settings.nix ../ags - ../wob ]; wayland.windowManager.hyprland = { @@ -29,5 +28,11 @@ Exec=swww img "%f" && ln -sf "%f" ~/.cache/swww/wallpaper ''; - home.packages = [pkgs.wl-clipboard pkgs.wl-clipboard-x11 pkgs.swww inputs.hyprland-contrib.packages.${system}.hyprprop]; + home.packages = [ + inputs.hyprland-contrib.packages.${system}.hyprprop + pkgs.hyprpicker + pkgs.swww + pkgs.wl-clipboard + pkgs.wl-clipboard-x11 + ]; } diff --git a/user/configs/wayland/wob/default.nix b/user/configs/wayland/wob/default.nix deleted file mode 100755 index 0ee049f..0000000 --- a/user/configs/wayland/wob/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{lib, ...}: { - xdg.configFile."wob/wob.ini".text = lib.generators.toINIWithGlobalSection {} { - globalSection = { - height = "40"; - - border_size = "2"; - border_color = "282828FF"; - - background_color = "282828FF"; - bar_color = "665C54FF"; - }; - sections = {}; - }; -}