From c274be5ab9ad8382cadda5ce3ec53d42c0e05d63 Mon Sep 17 00:00:00 2001 From: Tristan Date: Mon, 12 Feb 2024 12:46:05 +0000 Subject: [PATCH] neovim alias, hypr tabs order, remove hycov --- flake.nix | 4 ---- home/desktop/hyprland/default.nix | 8 ++++---- home/programs/neovim/config.lua | 1 - home/programs/neovim/default.nix | 2 +- lib/mkconf.nix | 3 --- 5 files changed, 5 insertions(+), 13 deletions(-) diff --git a/flake.nix b/flake.nix index 4993de8..9b7aefa 100644 --- a/flake.nix +++ b/flake.nix @@ -10,10 +10,6 @@ }; stylix.url = "github:danth/stylix"; hyprland.url = "github:hyprwm/Hyprland/v0.35.0"; - hycov = { - url = "github:DreamMaoMao/hycov"; - inputs.hyprland.follows = "hyprland"; - }; }; outputs = inputs: let diff --git a/home/desktop/hyprland/default.nix b/home/desktop/hyprland/default.nix index 250bd2a..3a3a701 100644 --- a/home/desktop/hyprland/default.nix +++ b/home/desktop/hyprland/default.nix @@ -79,10 +79,10 @@ in { # window grouping "${modifier}_SHIFT, V, togglegroup," - "${modifier}_SHIFT, j, changegroupactive,b" - "${modifier}_SHIFT, k, changegroupactive,f" - "${modifier}_SHIFT, h, moveintogroup,l" - "${modifier}_SHIFT, l, moveintogroup,r" + "${modifier}_SHIFT, j, changegroupactive, f" + "${modifier}_SHIFT, k, changegroupactive, b" + "${modifier}_SHIFT, h, moveintogroup, l" + "${modifier}_SHIFT, l, moveintogroup, r" # scratch buffer "${modifier}, Y, togglespecialworkspace" diff --git a/home/programs/neovim/config.lua b/home/programs/neovim/config.lua index b74d21e..68fc1f4 100644 --- a/home/programs/neovim/config.lua +++ b/home/programs/neovim/config.lua @@ -7,7 +7,6 @@ vim.o.tabstop = 2 vim.o.shiftwidth = 2 vim.o.expandtab = true vim.o.smartindent = true -vim.o.hlsearch = false vim.o.scrolloff = 4 vim.o.undofile = true vim.o.undodir = vim.fn.expand("$HOME/.local/share/nvim/undo") diff --git a/home/programs/neovim/default.nix b/home/programs/neovim/default.nix index 42fc888..fc4d219 100644 --- a/home/programs/neovim/default.nix +++ b/home/programs/neovim/default.nix @@ -63,6 +63,6 @@ }; home.shellAliases = { - v = "nvim ."; + v = "nvim"; }; } diff --git a/lib/mkconf.nix b/lib/mkconf.nix index ad17d62..e5b2a27 100644 --- a/lib/mkconf.nix +++ b/lib/mkconf.nix @@ -31,9 +31,6 @@ with inputs; } ]; }; - nixpkgs.config.packageOverrides = pkgs: { - hycov = hycov.packages.${system}.hycov; - }; imports = [ { options.user = nixpkgs.lib.mkOption {default = user;};