summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--accounts/gkleen@sif/default.nix6
-rw-r--r--hosts/eostre/default.nix5
-rw-r--r--system-profiles/default-locale.nix10
-rw-r--r--users/gkleen/default.nix8
4 files changed, 17 insertions, 12 deletions
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index fc64f2f2..0b0a9238 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -351,12 +351,6 @@ in {
351 extraProfileCommands = '' 351 extraProfileCommands = ''
352 export XDG_DATA_DIRS="${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}:${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}''${XDG_DATA_DIRS:+:''${XDG_DATA_DIRS}}" 352 export XDG_DATA_DIRS="${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}:${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}''${XDG_DATA_DIRS:+:''${XDG_DATA_DIRS}}"
353 ''; 353 '';
354
355 keyboard = {
356 layout = "us";
357 variant = "dvp";
358 options = [ "ctl:nocaps" "compose:caps" ];
359 };
360 }; 354 };
361 355
362 xdg.configFile = { 356 xdg.configFile = {
diff --git a/hosts/eostre/default.nix b/hosts/eostre/default.nix
index 92e4e41c..c8964d99 100644
--- a/hosts/eostre/default.nix
+++ b/hosts/eostre/default.nix
@@ -4,7 +4,7 @@ with lib;
4 4
5{ 5{
6 imports = with flake.nixosModules.systemProfiles; [ 6 imports = with flake.nixosModules.systemProfiles; [
7 nfsroot 7 default-locale nfsroot
8 ]; 8 ];
9 9
10 config = { 10 config = {
@@ -69,9 +69,8 @@ with lib;
69 system.stateVersion = "22.11"; 69 system.stateVersion = "22.11";
70 70
71 71
72 time.timeZone = "Europe/Berlin"; 72 console.keyMap = "us";
73 time.hardwareClockInLocalTime = true; 73 time.hardwareClockInLocalTime = true;
74 i18n.defaultLocale = "en_DK.UTF-8";
75 74
76 75
77 environment.systemPackages = with pkgs; [ cifs-utils ]; 76 environment.systemPackages = with pkgs; [ cifs-utils ];
diff --git a/system-profiles/default-locale.nix b/system-profiles/default-locale.nix
index 6915184a..6c95504b 100644
--- a/system-profiles/default-locale.nix
+++ b/system-profiles/default-locale.nix
@@ -3,8 +3,14 @@
3with lib; 3with lib;
4 4
5{ 5{
6 i18n.defaultLocale = "en_DK.UTF-8"; 6 i18n = {
7 console.keyMap = "dvorak-programmer"; 7 defaultLocale = "en_DK.UTF-8";
8 extraLocaleSettings = {
9 "TIME_STYLE" = "posix-long-iso";
10 };
11 supportedLocales = [ "C.UTF-8/UTF-8" "en_US.UTF-8/UTF-8" "en_DK.UTF-8/UTF-8" ];
12 };
13 console.keyMap = mkDefault "dvorak-programmer";
8 14
9 time.timeZone = mkDefault "Europe/Berlin"; 15 time.timeZone = mkDefault "Europe/Berlin";
10} 16}
diff --git a/users/gkleen/default.nix b/users/gkleen/default.nix
index 9ae2c1d0..f7de3924 100644
--- a/users/gkleen/default.nix
+++ b/users/gkleen/default.nix
@@ -3,7 +3,7 @@
3 imports = with flake.nixosModules.userProfiles.${userName}; [ 3 imports = with flake.nixosModules.userProfiles.${userName}; [
4 zsh tmux utils direnv 4 zsh tmux utils direnv
5 ]; 5 ];
6 6
7 users.users.${userName} = { 7 users.users.${userName} = {
8 description = "Gregor Kleen"; 8 description = "Gregor Kleen";
9 extraGroups = [ "wheel" "networkmanager" "lp" "dialout" "audio" "video" "xmpp" "mail" "ssh" "vboxusers" "libvirtd" "wireshark" "games" "webdav"]; 9 extraGroups = [ "wheel" "networkmanager" "lp" "dialout" "audio" "video" "xmpp" "mail" "ssh" "vboxusers" "libvirtd" "wireshark" "games" "webdav"];
@@ -16,6 +16,12 @@
16 }; 16 };
17 17
18 home-manager.users.${userName} = { 18 home-manager.users.${userName} = {
19 home.keyboard = {
20 layout = "us";
21 variant = "dvp";
22 options = [ "ctl:nocaps" "compose:caps" ];
23 };
24
19 programs = { 25 programs = {
20 git = { 26 git = {
21 enable = true; 27 enable = true;