Skip to content

Commit

Permalink
repo: cleaning and refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
adfaure committed Jul 18, 2024
1 parent 06386b5 commit cb82747
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 25 deletions.
5 changes: 0 additions & 5 deletions homes/base.nix
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
{
nixpkgs,
options,
modulesPath,
lib,
config,
pkgs,
my-dotfiles,
...
Expand Down
6 changes: 0 additions & 6 deletions homes/graphical.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
{
nixpkgs,
unstable,
options,
modulesPath,
lib,
config,
home-module,
pkgs,
my-dotfiles,
...
Expand Down
8 changes: 1 addition & 7 deletions homes/modules/tmux/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
};
}
7 changes: 3 additions & 4 deletions homes/modules/vim/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
unstable,
...
}: {
home.packages =
[
nixvim-config.packages.${system}.default
];
home.packages = [
nixvim-config.packages.${system}.default
];
}
8 changes: 5 additions & 3 deletions pkgs/kcc/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@
sha256 = "sha256-cl2Ydy6UP8oYsIAcuU5kXEd/9S5WrQsnvdt23fCRyj4=";
};

dontUseCmakeConfigure = true;

nativeBuildInputs = [pkgs.mozjpeg pkgs.cmake];
propagatedBuildInputs = [python3Packages.cffi];
dontUseCmakeConfigure = true;
};
in
python3Packages.buildPythonPackage rec {
Expand All @@ -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; [
Expand All @@ -53,7 +55,7 @@ in
]);

# There is an AssertionError
doCheck = false;
doCheck = true;

meta = with lib; {
description = "";
Expand Down

0 comments on commit cb82747

Please sign in to comment.