citadel

commit b10d4473f428c3c7ad13cdb2b1454c8b7ebeb95f
parent 4b9224654d502aa8d3582aebb15aa75dd922ab31
Author: William Casarin <jb55@jb55.com>
Date:   Thu, 11 Feb 2021 08:51:11 -0800

pkgs: desktop specific jb55pkgs

Diffstat:
M
nix-config/environment/default.nix
 | 
6
+-----
M
nix-config/environment/desktop/default.nix
 | 
15
++++++++++++---
M
nix-config/services/desktop/default.nix
 | 
22
----------------------

3 files changed, 13 insertions(+), 30 deletions(-)
diff --git a/nix-config/environment/default.nix b/nix-config/environment/default.nix
@@ -10,22 +10,18 @@ let jb55pkgs = import <jb55pkgs> { inherit pkgs; };
     myPackages = with jb55pkgs; [
        bcalc
        btcs
-       cmdtree
        csv-delim
        csv-scripts
        datefmt
-       dbopen
        extname
        kindle-send
        mandown
        ratio
        samp
        sharefile
-       snap
-       #viscal
        zebra
-       #zoom-link-opener
        define
+       nixpkgs-ml-tools
     ];
     myHaskellPackages = with pkgs.haskellPackages; [
       #skeletons
diff --git a/nix-config/environment/desktop/default.nix b/nix-config/environment/desktop/default.nix
@@ -13,6 +13,15 @@ let gtk2rc = pkgs.writeText "gtk2rc" ''
       class "GtkMenuShell" binding "gtk-binding-menu"
     '';
 
+    jb55pkgs = import <jb55pkgs> { inherit pkgs; };
+
+    jbpkgs = with jb55pkgs; [
+       snap
+       cmdtree
+       zoom-link-opener
+       viscal
+    ];
+
     df = pkgs.dwarf-fortress-packages.dwarf-fortress-full.override {
        #dfVersion = "0.44.11";
        enableIntro = false;
@@ -21,7 +30,7 @@ let gtk2rc = pkgs.writeText "gtk2rc" ''
        enableTextMode = true;
     };
 
-    mypkgs = with pkgs; [
+    mypkgs = (with pkgs; [
       aerc
       clipmenu
       colorpicker
@@ -29,7 +38,6 @@ let gtk2rc = pkgs.writeText "gtk2rc" ''
       dragon-drop
       dunst
       dynamic-colors
-      emacs
       feh
       todo-txt-cli
       getmail # for getmail-gmail-xoauth-tokens
@@ -39,6 +47,7 @@ let gtk2rc = pkgs.writeText "gtk2rc" ''
       libnotify
       msmtp
       muchsync
+      neomutt
       notmuch
       oathToolkit
       pandoc
@@ -72,7 +81,7 @@ let gtk2rc = pkgs.writeText "gtk2rc" ''
       zoom-us
 
       df
-    ];
+    ]) ++ jbpkgs;
 
 in {
 
diff --git a/nix-config/services/desktop/default.nix b/nix-config/services/desktop/default.nix
@@ -51,28 +51,6 @@ in
   #   configPath = "/home/jb55/.gnupg";
   # };
 
-  services.emacs.enable = if extra.is-minimal then false else true;
-  services.emacs.install = if extra.is-minimal then false else true;
-
-  systemd.user.services.emacs.path = with pkgs; [ bash nix ];
-  systemd.user.services.emacs.serviceConfig.ExecStart =
-    let
-      cfg = config.services.emacs;
-    in
-      lib.mkIf (!extra.is-minimal) (
-      lib.mkForce (
-        pkgs.writeScript "start-emacs" ''
-          #!/usr/bin/env bash
-          source ${config.system.build.setEnvironment}
-
-          # hacky af
-          export NIX_PATH=dotfiles=/home/jb55/dotfiles:jb55pkgs=/home/jb55/etc/jb55pkgs:monstercatpkgs=/home/jb55/etc/monstercatpkgs:nixos-config=/home/jb55/etc/nix-files:nixpkgs=/home/jb55/nixpkgs:/home/jb55/.nix-defexpr/channels:nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels
-          export NIXPKGS=/home/jb55/nixpkgs
-
-          exec ${cfg.package}/bin/emacs --daemon
-        ''
-      ));
-
   services.redshift = {
     enable = if extra.is-minimal then false else true;
     temperature.day = 5500;