diff options
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/apps/web.nix | 4 | ||||
| -rw-r--r-- | gui/emacs.nix | 42 | ||||
| -rw-r--r-- | gui/gtk.nix | 7 |
3 files changed, 25 insertions, 28 deletions
diff --git a/gui/apps/web.nix b/gui/apps/web.nix index 5b85ba5..eab7dbd 100644 --- a/gui/apps/web.nix +++ b/gui/apps/web.nix @@ -1,11 +1,11 @@ -{ config, pkgs, ... }: +{ config, pkgs, pkgs-unstable, ... }: { home = { packages = (with pkgs; [ thunderbird tdesktop - ]) ++ (with config.custom.nixpkgs-unstable; [ + ]) ++ (with pkgs-unstable; [ zotero ]); }; diff --git a/gui/emacs.nix b/gui/emacs.nix index ce5912b..a0cd3bd 100644 --- a/gui/emacs.nix +++ b/gui/emacs.nix @@ -1,6 +1,11 @@ -{ config, pkgs, ... }: +{ config, pkgs, sources, ... }: -{ +let + pkgs-unstable = import sources.nixpkgs-unstable { + overlays = [ (import sources.emacs-overlay) ]; + }; + +in { programs.emacs = let akr-color-theme = pkgs.stdenv.mkDerivation { name = "emacs-color-theme-akr"; @@ -44,27 +49,18 @@ in { enable = true; - package = let - pkgs-unstable = import <nixpkgs-unstable> { - overlays = [ - (import (builtins.fetchTarball { - url = https://github.com/nix-community/emacs-overlay/archive/c10d59874dfa8341237702bce514a763198770c4.tar.gz; - })) - ]; - }; - in - pkgs-unstable.emacsWithPackagesFromUsePackage { - config = ./conf/init.el; - package = pkgs-unstable.emacsGcc; - extraEmacsPackages = epkgs: with epkgs.melpaPackages; [ - pdf-tools - mu4e-alert - ] ++ [ - akr-color-theme - custom-runtime-env - pkgs.mu - ]; - }; + package = pkgs-unstable.emacsWithPackagesFromUsePackage { + config = ./conf/init.el; + package = pkgs-unstable.emacsGcc; + extraEmacsPackages = epkgs: with epkgs.melpaPackages; [ + pdf-tools + mu4e-alert + ] ++ [ + akr-color-theme + custom-runtime-env + pkgs.mu + ]; + }; }; home.packages = with pkgs; [ diff --git a/gui/gtk.nix b/gui/gtk.nix index 2251507..b26a626 100644 --- a/gui/gtk.nix +++ b/gui/gtk.nix @@ -1,14 +1,15 @@ -{ config, pkgs, ... }: +{ config, pkgs, pkgs-personal, ... }: let hidpi = config.custom.hidpi; + in { gtk = { enable = true; theme = { name = "oomox"; - package = config.custom.pkgs.oomox-gtk-theme { + package = pkgs-personal.oomox-gtk-theme { accent_bg = "aadb0f"; bg = "d8d8d8"; fg = "101010"; @@ -37,7 +38,7 @@ in { iconTheme = { name = "oomox-archdroid"; - package = config.custom.pkgs.oomox-archdroid-icon-theme "909636"; + package = pkgs-personal.oomox-archdroid-icon-theme "909636"; }; font = { |