diff options
author | lassulus <lass@blue.r> | 2018-08-09 17:23:53 +0200 |
---|---|---|
committer | lassulus <lass@blue.r> | 2018-08-09 17:23:53 +0200 |
commit | 2bf24eae616997e52a16fff96b4485ee7c619f8d (patch) | |
tree | cbb3aab9f8fa2f4da28e5a01b16129263b1fa0cb /makefu/2configs/tools | |
parent | f9d96d13de74ed6acbde92778af88f94f04081bd (diff) | |
parent | 6368507f02eb4e267c7fdab73e4c3cec5ee5827f (diff) |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/2configs/tools')
-rw-r--r-- | makefu/2configs/tools/core-gui.nix | 4 | ||||
-rw-r--r-- | makefu/2configs/tools/desktop.nix | 2 | ||||
-rw-r--r-- | makefu/2configs/tools/extra-gui.nix | 2 | ||||
-rw-r--r-- | makefu/2configs/tools/media.nix | 2 | ||||
-rw-r--r-- | makefu/2configs/tools/sec.nix | 2 |
5 files changed, 7 insertions, 5 deletions
diff --git a/makefu/2configs/tools/core-gui.nix b/makefu/2configs/tools/core-gui.nix index 898bae10d..1e85da53c 100644 --- a/makefu/2configs/tools/core-gui.nix +++ b/makefu/2configs/tools/core-gui.nix @@ -1,10 +1,10 @@ { pkgs, ... }: { - krebs.per-user.makefu.packages = with pkgs; [ + users.users.makefu.packages = with pkgs; [ chromium - clipit feh + clipit firefox keepassx pcmanfm diff --git a/makefu/2configs/tools/desktop.nix b/makefu/2configs/tools/desktop.nix index 1fe03e111..bb14c3eb5 100644 --- a/makefu/2configs/tools/desktop.nix +++ b/makefu/2configs/tools/desktop.nix @@ -4,8 +4,10 @@ users.users.makefu.packages = with pkgs; [ taskwarrior pass + gopass mutt weechat tmux ]; + } diff --git a/makefu/2configs/tools/extra-gui.nix b/makefu/2configs/tools/extra-gui.nix index e25290297..ae97edd54 100644 --- a/makefu/2configs/tools/extra-gui.nix +++ b/makefu/2configs/tools/extra-gui.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { - krebs.per-user.makefu.packages = with pkgs;[ + users.users.makefu.packages = with pkgs;[ # media gimp inkscape diff --git a/makefu/2configs/tools/media.nix b/makefu/2configs/tools/media.nix index 4de2b545e..35faaa29f 100644 --- a/makefu/2configs/tools/media.nix +++ b/makefu/2configs/tools/media.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { - krebs.per-user.makefu.packages = with pkgs; [ + users.users.makefu.packages = with pkgs; [ kodi streamripper youtube-dl diff --git a/makefu/2configs/tools/sec.nix b/makefu/2configs/tools/sec.nix index 3dc02937d..17a980ef7 100644 --- a/makefu/2configs/tools/sec.nix +++ b/makefu/2configs/tools/sec.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { - krebs.per-user.makefu.packages = with pkgs; [ + users.users.makefu.packages = with pkgs; [ aria2 # mitmproxy pythonPackages.binwalk-full |