diff --git a/home/vim/ftdetect/tiger.vim b/home/vim/ftdetect/tiger.vim deleted file mode 100644 index d474fd7..0000000 --- a/home/vim/ftdetect/tiger.vim +++ /dev/null @@ -1,3 +0,0 @@ -" Use Tiger filetype for programs and header files -au BufNewFile,BufRead *.tig setfiletype tiger -au BufNewFile,BufRead *.tih setfiletype tiger diff --git a/home/wm/cursor/default.nix b/home/wm/cursor/default.nix deleted file mode 100644 index 9426232..0000000 --- a/home/wm/cursor/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ config, lib, pkgs, ... }: -let - cfg = config.my.home.wm.cursor; - - cfg_x = config.my.home.x; - cfg_gtk = config.my.home.gtk; -in -{ - config = lib.mkIf cfg.enable { - home.pointerCursor = { - package = pkgs.ambroisie.vimix-cursors; - name = "Vimix-cursors"; - - x11 = { - inherit (cfg_x) enable; - }; - - gtk = { - inherit (cfg_gtk) enable; - }; - }; - }; -} diff --git a/home/wm/default.nix b/home/wm/default.nix index fb9ecee..1d5a371 100644 --- a/home/wm/default.nix +++ b/home/wm/default.nix @@ -10,7 +10,6 @@ let in { imports = [ - ./cursor ./dunst ./i3 ./i3bar @@ -26,10 +25,6 @@ in description = "Which window manager to use for home session"; }; - cursor = { - enable = mkRelatedOption "dunst configuration" [ "i3" ]; - }; - dunst = { enable = mkRelatedOption "dunst configuration" [ "i3" ]; }; diff --git a/home/x/cursor/default.nix b/home/x/cursor/default.nix new file mode 100644 index 0000000..4762199 --- /dev/null +++ b/home/x/cursor/default.nix @@ -0,0 +1,12 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.my.home.x; +in +{ + config = lib.mkIf cfg.enable { + xsession.pointerCursor = { + package = pkgs.ambroisie.vimix-cursors; + name = "Vimix-cursors"; + }; + }; +} diff --git a/home/x/default.nix b/home/x/default.nix index 0312bc4..ac66a50 100644 --- a/home/x/default.nix +++ b/home/x/default.nix @@ -4,6 +4,7 @@ let in { imports = [ + ./cursor ./keyboard ]; diff --git a/pkgs/drone-scp/default.nix b/pkgs/drone-scp/default.nix index 0b51032..863befd 100644 --- a/pkgs/drone-scp/default.nix +++ b/pkgs/drone-scp/default.nix @@ -1,16 +1,16 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "drone-scp"; - version = "1.6.3"; + version = "1.6.2"; src = fetchFromGitHub { owner = "appleboy"; repo = "drone-scp"; rev = "v${version}"; - sha256 = "sha256-ELjPqoRR4O6gmc/PgthQuSXuSTQNzBZoAUT80zVVbV0="; + sha256 = "sha256-PNy1HA2qW4RY/VRHhuj/tIrdTuB7COr0Cuzurku+DZw="; }; - vendorSha256 = "sha256-/c103hTJ/Qdz2KTkdl/ACvAaSSTKcl1DQY3+Us6OxaI="; + vendorSha256 = "sha256-7Aro6g3Tka0Cbi9LpqvKpQXlbxnHQWsMOkkNpENKh0U="; doCheck = false; # Needs a specific user...