modules updates

modules/apps/gaming.nix

@@ -1,6 +1,10 @@
 { config, lib, pkgs, ... }:
-
-{
+let
+  unstable = import
+    (builtins.fetchTarball "https://github.com/nixos/nixpkgs/tarball/master") {
+      config = config.nixpkgs.config;
+    };
+in {
   options.my.apps.gaming.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.apps.gaming.enable {
     programs.steam = {

modules/apps/multimedia.nix

@@ -10,7 +10,9 @@
       celluloid # video player
       curtail # image compressor
       easyeffects # equalizer
-      handbrake # video converter, may be unnecessary
+      # (handbrake.override {
+      #   useGtk = true;
+      # }) # video converter, may be unnecessary
       identity # compare images or videos
       mousai # poor man shazam
       shortwave # listen to world radio

modules/apps/office.nix

@@ -1,6 +1,10 @@
-{ config, lib, pkgs, unstable, ... }:
-
-{
+{ config, lib, pkgs, ... }:
+let
+  unstable = import
+    (builtins.fetchTarball "https://github.com/nixos/nixpkgs/tarball/master") {
+      config = config.nixpkgs.config;
+    };
+in {
   options.my.apps.office.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.apps.office.enable {
     users.users.jawz.packages = with pkgs; ([
@@ -8,6 +12,7 @@
       calibre # ugly af eBook library manager
       newsflash # feed reader, syncs with nextcloud
       furtherance # I packaged this one tehee track time utility
+      unstable.planify # let's pretend I will organize my tasks
       # foliate # gtk eBook reader
       # wike # gtk wikipedia wow!
       # denaro # manage your finances

modules/dev.nix

@@ -1,7 +1,6 @@
-{ config, lib, pkgs, ... }:
-
-{
-  imports = [ ./dev/haskell.nix ./dev/nix.nix ./dev/python.nix ];
+{ config, lib, pkgs, ... }: {
+  imports = [ ./dev/haskell.nix ./dev/nix.nix ./dev/python.nix ./emacs.nix ];
+  my.emacs.enable = lib.mkDefault false;
   my.dev = {
     haskell.enable = lib.mkDefault false;
     nix.enable = lib.mkDefault false;

modules/emacs.nix

@@ -0,0 +1,24 @@
+{ config, lib, pkgs, unstable, ... }: {
+  options.my.emacs.enable = lib.mkEnableOption "enable";
+  config = lib.mkIf config.my.emacs.enable {
+    users.users.jawz.packages = with pkgs; ([
+      fd # modern find, faster searches
+      (ripgrep.override { withPCRE2 = true; }) # modern grep
+    ]);
+    services.emacs = {
+      enable = true;
+      package = with pkgs;
+        ((emacsPackagesFor emacs-gtk).emacsWithPackages
+          (epkgs: with epkgs; ([ vterm ])));
+      defaultEditor = true;
+    };
+    home-manager.users.jawz.programs.bash.initExtra = ''
+      emacs-sqlite-fix () {
+        nix-shell -p cmake sqlite --command "doom sync &&
+            sc restart emacs &&
+            emacsclient -e '(org-roam-db-sync)'" &&
+          doom sync
+        }
+    '';
+  };
+}

modules/shell.nix

@@ -0,0 +1,12 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [ ./shell/exercism.nix ./dev/python.nix ./dev/haskell.nix ];
+  my = {
+    shell = { exercism.enable = lib.mkDefault false; };
+    dev = {
+      haskell.enable = lib.mkDefault false;
+      python.enable = lib.mkDefault false;
+    };
+  };
+}

modules/shell/exercism.nix

@@ -0,0 +1,11 @@
+{ config, lib, pkgs, unstable, ... }:
+
+{
+  options.my.shell.exercism.enable = lib.mkEnableOption "enable";
+  config = lib.mkIf config.my.shell.exercism.enable {
+    users.users.jawz.packages = with pkgs; ([
+      exercism # learn to code
+      bats # testing system, required by Exercism
+    ]);
+  };
+}