From 43586a11fb56e5d3555e92ac67252c8ccd8341f8 Mon Sep 17 00:00:00 2001 From: Akshay Nair Date: Sun, 20 Dec 2020 17:45:23 +0530 Subject: Migrates sensible apps to nix --- configuration.nix | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'configuration.nix') 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 -- cgit v1.3.1