From 3a9ffe5eab956e4522603421423de615ad27f160 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Mon, 8 Apr 2024 20:25:31 +0200
Subject: add ergol

---
 nixpkgs/kusanagi.nix |  5 ++++-
 nixpkgs/wayfire.nix  | 19 -------------------
 nixpkgs/wmonly.nix   | 14 ++++++++++++++
 3 files changed, 18 insertions(+), 20 deletions(-)
 delete mode 100644 nixpkgs/wayfire.nix

(limited to 'nixpkgs')

diff --git a/nixpkgs/kusanagi.nix b/nixpkgs/kusanagi.nix
index 19b367d..03a3bf7 100644
--- a/nixpkgs/kusanagi.nix
+++ b/nixpkgs/kusanagi.nix
@@ -6,7 +6,7 @@ let
     sha256 = "sha256:1dizlmwzl6319s9cfbd770ydlj0kf0k3yz5rzw4xni8lnh691hx7";
   };
 in {
-  imports = [ ./common.nix ./wayfire.nix ];
+  imports = [ ./common.nix ./wmonly.nix ];
 
   programs.bash.profileExtra = ''
     function mklink {
@@ -37,6 +37,9 @@ in {
     mklink /Z/lx/app/element ~/.config/Element
     mklink /Z/lx/app/dino ~/.local/share/dino
     mklink /Z/lx/app/signal ~/.config/Signal
+
+    mkdir -p ~/.xkb
+    mklink /etc/X11/xkb/symbols ~/.xkb/symbols
   '';
 
   programs.bash.shellAliases.z = "cd /Z/lx";
diff --git a/nixpkgs/wayfire.nix b/nixpkgs/wayfire.nix
deleted file mode 100644
index b0e26b7..0000000
--- a/nixpkgs/wayfire.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ pkgs, ... }: {
-  imports = [ ./wmonly.nix ];
-
-  home.file = {
-    ".config/wayfire.ini".source = ../wayfire/wayfire.ini;
-
-    ".config/waybar/config".source = ../waybar/config;
-    ".config/waybar/style.css".source = ../waybar/style.css;
-
-    ".config/sway/config".source = ../sway/config;
-  };
-
-  xdg.mimeApps.defaultApplications = {
-    "application/pdf" = [ "org.gnome.Evince.desktop" ];
-    "image/jpeg" = [ "org.gnome.eog.desktop" ];
-    "image/png" = [ "org.gnome.eog.desktop" ];
-    "text/plain" = [ "org.gnome.gedit.desktop" ];
-  };
-}
diff --git a/nixpkgs/wmonly.nix b/nixpkgs/wmonly.nix
index fbc5324..ef08289 100644
--- a/nixpkgs/wmonly.nix
+++ b/nixpkgs/wmonly.nix
@@ -19,4 +19,18 @@
     GTK_IM_MODULE = "fcitx";
     QT_IM_MODULE = "fcitx";
   };
+
+  home.file = {
+    ".config/waybar/config".source = ../waybar/config;
+    ".config/waybar/style.css".source = ../waybar/style.css;
+    ".config/sway/config".source = ../sway/config;
+    ".config/wayfire.ini".source = ../wayfire/wayfire.ini;
+  };
+
+  xdg.mimeApps.defaultApplications = {
+    "application/pdf" = [ "org.gnome.Evince.desktop" ];
+    "image/jpeg" = [ "org.gnome.eog.desktop" ];
+    "image/png" = [ "org.gnome.eog.desktop" ];
+    "text/plain" = [ "org.gnome.gedit.desktop" ];
+  };
 }
-- 
cgit v1.2.3