felschr/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

style: format nix files

Browse source
This commit is contained in:
Felix Schröter 2020-09-23 13:19:19 +02:00
parent 22f6f8b323
commit 4d3bda09b9
No known key found for this signature in database
GPG key ID: 910ACB9F6BD26F58
19 changed files with 132 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

11
home/felschr-work.nix
View file

@ -1,7 +1,6 @@
{ config, pkgs, ... }:
with pkgs;
{
with pkgs; {
imports = [
./shell
./editors
@ -20,9 +19,7 @@ with pkgs;
longitude = "10.4021562";
};
programs.ssh = {
enable = true;
};
programs.ssh = { enable = true; };
services.gpg-agent = {
enable = true;
@ -35,9 +32,7 @@ with pkgs;
programs.gpg.enable = true;
programs.git = {
defaultProfile = "work";
};
programs.git = { defaultProfile = "work"; };
xdg.configFile."nixpkgs/config.nix".text = ''
{

8
home/felschr.nix
View file

@ -24,9 +24,7 @@
};
};
programs.ssh = {
enable = true;
};
programs.ssh = { enable = true; };
services.gpg-agent = {
enable = true;
@ -39,9 +37,7 @@
programs.gpg.enable = true;
programs.git = {
defaultProfile = "private";
};
programs.git = { defaultProfile = "private"; };
xdg.configFile."nixpkgs/config.nix".text = ''
{

36
home/git.nix
View file

@ -1,38 +1,30 @@
{ config, pkgs, ... }:
{
imports = [
./modules/git.nix
];
imports = [ ./modules/git.nix ];
programs.git = {
enable = true;
profiles = {
private = {
name = "Felix Tenley";
email = "dev@felschr.com";
name = "Felix Tenley";
email = "dev@felschr.com";
signingKey = "6AB3 7A28 5420 9A41 82D9 0068 910A CB9F 6BD2 6F58";
dirs = [ "~/dev/private/" "/etc/nixos" ];
dirs = [ "~/dev/private/" "/etc/nixos" ];
};
work = {
name = "Felix Schröter";
email = "fs@upsquared.com";
name = "Felix Schröter";
email = "fs@upsquared.com";
signingKey = "F28B FB74 4421 7580 5A49 2930 BE85 F0D9 987F A014";
dirs = [ "~/dev/work/" ];
dirs = [ "~/dev/work/" ];
};
};
ignores = [".direnv"];
signing = {
signByDefault = true;
};
ignores = [ ".direnv" ];
signing = { signByDefault = true; };
extraConfig = {
init = {
defaultBranch = "main";
};
pull = {
rebase = true;
};
init = { defaultBranch = "main"; };
pull = { rebase = true; };
rebase = {
autoStash = true;
autoSquash = true;
@ -41,8 +33,10 @@
};
};
aliases = {
mr = "!sh -c 'git fetch $1 merge-requests/$2/head:mr-$1-$2 && git checkout mr-$1-$2' -";
pr = "!sh -c 'git fetch $1 refs/pull/$2/head:pr/$1 && git checkout pr/$2'";
mr =
"!sh -c 'git fetch $1 merge-requests/$2/head:mr-$1-$2 && git checkout mr-$1-$2' -";
pr =
"!sh -c 'git fetch $1 refs/pull/$2/head:pr/$1 && git checkout pr/$2'";
};
};
}

6
home/keybase.nix
View file

@ -7,7 +7,7 @@
home.packages = [ pkgs.keybase-gui ];
xdg.configFile."autostart/keybase.desktop".text = with pkgs;
builtins.replaceStrings
["${keybase-gui}"] ["env KEYBASE_AUTOSTART=1 ${keybase-gui}"]
(builtins.readFile "${keybase-gui}/share/applications/keybase.desktop");
builtins.replaceStrings [ "${keybase-gui}" ]
[ "env KEYBASE_AUTOSTART=1 ${keybase-gui}" ]
(builtins.readFile "${keybase-gui}/share/applications/keybase.desktop");
}

7
home/planck.nix
View file

@ -1,8 +1,5 @@
{ config, pkgs, ... }:
with pkgs;
{
home.packages = [
wally-cli
];
with pkgs; {
home.packages = [ wally-cli ];
}

26
home/signal.nix
View file

@ -2,23 +2,21 @@
with pkgs;
let
signal-desktop = runCommand "signal-desktop" {
buildInputs = [ makeWrapper ];
} ''
mkdir $out
ln -s ${pkgs.signal-desktop}/* $out
rm $out/bin
makeWrapper ${pkgs.signal-desktop}/bin/signal-desktop $out/bin/signal-desktop \
--add-flags "--use-tray-icon"
'';
in
{
signal-desktop =
runCommand "signal-desktop" { buildInputs = [ makeWrapper ]; } ''
mkdir $out
ln -s ${pkgs.signal-desktop}/* $out
rm $out/bin
makeWrapper ${pkgs.signal-desktop}/bin/signal-desktop $out/bin/signal-desktop \
--add-flags "--use-tray-icon"
'';
in {
home.packages = [ signal-desktop ];
# TODO switch to overwritten `signal-desktop` when
# desktop file is updated with correct exec path
xdg.configFile."autostart/signal-desktop.desktop".text =
builtins.replaceStrings
["bin/signal-desktop"] ["bin/signal-desktop --start-in-tray"]
(builtins.readFile "${pkgs.signal-desktop}/share/applications/signal-desktop.desktop");
builtins.replaceStrings [ "bin/signal-desktop" ]
[ "bin/signal-desktop --start-in-tray" ] (builtins.readFile
"${pkgs.signal-desktop}/share/applications/signal-desktop.desktop");
}

7
home/vpn.nix
View file

@ -1,10 +1,7 @@
{ config, pkgs, ... }:
with pkgs;
{
home.packages = with pkgs; [
mullvad-vpn
];
with pkgs; {
home.packages = with pkgs; [ mullvad-vpn ];
# autostart
xdg.configFile."autostart/mullvad-vpn.desktop".source =