aboutsummaryrefslogtreecommitdiff
path: root/configuration.nix
diff options
context:
space:
mode:
Diffstat (limited to 'configuration.nix')
-rw-r--r--configuration.nix26
1 files changed, 14 insertions, 12 deletions
diff --git a/configuration.nix b/configuration.nix
index 9696c5d..d6e9a26 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -4,11 +4,13 @@
{ config, pkgs, ... }:
-{
- imports =
- [ # Include the results of the hardware scan.
- ./hardware-configuration.nix
- ];
+let
+ apps = (import ./packages/sensible-apps/sensible-apps.nix).apps;
+ sensible-apps = pkgs.callPackage ./packages/sensible-apps/pkg.nix {};
+in {
+ imports = [
+ ./hardware-configuration.nix
+ ];
nixpkgs.config = {
allowUnfree = true;
@@ -26,9 +28,11 @@
# Global
environment.variables = {
- EDITOR = "nvim";
- SHELL = "zsh";
- VISUAL = "nvim";
+ EDITOR = apps.EDITOR;
+ VISUAL = apps.EDITOR;
+ TERMINAL = apps.TERMINAL;
+ BROWSER = apps.BROWSER;
+ PRIVATE_BROWSER = apps.PRIVATE_BROWSER;
};
environment.shells = [ pkgs.zsh pkgs.bashInteractive ];
@@ -128,6 +132,8 @@
feh
ffmpeg-full
+ sensible-apps
+
pass
alsaUtils
unzip
@@ -139,15 +145,11 @@
pciutils
];
- # Some programs need SUID wrappers, can be configured further or are
- # started in user sessions.
- # programs.mtr.enable = true;
programs.gnupg.agent = {
enable = true;
enableSSHSupport = false;
};
-
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. It‘s perfectly fine and recommended to leave