From f8b16de5061e0b178356a598fccffe127dd0ca51 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Tue, 18 Jul 2023 23:29:53 +0200
Subject: move syncthing out of common; add icewm bg color

---
 nixpkgs/common.nix   |  8 +-------
 nixpkgs/kusanagi.nix |  7 +++++++
 nixpkgs/lindy.nix    |  7 +++++++
 nixpkgs/zinzin.nix   | 13 ++++++++++++-
 4 files changed, 27 insertions(+), 8 deletions(-)
 mode change 120000 => 100644 nixpkgs/zinzin.nix

(limited to 'nixpkgs')

diff --git a/nixpkgs/common.nix b/nixpkgs/common.nix
index 92b1fe0..d652db4 100644
--- a/nixpkgs/common.nix
+++ b/nixpkgs/common.nix
@@ -20,11 +20,6 @@
       export PATH=$HOME/.cargo/bin:$PATH
     '';
   };
-  programs.keychain = {
-    enable = true;
-    enableBashIntegration = true;
-    keys = [ "~/.ssh/id_ed25519" ];
-  };
   programs.vim = {
     enable = true;
     extraConfig = (builtins.readFile ../vim/vimrc);
@@ -50,6 +45,7 @@
     ".config/tmux/tmux.conf".source = ../tmux/tmux.conf;
     ".config/sx/sxrc".executable = true;
     ".config/sx/sxrc".text = ''
+      ${pkgs.xorg.xsetroot}/bin/xsetroot -solid "#008080"
       ${pkgs.xorg.xkbcomp}/bin/xkbcomp ${../xkb/symbols/custom-fr} $DISPLAY
       nm-applet &
       icewm-session
@@ -83,8 +79,6 @@
     videos = null;
   };
 
-  services.syncthing.enable = true;
-
   nixpkgs.config.allowUnfree = true;
 
   home.stateVersion = "22.11";
diff --git a/nixpkgs/kusanagi.nix b/nixpkgs/kusanagi.nix
index 2eb8900..4d605c1 100644
--- a/nixpkgs/kusanagi.nix
+++ b/nixpkgs/kusanagi.nix
@@ -8,5 +8,12 @@
   services.gpg-agent.enableSshSupport = false;
   services.gpg-agent.pinentryFlavor = "qt";
   services.gpg-agent.extraConfig = "no-allow-external-cache";
+
+  programs.keychain = {
+    enable = true;
+    enableBashIntegration = true;
+    keys = [ "~/.ssh/id_ed25519" ];
+  };
+  services.syncthing.enable = true;
 }
 
diff --git a/nixpkgs/lindy.nix b/nixpkgs/lindy.nix
index 1dbc65f..dc24dae 100644
--- a/nixpkgs/lindy.nix
+++ b/nixpkgs/lindy.nix
@@ -3,5 +3,12 @@
 
   home.homeDirectory = "/home/lx.nix";
   xdg.userDirs.download = "/home/lx.nix/Downloads";
+
+  programs.keychain = {
+    enable = true;
+    enableBashIntegration = true;
+    keys = [ "~/.ssh/id_ed25519" ];
+  };
+  services.syncthing.enable = true;
 }
 
diff --git a/nixpkgs/zinzin.nix b/nixpkgs/zinzin.nix
deleted file mode 120000
index 4d5015a..0000000
--- a/nixpkgs/zinzin.nix
+++ /dev/null
@@ -1 +0,0 @@
-kusanagi.nix
\ No newline at end of file
diff --git a/nixpkgs/zinzin.nix b/nixpkgs/zinzin.nix
new file mode 100644
index 0000000..2eb8900
--- /dev/null
+++ b/nixpkgs/zinzin.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }: {
+  imports = [ ./common.nix ];
+
+  home.homeDirectory = "/home/lx";
+  xdg.userDirs.download = "/home/lx/Downloads";
+
+  services.gpg-agent.enable = true;
+  services.gpg-agent.enableSshSupport = false;
+  services.gpg-agent.pinentryFlavor = "qt";
+  services.gpg-agent.extraConfig = "no-allow-external-cache";
+}
+
-- 
cgit v1.2.3