fixup! unify home-manager configurations of workmac and main laptop

This commit is contained in:
Trolli Schmittlauch 2024-03-18 11:06:21 +01:00
parent b3cf056b94
commit 2a7ae8db06
4 changed files with 11 additions and 11 deletions

View file

@ -38,9 +38,6 @@
terminal = "screen-256color"; terminal = "screen-256color";
}; };
# for backwards compatibility
services.lorri.enable = true;
fonts.fontconfig.enable = true; fonts.fontconfig.enable = true;
programs.git = { programs.git = {

View file

@ -23,6 +23,9 @@
latex.guiTools = true; latex.guiTools = true;
}; };
# for backwards compatibility
services.lorri.enable = true;
programs.git = programs.git =
let let
# TODO profile specific # TODO profile specific

View file

@ -154,7 +154,7 @@ let
games = [ games = [
superTuxKart superTuxKart
hedgewars #hedgewars
]; ];
desktopApps = [ desktopApps = [

View file

@ -18,9 +18,6 @@ in
nixHelpers = true; nixHelpers = true;
devTools = true; devTools = true;
pythonTools = true; pythonTools = true;
games = true;
desktop = true;
kde = true;
}; };
home.packages = [ home.packages = [
@ -52,7 +49,7 @@ in
programs.git = programs.git =
let let
contacts = import ./secrets/contacts.nix; contacts = import "${inputs.mysecrets}/contacts.nix";
in in
{ {
includes = includes =
@ -83,9 +80,12 @@ in
}; };
# some extra shell scripts # some extra shell scripts
programs.zsh.initExtra = programs.zsh.initExtra = lib.mkAfter (
lib.mkAfter (import ./scripts/reporsync.nix { inherit pkgs; }) import ./scripts/reporsync.nix { inherit pkgs; }
+ (import ./scripts/ssh-loop-fc.nix { inherit pkgs; }); + import ./scripts/ssh-loop-fc.nix { inherit pkgs; }
);
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "1password-cli" ];
home.stateVersion = "22.05"; home.stateVersion = "22.05";
} }