summaryrefslogtreecommitdiff
path: root/nix-home-config
diff options
context:
space:
mode:
authorKjetil Orbekk <kjetil.orbekk@gmail.com>2020-02-25 20:00:32 -0500
committerKjetil Orbekk <kjetil.orbekk@gmail.com>2020-02-25 20:00:32 -0500
commitaa90d361401d9f5eb57e5d5ff0e9941a5b4ef7fa (patch)
tree7bd0988b5e51b2d4bf0709a6ca5bf3f5d6b7f51b /nix-home-config
parent40cc866243ef8fc731dad55c3db9d1a62db7c109 (diff)
Add nonfree firefox
Diffstat (limited to 'nix-home-config')
-rw-r--r--nix-home-config/aji.nix1
-rw-r--r--nix-home-config/desktop.nix17
-rw-r--r--nix-home-config/my-env.nix7
-rw-r--r--nix-home-config/pincer.nix1
4 files changed, 19 insertions, 7 deletions
diff --git a/nix-home-config/aji.nix b/nix-home-config/aji.nix
index 207f681..6142064 100644
--- a/nix-home-config/aji.nix
+++ b/nix-home-config/aji.nix
@@ -3,6 +3,7 @@
{
imports = [
./my-env.nix
+ ./desktop.nix
./synergy-server.nix
# ./synergy-client.nix
];
diff --git a/nix-home-config/desktop.nix b/nix-home-config/desktop.nix
new file mode 100644
index 0000000..41dfe79
--- /dev/null
+++ b/nix-home-config/desktop.nix
@@ -0,0 +1,17 @@
+{ config, pkgs, ... }:
+
+{
+ home.packages = with pkgs; [
+ iw
+ wirelesstools
+ hledger
+ hledger-ui
+ ledger
+ signal-desktop
+ nix-index
+ ffmpeg
+ vlc
+ synergy
+ firefox-bin
+ ];
+}
diff --git a/nix-home-config/my-env.nix b/nix-home-config/my-env.nix
index 667b597..93a1a43 100644
--- a/nix-home-config/my-env.nix
+++ b/nix-home-config/my-env.nix
@@ -16,8 +16,6 @@
home.packages = with pkgs; [
direnv
htop
- iw
- wirelesstools
(rWrapper.override {
packages = with rPackages; [
data_table
@@ -29,14 +27,9 @@
})
emacs
hledger
- hledger-ui
ledger
bwm_ng
- signal-desktop
nix-index
- ffmpeg
- vlc
rustup
- synergy
];
}
diff --git a/nix-home-config/pincer.nix b/nix-home-config/pincer.nix
index 9e52bdb..34f2d9e 100644
--- a/nix-home-config/pincer.nix
+++ b/nix-home-config/pincer.nix
@@ -3,6 +3,7 @@
{
imports = [
./my-env.nix
+ ./desktop.nix
./synergy-client.nix
];