From 3c735e9483f35fe1c1373357facf879e5d449fb2 Mon Sep 17 00:00:00 2001
From: Franck Cuny <franck@fcuny.net>
Date: Tue, 8 Feb 2022 17:04:52 -0800
Subject: i3: move configuration to home-manager

---
 modules/desktop/default.nix  |  1 -
 modules/desktop/i3.nix       | 19 -------------------
 modules/desktop/xserver.nix  | 19 -------------------
 users/fcuny/home-manager.nix |  4 ++++
 users/fcuny/i3.nix           | 37 +++++++++++++++++++++++++++++++++++++
 5 files changed, 41 insertions(+), 39 deletions(-)
 delete mode 100644 modules/desktop/i3.nix
 delete mode 100644 modules/desktop/xserver.nix
 create mode 100644 users/fcuny/i3.nix

diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index 5cd6fbd..b2d2101 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -1,7 +1,6 @@
 {lib, config, pkgs, ...}:
 {
   imports = [
-    ./xserver.nix
     ./fonts.nix
     ./sound.nix
   ];
diff --git a/modules/desktop/i3.nix b/modules/desktop/i3.nix
deleted file mode 100644
index aecbf63..0000000
--- a/modules/desktop/i3.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  services.xserver.windowManager = {
-    i3.enable = true;
-  };
-
-  programs.rofi = {
-    enable = true;
-    theme = "purple";
-
-    extraConfig = {
-      modi = "drun";
-      show-icons = true;
-      icon-theme = "Numix-Square";
-      combi-modi = "window,drun,ssh";
-    };
-  };
-}
diff --git a/modules/desktop/xserver.nix b/modules/desktop/xserver.nix
deleted file mode 100644
index a26dc56..0000000
--- a/modules/desktop/xserver.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ pkgs, config, lib, ... }:
-
-{
-  # Enable the X11 windowing system.
-  services.xserver = {
-    enable = true;
-    layout = "us";
-    xkbOptions = "eurosign:e";
-
-    desktopManager = {
-      xterm.enable = false;
-    };
-
-    displayManager = {
-      defaultSession = "none+i3";
-      lightdm.enable = true;
-    };
-  };
-}
diff --git a/users/fcuny/home-manager.nix b/users/fcuny/home-manager.nix
index e210cc6..95c1820 100644
--- a/users/fcuny/home-manager.nix
+++ b/users/fcuny/home-manager.nix
@@ -3,6 +3,10 @@
 {
   xdg.enable = true;
 
+  imports = [
+    ./i3.nix
+  ];
+
   home.packages = [
     pkgs.jq
     pkgs.ripgrep
diff --git a/users/fcuny/i3.nix b/users/fcuny/i3.nix
new file mode 100644
index 0000000..3e1a626
--- /dev/null
+++ b/users/fcuny/i3.nix
@@ -0,0 +1,37 @@
+{ config, pkgs, lib, ... }:
+
+{
+  services.xserver = {
+    enable = true;
+    layout = "us";
+    xkbOptions = "eurosign:e";
+    libinput.enable = true;
+
+    desktopManager = {
+      xterm.enable = false;
+    };
+
+    displayManager = {
+      lightdm.enable = true;
+    };
+
+    windowManager = {
+      i3.enable = true;
+    };
+  };
+
+  programs.rofi = {
+    enable = true;
+    theme = "purple";
+
+    extraConfig = {
+      modi = "drun";
+      show-icons = true;
+      icon-theme = "Numix-Square";
+      combi-modi = "window,drun,ssh";
+    };
+  };
+
+  services.gnome.gnome-keyring.enable = true;
+  services.gvfs.enable = true;
+}
-- 
cgit 1.4.1