From 1ccb1ded826ba6e7f306f9aa73d274e29019717a Mon Sep 17 00:00:00 2001 From: Toast Date: Tue, 12 Mar 2024 10:17:33 +0100 Subject: [PATCH 1/3] Desktop: configure git --- roles/desktop/programs/default.nix | 1 + roles/desktop/programs/git.nix | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 roles/desktop/programs/git.nix diff --git a/roles/desktop/programs/default.nix b/roles/desktop/programs/default.nix index 2cbcac7..32eedf6 100755 --- a/roles/desktop/programs/default.nix +++ b/roles/desktop/programs/default.nix @@ -8,5 +8,6 @@ ./keepassxc.nix ./jamesdsp.nix ./vscode.nix + ./git.nix ]; } diff --git a/roles/desktop/programs/git.nix b/roles/desktop/programs/git.nix new file mode 100644 index 0000000..ed2ba14 --- /dev/null +++ b/roles/desktop/programs/git.nix @@ -0,0 +1,9 @@ +{ pkgs, lib, ... }: + +{ + home-manager.users.toast = { + programs.git = { + package = pkgs.gitFull; + }; + }; +} From 34a9c49b174915eb49ce28bea8629c24cdcde257 Mon Sep 17 00:00:00 2001 From: Toast Date: Tue, 12 Mar 2024 10:18:03 +0100 Subject: [PATCH 2/3] Desktop/git: install and configure git-cola --- roles/desktop/programs/git.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/roles/desktop/programs/git.nix b/roles/desktop/programs/git.nix index ed2ba14..d630bdd 100644 --- a/roles/desktop/programs/git.nix +++ b/roles/desktop/programs/git.nix @@ -4,6 +4,13 @@ home-manager.users.toast = { programs.git = { package = pkgs.gitFull; + extraConfig = { + cola = { + icontheme = lib.mkDefault "dark"; + }; + }; }; + + home.packages = [ pkgs.git-cola ]; }; } From 8c2041893960399162f7aac682e292dbf2677706 Mon Sep 17 00:00:00 2001 From: Toast Date: Tue, 12 Mar 2024 10:43:19 +0100 Subject: [PATCH 3/3] Kde: configure git-cola --- roles/kde/programs/default.nix | 1 + roles/kde/programs/git.nix | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 roles/kde/programs/git.nix diff --git a/roles/kde/programs/default.nix b/roles/kde/programs/default.nix index 7c22bb0..b39dcfc 100644 --- a/roles/kde/programs/default.nix +++ b/roles/kde/programs/default.nix @@ -7,6 +7,7 @@ ./skanpage.nix ./neochat.nix ./konsole.nix + ./git.nix ]; # Enable the kde partition manager diff --git a/roles/kde/programs/git.nix b/roles/kde/programs/git.nix new file mode 100644 index 0000000..9d1c045 --- /dev/null +++ b/roles/kde/programs/git.nix @@ -0,0 +1,13 @@ +{ pkgs, lib, ... }: + +{ + home-manager.users.toast = { + programs.git = { + extraConfig = { + cola = { + terminal = "konsole"; + }; + }; + }; + }; +}