base/gui-programs.nix

@@ -3,17 +3,23 @@
   environment.systemPackages = with pkgs; [
     alacritty
     discord
+    emacsPgtkGcc
     feh
     firefox
+    flameshot
     pavucontrol
     slack
     spotify
+    sqlite # needed for org-roam
     zathura
   ];
 
+  fonts.fonts = with pkgs; [
+    input-fonts
+    emacs-all-the-icons-fonts
+  ];
+
   networking.networkmanager.enable = true;
   programs.nm-applet.enable = true;
-
-  # NOTE: needed for home emacs configuration
   nixpkgs.config.input-fonts.acceptLicense = true;
 }

home/default.nix

@@ -2,7 +2,6 @@
 {
   imports = [
     ./emacs.nix
-    ./flameshot.nix
     ./x
   ];
 

home/emacs.nix

@@ -5,16 +5,6 @@
   };
 
   config = lib.mkIf config.my.home.emacs.enable {
-    home.packages = with pkgs; [
-      sqlite # needed by org-roam
-
-      # fonts used by my config
-      input-fonts
-      emacs-all-the-icons-fonts
-    ];
-    # make sure above fonts are discoverable
-    fonts.fontconfig.enable = true;
-
     services.emacs = {
       enable = true;
       # generate emacsclient desktop file

home/flameshot.nix

@@ -1,13 +0,0 @@
-{ config, lib, ... }:
-let
-  cfg = config.my.home.flameshot;
-in
-{
-  options.my.home.flameshot = with lib; {
-    enable = mkEnableOption "flameshot autolaunch";
-  };
-
-  config.services.flameshot = lib.mkIf cfg.enable {
-    enable = true;
-  };
-}

home/x/i3.nix

@@ -27,9 +27,8 @@ let
 in
 {
   config = lib.mkIf isEnabled {
-    my.home = {
+    # FIXME: enable flameshot when added
-      flameshot.enable = true;
+    # my.home = {};
-    };
 
     xsession.windowManager.i3 = {
       enable = true;