diff --git a/base/gui-programs.nix b/base/gui-programs.nix index 62b386c..f98fedf 100644 --- a/base/gui-programs.nix +++ b/base/gui-programs.nix @@ -3,23 +3,17 @@ 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; } diff --git a/home/default.nix b/home/default.nix index c9a4a7e..abf442e 100644 --- a/home/default.nix +++ b/home/default.nix @@ -2,6 +2,7 @@ { imports = [ ./emacs.nix + ./flameshot.nix ./x ]; diff --git a/home/emacs.nix b/home/emacs.nix index 7229282..5b1808e 100644 --- a/home/emacs.nix +++ b/home/emacs.nix @@ -5,6 +5,16 @@ }; 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 diff --git a/home/flameshot.nix b/home/flameshot.nix new file mode 100644 index 0000000..359fc8c --- /dev/null +++ b/home/flameshot.nix @@ -0,0 +1,13 @@ +{ 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; + }; +} diff --git a/home/x/i3.nix b/home/x/i3.nix index 2c47281..9a76351 100644 --- a/home/x/i3.nix +++ b/home/x/i3.nix @@ -27,8 +27,9 @@ let in { config = lib.mkIf isEnabled { - # FIXME: enable flameshot when added - # my.home = {}; + my.home = { + flameshot.enable = true; + }; xsession.windowManager.i3 = { enable = true;