From cb82747633710e6846853674b279ff71c5647336 Mon Sep 17 00:00:00 2001 From: Adrien Faure Date: Thu, 18 Jul 2024 08:33:30 +0200 Subject: [PATCH] repo: cleaning and refactoring --- homes/base.nix | 5 ----- homes/graphical.nix | 6 ------ homes/modules/tmux/default.nix | 8 +------- homes/modules/vim/default.nix | 7 +++---- pkgs/kcc/default.nix | 8 +++++--- 5 files changed, 9 insertions(+), 25 deletions(-) diff --git a/homes/base.nix b/homes/base.nix index 8e6fbaa..efc6065 100644 --- a/homes/base.nix +++ b/homes/base.nix @@ -1,9 +1,4 @@ { - nixpkgs, - options, - modulesPath, - lib, - config, pkgs, my-dotfiles, ... diff --git a/homes/graphical.nix b/homes/graphical.nix index 050c332..eb753b3 100644 --- a/homes/graphical.nix +++ b/homes/graphical.nix @@ -1,11 +1,5 @@ { - nixpkgs, unstable, - options, - modulesPath, - lib, - config, - home-module, pkgs, my-dotfiles, ... diff --git a/homes/modules/tmux/default.nix b/homes/modules/tmux/default.nix index 1c16760..3a05471 100644 --- a/homes/modules/tmux/default.nix +++ b/homes/modules/tmux/default.nix @@ -13,12 +13,6 @@ in { enable = true; shell = "${pkgs.zsh}/bin/zsh"; extraConfig = - builtins.readFile "${my-dotfiles}/files/tmux" - + '' - bind-key C-h display-popup -E -h 75% -w 75% -d "#{pane_current_path}" "${pkgs.zenith}/bin/zenith" - bind-key C-s display-popup -E -h 75% -w 75% -d "#{pane_current_path}" "(tmux new-session -s scratch -d && tmux new-window -t scratch:4 'nvim "+:ObsidianToday"'); tmux a -t scratch:1" - - bind-key C-j display-popup -E -h 75% -w 75% -d "#{pane_current_path}" "tmux attach -t scratch:4" - ''; + builtins.readFile "${my-dotfiles}/files/tmux"; }; } diff --git a/homes/modules/vim/default.nix b/homes/modules/vim/default.nix index 683ea3c..80ae0de 100644 --- a/homes/modules/vim/default.nix +++ b/homes/modules/vim/default.nix @@ -8,8 +8,7 @@ unstable, ... }: { - home.packages = - [ - nixvim-config.packages.${system}.default - ]; + home.packages = [ + nixvim-config.packages.${system}.default + ]; } diff --git a/pkgs/kcc/default.nix b/pkgs/kcc/default.nix index 1223d4a..a1a95d0 100644 --- a/pkgs/kcc/default.nix +++ b/pkgs/kcc/default.nix @@ -18,9 +18,10 @@ sha256 = "sha256-cl2Ydy6UP8oYsIAcuU5kXEd/9S5WrQsnvdt23fCRyj4="; }; + dontUseCmakeConfigure = true; + nativeBuildInputs = [pkgs.mozjpeg pkgs.cmake]; propagatedBuildInputs = [python3Packages.cffi]; - dontUseCmakeConfigure = true; }; in python3Packages.buildPythonPackage rec { @@ -39,8 +40,9 @@ in raven requests # Tests fail because they need this package which doesn't build - # pyside6 + pyside6 ]; + propagatedBuildInputs = [pkgs.p7zip] ++ (with python3Packages; [ @@ -53,7 +55,7 @@ in ]); # There is an AssertionError - doCheck = false; + doCheck = true; meta = with lib; { description = "";