Merge pull request #472 from staticdev/feature/keyboard-conf

Feature/keyboard conf

Author: staticdev

README.md

@@ -52,23 +52,7 @@ Note: this is an opinionated setup I personally use for software development on
 
 ### Included Applications / Configuration (Default)
 
-Packages (installed with apt):
-
-```yaml
-- apache2-utils
-- cmake
-- dconf-editor # visual gnome configs
-- gir1.2-clutter-1.0 # dep gnome extension system monitor
-- gir1.2-clutter-gst-3.0 # dep gnome extension system monitor
-- gir1.2-gtkclutter-1.0 # dep gnome extension system monitor
-- git
-- locales-all
-- openssl
-- podman
-- poedit
-```
-
-It also installs with [Nix] package manager:
+It installs packages with [Nix] package manager:
 
 ```yaml
 - kubectl
@@ -93,13 +77,6 @@ Not everyone's workstation and preferred software configuration is the same.
 
 You can override any of the defaults configured in **default.config.yml** by creating a **config.yml** file and setting the overrides in that file.
 
-The first thing one can customize is the list of installed packages with apt (Debian's package manager):
-
-```yaml
-installed_packages:
-  - go
-```
-
 To have you own dotfiles, just fork the [dotfiles eg. repo] and change the url of `dotfiles_repo` or just change `configure_dotfiles` to false if you do not want it.
 
 For [Nix] packages, update your [Home Manager] config on your dotfiles repo.

default.config.yml

@@ -1,55 +1,12 @@
 ---
-# Install packages
-install_packages: true
-installed_packages:
-  - apache2-utils
-  - cmake
-  - dconf-editor  # visual gnome configs
-  - gir1.2-clutter-1.0  # dep gnome extension system monitor
-  - gir1.2-clutter-gst-3.0  # dep gnome extension system monitor
-  - gir1.2-gtkclutter-1.0  # dep gnome extension system monitor
-  - git
-  - locales-all
-  - openssl
-  - podman  # see https://github.com/NixOS/nixpkgs/issues/138423
-  - poedit
-
-nix_packages:
-  - name: kubectl
-    check_cmd: kubectl version --client
-  - name: helm
-    check_cmd: helm --version
-  - name: k9s
-    check_cmd: k9s version
-  - name: htop
-    check_cmd: htop --version
-  - name: nmap
-    check_cmd: nmap --version
-  - name: thefuck
-    check_cmd: thefuck --version
-  - name: tmux
-    check_cmd: tmux -V
-  - name: vagrant
-    check_cmd: vagrant --version
-  - name: wget
-    check_cmd: wget --version
-  - name: xclip
-    check_cmd: xclip -version
-
-# Dotfiles (requires git on installed_packages)
+# Dotfiles (requires git enabled on nixpkgs)
 configure_dotfiles: true
 dotfiles_repo: "https://github.com/staticdev/dotfiles-eg.git"
 dotfiles_repo_version: main
 dotfiles_files:
   - .tmux.conf
   - .zshrc
 
-# Keyboard config
-configure_keyboard: false
-keyboard_layout: us
-keyboard_variant: intl
-keyboard_c_cedilla: false
-
 # SSH config
 configure_ssh: true
 ssh_key_type: ed25519  # you can also choose between: dsa, ecdsa and ed25519

eg/local.nix

@@ -96,8 +96,9 @@
     autosuggestions.enable = true;
     syntaxHighlighting.enable = true;
     shellAliases = {
+      editflake = "sudo nvim /etc/nixos/flake.nix";
+      editlocal = "sudo nvim /etc/nixos/local.nix";
       gc = "nix store gc";
-      localedit = "sudo vim /etc/nixos/local.nix";
       nixup = "sudo nix flake update --flake /etc/nixos && sudo nixos-rebuild switch";
     };
     shellInit = ''

flake.lock

@@ -78,10 +78,6 @@
       ansible.builtin.import_tasks: tasks/gnome-setup.yml
       when: gnome_setup
 
-    - name: Configure keyboard
-      ansible.builtin.import_tasks: tasks/keyboard.yml
-      when: configure_keyboard
-
     - name: Configure terminal
       ansible.builtin.include_tasks: tasks/terminal.yml
       when: configure_terminal

main.yml

@@ -10,6 +10,36 @@
       description = "The git configs for commits: userName and email";
     };
 
+    keyboardCCedilla = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = "Whether to enable cedilla support via GTK/QT IM modules.";
+    };
+    keyboardLayout = lib.mkOption {
+      type = with lib.types; listOf (submodule {
+        options = {
+          layout = lib.mkOption {
+            type = str;
+            description = "Keyboard layout, e.g. 'us'";
+            example = "us";
+          };
+
+          variant = lib.mkOption {
+            type = nullOr str;
+            default = null;
+            description = "Optional keyboard variant, e.g. 'intl'";
+            example = "intl";
+          };
+        };
+      });
+      default = [];
+      description = "List of keyboard layout and optional variant tuples.";
+      example = [
+        { layout = "us"; variant = "intl"; }
+        { layout = "de"; variant = null; }
+      ];
+    };
+
     mainUser = lib.mkOption {
       type = with lib.types; attrsOf (oneOf [str (listOf package)]);
       default = {

modules/sysconf.nix

@@ -2,8 +2,11 @@
 # your system. Help is available in the configuration.nix(5) man page, on
 # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
 
-{ stateVersion, config, pkgs, ... }:
+{ lib, stateVersion, config, pkgs, ... }:
 
+let
+  sysConf = config.environment.sysConf;
+in
 {
   imports = [ (import ./users.nix) ];
 
@@ -79,14 +82,20 @@
     enableDefaultPackages = true;
   };
 
+  # Add variables for C-Cedilha if on sysConf
+  environment.variables = lib.mkIf sysConf.keyboardCCedilla {
+    GTK_IM_MODULE = "cedilla";
+    QT_IM_MODULE = "cedilla";
+  };
   # List packages installed in system profile. To search, run:
   # $ nix search wget
-  environment.systemPackages = config.environment.sysConf.systemWidePkgs;
+  environment.systemPackages = sysConf.systemWidePkgs;
 
   home-manager = {
     sharedModules = [ (import ./home.nix) ];
     extraSpecialArgs = {
       inherit stateVersion;
+      inherit sysConf;
     };
   };
 

src/base.nix

@@ -1,7 +1,14 @@
-{ stateVersion, ... }:
+{ lib, sysConf, stateVersion, ... }:
 
 # here we have system-wide configuration - for user configurations see: src/users.nix
 {
+  dconf.settings."org/gnome/desktop/input-sources".sources =
+    map (k:
+     lib.hm.gvariant.mkTuple [
+      "xkb" (k.layout + (if k.variant != null then "+" + k.variant else "")) 
+      ]
+    ) sysConf.keyboardLayout;
+
   home = {
     stateVersion = stateVersion;
   };