Compare commits
1 commit
8a80f673c5
...
92a891c1d2
| Author | SHA1 | Date | |
|---|---|---|---|
| 92a891c1d2 |
5 changed files with 20 additions and 24 deletions
|
|
@ -47,7 +47,7 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
logind.settings.Login.HandleLidSwitch = "suspend";
|
||||
logind.lidSwitch = "suspend";
|
||||
|
||||
printing = {
|
||||
enable = true;
|
||||
|
|
|
|||
35
home/git.nix
35
home/git.nix
|
|
@ -17,18 +17,19 @@ in {
|
|||
config = mkIf cfg.enable {
|
||||
programs.git = {
|
||||
enable = true;
|
||||
|
||||
delta = {
|
||||
enable = true;
|
||||
options = {
|
||||
syntax-theme = "Solarized (light)";
|
||||
};
|
||||
};
|
||||
lfs.enable = true;
|
||||
|
||||
settings = {
|
||||
user = {
|
||||
name = "Antoine Martin";
|
||||
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";
|
||||
};
|
||||
userEmail = "antoine@alarsyo.net";
|
||||
userName = "Antoine Martin";
|
||||
|
||||
extraConfig = {
|
||||
commit = {verbose = true;};
|
||||
core = {editor = "vim";};
|
||||
init = {defaultBranch = "main";};
|
||||
|
|
@ -37,6 +38,12 @@ in {
|
|||
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 = [
|
||||
{
|
||||
condition = "gitdir:~/work/lrde/";
|
||||
|
|
@ -57,13 +64,5 @@ in {
|
|||
"/.envrc"
|
||||
];
|
||||
};
|
||||
|
||||
programs.delta = {
|
||||
enable = true;
|
||||
enableGitIntegration = true;
|
||||
options = {
|
||||
syntax-theme = "Solarized (light)";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@ in {
|
|||
config = mkIf cfg.enable {
|
||||
programs.ssh = {
|
||||
enable = true;
|
||||
enableDefaultConfig = false;
|
||||
|
||||
matchBlocks = let
|
||||
addGPGAgentForwarding = hostConf:
|
||||
|
|
|
|||
|
|
@ -207,9 +207,9 @@ in {
|
|||
# FIXME: belongs elsewhere
|
||||
services = {
|
||||
logind = {
|
||||
lidSwitch = "suspend";
|
||||
lidSwitchExternalPower = "ignore";
|
||||
settings.Login = {
|
||||
HandleLidSwitch = "suspend";
|
||||
HandleLidSwitchExternalPower = "ignore";
|
||||
IdleAction = "suspend";
|
||||
IdleActionSec = "10min";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
inherit
|
||||
|
|
@ -48,7 +47,6 @@ in {
|
|||
services.transmission =
|
||||
{
|
||||
enable = true;
|
||||
package = pkgs.transmission_4;
|
||||
group = "media";
|
||||
|
||||
settings = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue