diff options
| -rw-r--r-- | nixpkgs/common.nix | 8 | ||||
| -rw-r--r-- | nixpkgs/kusanagi.nix | 7 | ||||
| -rw-r--r-- | nixpkgs/lindy.nix | 7 | ||||
| -rw-r--r--[l---------] | nixpkgs/zinzin.nix | 13 |
4 files changed, 27 insertions, 8 deletions
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 index 4d5015a..2eb8900 120000..100644 --- a/nixpkgs/zinzin.nix +++ b/nixpkgs/zinzin.nix @@ -1 +1,12 @@ -kusanagi.nix
\ No newline at end of file +{ 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"; +} + |