Xetibo/DashNix
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

onedrive: init #18

Merged
DashieTM merged 3 commits from main into main 2025-05-10 14:03:52 +02:00
Conversation 0 Commits 3 Files changed 6 +26 -38
3 changed files with 26 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 11a41563c8 - Show all commits

46
base/xkb_layout.nix
View file

@ -1,23 +1,23 @@
{ {
mkDashDefault, mkDashDefault,
pkgs, pkgs,
... ...
}: let }: let
layout = pkgs.writeText "dashie" '' layout = pkgs.writeText "enIntUmlaut" ''
xkb_symbols "dashie" xkb_symbols "enIntUmlaut"
{ {
include "us(basic)" include "us(basic)"
include "level3(ralt_switch)" include "level3(ralt_switch)"
key <AC01> { [ a, A, adiaeresis, Adiaeresis ] }; key <AC01> { [ a, A, adiaeresis, Adiaeresis ] };
key <AD09> { [ o, O, odiaeresis, Odiaeresis ] }; key <AD09> { [ o, O, odiaeresis, Odiaeresis ] };
key <AD07> { [ u, U, udiaeresis, Udiaeresis ] }; key <AD07> { [ u, U, udiaeresis, Udiaeresis ] };
}; };
''; '';
in { in {
environment.systemPackages = mkDashDefault [pkgs.xorg.xkbcomp]; environment.systemPackages = mkDashDefault [pkgs.xorg.xkbcomp];
services.xserver.xkb.extraLayouts.dashie = { services.xserver.xkb.extraLayouts.enIntUmlaut = {
description = "US layout with 'umlaut'"; description = "US layout with 'umlaut'";
languages = ["eng"]; languages = ["eng"];
symbolsFile = "${layout}"; symbolsFile = "${layout}";
}; };
} }

16
modules/programs/git.nix
View file

@ -34,27 +34,15 @@
description = "Additional git config"; description = "Additional git config";
}; };
sshConfig = lib.mkOption { sshConfig = lib.mkOption {
default = '' default = "";
example = ''
Host github.com Host github.com
${ ${
if (config ? sops.secrets && config.sops.secrets ? hub.path) if (config ? sops.secrets && config.sops.secrets ? hub.path)
then "IdentityFile ${config.sops.secrets.hub.path}" then "IdentityFile ${config.sops.secrets.hub.path}"
else "" else ""
} }
Host gitlab.com
${
if (config ? sops.secrets && config.sops.secrets ? lab.path)
then "IdentityFile ${config.sops.secrets.lab.path}"
else ""
}
Host dashie.org
${
if (config ? sops.secrets && config.sops.secrets ? dashie.path)
then "IdentityFile ${config.sops.secrets.dashie.path}"
else ""
}
''; '';
example = "";
type = lib.types.lines; type = lib.types.lines;
description = "ssh configuration (keys for git)"; description = "ssh configuration (keys for git)";
}; };

2
modules/programs/xkb.nix
View file

@ -6,7 +6,7 @@
}: { }: {
options.mods.xkb = { options.mods.xkb = {
layout = lib.mkOption { layout = lib.mkOption {
default = "dashie"; default = "enIntUmlaut";
example = "us"; example = "us";
type = lib.types.str; type = lib.types.str;
description = "Your layout"; description = "Your layout";