add ergol

6 files changed, 63 insertions, 42 deletions

diff --git a/nixos/common.nix b/nixos/common.nix
index 69cde9c..324de81 100644
--- a/nixos/common.nix
+++ b/nixos/common.nix
@@ -49,12 +49,24 @@
   services.xserver.enable = true;
 
   # Configure keymap in X11
-  services.xserver.layout = "fr-custom-lx";
+  services.xserver.layout = "fr-custom-lx,ergol-lx";
   services.xserver.xkbOptions = "terminate:ctrl_alt_bksp,caps:escape";
-  services.xserver.extraLayouts."fr-custom-lx" = {
-    description = "French (LX custom azerty)";
-    languages = ["fre"];
-    symbolsFile = ../xkb/symbols/fr-custom-lx;
+  services.xserver.extraLayouts = {
+    "fr-custom-lx" = {
+      description = "French (LX custom azerty)";
+      languages = ["fre"];
+      symbolsFile = ../xkb/symbols/fr-custom-lx;
+    };
+    "ergol" = {
+      description = "Ergol";
+      languages = ["fre"];
+      symbolsFile = ../xkb/symbols/ergol-07;
+    };
+    "ergol-lx" = {
+      description = "Ergol LX";
+      languages = ["fre"];
+      symbolsFile = ../xkb/symbols/ergol-07-lx;
+    };
   };
 
   # Input method for japanese
diff --git a/nixos/kusanagi.nix b/nixos/kusanagi.nix
index 88e3b66..34a886c 100644
--- a/nixos/kusanagi.nix
+++ b/nixos/kusanagi.nix
@@ -20,6 +20,7 @@ in
     [
       (modulesPath + "/installer/scan/not-detected.nix")
       ./common.nix
+      ./sway.nix
       ./wayfire.nix
       ./local.nix
       (import "${home-manager}/nixos")
diff --git a/nixos/lindy.nix b/nixos/lindy.nix
index e6e8e2c..279a79c 100644
--- a/nixos/lindy.nix
+++ b/nixos/lindy.nix
@@ -8,7 +8,7 @@
     #./95theme.nix
     #./gnome.nix
     #./fdn-vpn.nix
-    ./wayfire.nix
+    ./sway.nix
   ];
 
   networking.hostName = "lindy";
diff --git a/nixos/sway.nix b/nixos/sway.nix
new file mode 100644
index 0000000..73050f5
--- /dev/null
+++ b/nixos/sway.nix
@@ -0,0 +1,32 @@
+{ config, lib, pkgs, modulesPath, ... }:
+{
+  imports = [
+    ./wmonly.nix
+  ];
+
+  programs.sway = {
+    enable = true;
+    #package = pkgs.swayfx;
+    wrapperFeatures.gtk = true;
+    wrapperFeatures.base = true;
+    extraPackages = with pkgs; [
+      glib
+    ];
+  };
+
+  security.pam.services.swaylock = {};
+
+  environment.systemPackages = with pkgs; [
+    swaybg
+    bemenu
+    swayimg
+
+    xdg-desktop-portal-wlr
+    waybar
+    alacritty
+    swaylock
+    wdisplays
+    grim
+    cage
+  ];
+}
diff --git a/nixos/wayfire.nix b/nixos/wayfire.nix
index 2feeefd..05c3fbd 100644
--- a/nixos/wayfire.nix
+++ b/nixos/wayfire.nix
@@ -1,46 +1,14 @@
+
 { config, lib, pkgs, modulesPath, ... }:
 {
   imports = [
     ./wmonly.nix
   ];
 
-  services.xserver.displayManager.sx.enable = true;
-
-  security.pam.services.swaylock = {};
-
-  programs.sway = {
-    enable = true;
-    #package = pkgs.swayfx;
-    wrapperFeatures.gtk = true;
-    wrapperFeatures.base = true;
-    extraPackages = with pkgs; [
-      glib
-    ];
-  };
-  qt = {
-    enable = true;
-    platformTheme = "gnome";
-    style = "adwaita";
-  };
-
   environment.systemPackages = with pkgs; [
     # ---- wayfire ----
-    #wayfire-with-plugins
-    #wayfirePlugins.wcm
-    #wayfirePlugins.wf-shell
-
-    # ---- sway ----
-    #swayfx
-    swaybg
-    bemenu
-    swayimg
-
-    # ---- common utils ----
-    xdg-desktop-portal-wlr
-    waybar
-    alacritty
-    swaylock
-    wdisplays
-    grim
+    wayfire-with-plugins
+    wayfirePlugins.wcm
+    wayfirePlugins.wf-shell
   ];
 }
diff --git a/nixos/wmonly.nix b/nixos/wmonly.nix
index 2f1b2f1..42c9300 100644
--- a/nixos/wmonly.nix
+++ b/nixos/wmonly.nix
@@ -1,5 +1,13 @@
 { config, lib, pkgs, modulesPath, ... }:
 {
+  services.xserver.displayManager.sx.enable = true;
+
+  qt = {
+    enable = true;
+    platformTheme = "gnome";
+    style = "adwaita";
+  };
+
   services.udisks2.enable = true;
   services.gvfs.enable = true;