Set delta to use stylix-generated syntax theme

Update git config for better delta experience
Remove gitui, wasn't using it anyway...
Clean up SSH host definitions a bit
Remove emacs magit-delta and yuck-mode packages
This commit is contained in:
Evie Litherland-Smith 2023-10-20 15:23:16 +01:00
parent 581295af0a
commit dda19b7660
5 changed files with 20 additions and 56 deletions

View file

@ -380,22 +380,6 @@
"type": "github" "type": "github"
} }
}, },
"gitui": {
"flake": false,
"locked": {
"lastModified": 1696228836,
"narHash": "sha256-jlP+BnNa7vWteLKeNm2woXaSPsAu7RTNgiu9VZMKkw4=",
"owner": "extrawurst",
"repo": "gitui",
"rev": "b7772e63e4a5ba42ff3b09548debe7be5776f520",
"type": "github"
},
"original": {
"owner": "extrawurst",
"repo": "gitui",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -676,7 +660,6 @@
"inputs": { "inputs": {
"anyrun": "anyrun", "anyrun": "anyrun",
"doom-emacs": "doom-emacs", "doom-emacs": "doom-emacs",
"gitui": "gitui",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"stylix": "stylix", "stylix": "stylix",

View file

@ -25,10 +25,6 @@
url = "github:doomemacs/doomemacs"; url = "github:doomemacs/doomemacs";
flake = false; flake = false;
}; };
gitui = {
url = "github:extrawurst/gitui";
flake = false;
};
tokyonight-folke = { tokyonight-folke = {
url = "github:folke/tokyonight.nvim"; url = "github:folke/tokyonight.nvim";
flake = false; flake = false;
@ -72,7 +68,7 @@
inherit (inputs) anyrun watershot; inherit (inputs) anyrun watershot;
}; };
extraSpecialArgs = specialArgs // { extraSpecialArgs = specialArgs // {
inherit (inputs) doom-emacs gitui tokyonight-folke; inherit (inputs) doom-emacs tokyonight-folke;
}; };
in nixpkgs.lib.nixosSystem { in nixpkgs.lib.nixosSystem {
inherit system specialArgs; inherit system specialArgs;

View file

@ -1,6 +1,8 @@
{ config, lib, pkgs, tokyonight-folke, gitui, ... }: { config, lib, pkgs, tokyonight-folke, ... }:
{ {
xdg.configFile."bat/themes/tokyonight_night.tmTheme".source =
"${tokyonight-folke}/extras/sublime/tokyonight_night.tmTheme";
programs = { programs = {
bash.enable = true; bash.enable = true;
readline = { readline = {
@ -21,6 +23,7 @@
enableBashIntegration = true; enableBashIntegration = true;
enableZshIntegration = true; enableZshIntegration = true;
}; };
bat.enable = true;
git = { git = {
enable = true; enable = true;
package = pkgs.gitFull; package = pkgs.gitFull;
@ -29,26 +32,21 @@
delta = { delta = {
enable = true; enable = true;
options = { options = {
blame-code-style = "syntax";
line-numbers = true; line-numbers = true;
hyprlinks = true;
navigate = true; navigate = true;
side-by-side = true; side-by-side = true;
zero-style = "dim syntax"; syntax-theme = "base16-stylix";
}; };
}; };
extraConfig = { extraConfig = {
pull.rebase = false; pull.rebase = false;
init.defaultBranch = "main"; init.defaultBranch = "main";
merge.conflictstyle = "diff3";
diff.colorMoved = "default";
credential.helper = "${pkgs.gitFull}/bin/git-credential-libsecret"; credential.helper = "${pkgs.gitFull}/bin/git-credential-libsecret";
}; };
}; };
gitui = {
enable = true;
keyConfig = builtins.readFile "${gitui}/vim_style_key_config.ron";
theme = builtins.readFile
"${tokyonight-folke}/extras/gitui/tokyonight_night.ron";
};
bat.enable = true;
ssh = { ssh = {
enable = true; enable = true;
forwardAgent = true; forwardAgent = true;
@ -61,10 +59,7 @@
SetEnv TERM=xterm-256color SetEnv TERM=xterm-256color
''; '';
matchBlocks = { matchBlocks = {
"vanguard" = { "git*".user = "git";
user = "xenia";
hostname = "192.168.1.166";
};
"legion" = { "legion" = {
user = "xenia"; user = "xenia";
hostname = "192.168.1.230"; hostname = "192.168.1.230";
@ -73,22 +68,18 @@
user = "root"; user = "root";
hostname = "77.68.67.133"; hostname = "77.68.67.133";
}; };
"freia".hostname = "freia020.hpc.l"; "freia" = {
"freia???" =
lib.hm.dag.entryAfter [ "freia" ] { hostname = "%h.hpc.l"; };
"heimdall".hostname = "heimdall003.jet.uk";
"heimdall???" =
lib.hm.dag.entryAfter [ "heimdall" ] { hostname = "%h.jet.uk"; };
"freia* heimdall*" = lib.hm.dag.entryAfter [
"freia"
"freia???"
"heimdall"
"heimdall???"
] {
user = "elitherl"; user = "elitherl";
hostname = "freia020.hpc.l";
compression = true; compression = true;
localForwards = [{
bind.port = 6702;
host = {
address = "127.0.0.1";
port = 6702;
};
}];
}; };
"git*".user = "git";
}; };
}; };
starship = { starship = {

View file

@ -67,11 +67,7 @@
+workspaces-switch-project-function 'doom-project-browse +workspaces-switch-project-function 'doom-project-browse
+workspaces-on-switch-project-behavior t)) +workspaces-on-switch-project-behavior t))
(after! magit (after! magit (setq magit-clone-default-directory "~/Projects/"))
(require 'magit-delta)
(setq magit-clone-default-directory "~/Projects/")
(after! magit-delta
(add-hook 'magit-mode-hook (lambda () (magit-delta-mode +1)))))
;; mail settings ;; mail settings
(after! mu4e (after! mu4e

View file

@ -3,5 +3,3 @@
(package! pdf-tools :built-in 'prefer) (package! pdf-tools :built-in 'prefer)
(package! pocket-reader) (package! pocket-reader)
(package! magit-delta)
(package! yuck-mode)