Distuingish between configurations and program modifications

This commit is contained in:
Charlotte Van Petegem 2020-05-03 17:40:09 +02:00
parent 964b294300
commit 1afb00a3de
27 changed files with 48 additions and 44 deletions

View file

@ -3,12 +3,12 @@
{
imports = [
./secret.nix
../../programs/direnv/default.nix
../../programs/git/default.nix
../../programs/neovim/default.nix
../../programs/ssh/default.nix
../../programs/tmux/default.nix
../../programs/zsh/default.nix
../../configurations/direnv/default.nix
../../configurations/git/default.nix
../../configurations/neovim/default.nix
../../configurations/ssh/default.nix
../../configurations/tmux/default.nix
../../configurations/zsh/default.nix
];
# Use latest kernel
@ -44,23 +44,8 @@
htop
inotify-tools
ncdu
(
symlinkJoin {
name = "openssh";
paths = [
(
pkgs.writeScriptBin "ssh" ''
#!${zsh}/bin/zsh
export TERM=xterm-256color
${openssh}/bin/ssh $@
''
)
openssh
];
}
)
(import ../../programs/pass/default.nix { inherit pkgs; })
(import ../../programs/ssh/default.nix { inherit pkgs; })
ripgrep
unzip
];

View file

@ -3,11 +3,11 @@
{
imports = [
./secret.nix
../../programs/dropbox/default.nix
../../programs/i3/default.nix
../../programs/kitty/default.nix
../../programs/syncthing/default.nix
../../programs/sway/default.nix
../../configurations/dropbox/default.nix
../../configurations/i3/default.nix
../../configurations/kitty/default.nix
../../configurations/syncthing/default.nix
../../configurations/sway/default.nix
];
services.pcscd = {
@ -71,8 +71,8 @@
citrix_workspace
deluge
(import ../../programs/firefox/default.nix { inherit pkgs; })
(import ../../programs/gnupg/default.nix { inherit pkgs; })
google-chrome
(gnupg.override { guiSupport = true; })
hledger
joplin-desktop
libreoffice