Compare commits

...

4 commits

5 changed files with 28 additions and 24 deletions

View file

@ -47,7 +47,7 @@ in {
}; };
}; };
logind.lidSwitch = "suspend"; logind.settings.Login.HandleLidSwitch = "suspend";
printing = { printing = {
enable = true; enable = true;

View file

@ -17,19 +17,18 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.git = { programs.git = {
enable = true; enable = true;
delta = {
enable = true;
options = {
syntax-theme = "Solarized (light)";
};
};
lfs.enable = true; lfs.enable = true;
userEmail = "antoine@alarsyo.net"; settings = {
userName = "Antoine Martin"; user = {
name = "Antoine Martin";
extraConfig = { email = "antoine@alarsyo.net";
};
alias = {
push-wip = "push -o ci.skip";
push-merge = "push -o merge_request.create -o merge_request.merge_when_pipeline_succeeds -o merge_request.remove_source_branch";
push-mr = "push -o merge_request.create -o merge_request.remove_source_branch";
};
commit = {verbose = true;}; commit = {verbose = true;};
core = {editor = "vim";}; core = {editor = "vim";};
init = {defaultBranch = "main";}; init = {defaultBranch = "main";};
@ -38,12 +37,6 @@ in {
maintenance.prefetch.enabled = false; maintenance.prefetch.enabled = false;
}; };
aliases = {
push-wip = "push -o ci.skip";
push-merge = "push -o merge_request.create -o merge_request.merge_when_pipeline_succeeds -o merge_request.remove_source_branch";
push-mr = "push -o merge_request.create -o merge_request.remove_source_branch";
};
includes = [ includes = [
{ {
condition = "gitdir:~/work/lrde/"; condition = "gitdir:~/work/lrde/";
@ -64,5 +57,13 @@ in {
"/.envrc" "/.envrc"
]; ];
}; };
programs.delta = {
enable = true;
enableGitIntegration = true;
options = {
syntax-theme = "Solarized (light)";
};
};
}; };
} }

View file

@ -18,6 +18,7 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.ssh = { programs.ssh = {
enable = true; enable = true;
enableDefaultConfig = false;
matchBlocks = let matchBlocks = let
addGPGAgentForwarding = hostConf: addGPGAgentForwarding = hostConf:

View file

@ -207,12 +207,12 @@ in {
# FIXME: belongs elsewhere # FIXME: belongs elsewhere
services = { services = {
logind = { logind = {
lidSwitch = "suspend"; settings.Login = {
lidSwitchExternalPower = "ignore"; HandleLidSwitch = "suspend";
extraConfig = '' HandleLidSwitchExternalPower = "ignore";
IdleAction=suspend IdleAction = "suspend";
IdleActionSec=10min IdleActionSec = "10min";
''; };
}; };
upower.enable = true; upower.enable = true;
}; };

View file

@ -1,6 +1,7 @@
{ {
config, config,
lib, lib,
pkgs,
... ...
}: let }: let
inherit inherit
@ -47,6 +48,7 @@ in {
services.transmission = services.transmission =
{ {
enable = true; enable = true;
package = pkgs.transmission_4;
group = "media"; group = "media";
settings = { settings = {