commit 185fd47bc6623d7e257896640e4d0f31a40e9735 · ryan.freumh.org/nixos

+17

flake.lock

···

       772
       772
        
               "type": "github"

     

       773
       773
        
             }

     

       774
       774
        
           },

     

       775
       775
       +
           "nixpkgs-stable": {

     

       776
       776
       +
             "locked": {

     

       777
       777
       +
               "lastModified": 1734323986,

     

       778
       778
       +
               "narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=",

     

       779
       779
       +
               "owner": "NixOS",

     

       780
       780
       +
               "repo": "nixpkgs",

     

       781
       781
       +
               "rev": "394571358ce82dff7411395829aa6a3aad45b907",

     

       782
       782
       +
               "type": "github"

     

       783
       783
       +
             },

     

       784
       784
       +
             "original": {

     

       785
       785
       +
               "owner": "NixOS",

     

       786
       786
       +
               "ref": "nixos-24.11",

     

       787
       787
       +
               "repo": "nixpkgs",

     

       788
       788
       +
               "type": "github"

     

       789
       789
       +
             }

     

       790
       790
       +
           },

     

       775
       791
        
           "nixpkgs-unstable": {

     

       776
       792
        
             "locked": {

     

       777
       793
        
               "lastModified": 1733940404,

     
···

       1056
       1072
        
               "colour-guesser": "colour-guesser",

     

       1057
       1073
        
               "deploy-rs": "deploy-rs",

     

       1058
       1074
        
               "eilean": "eilean",

     

       1075
       1075
       +
               "emacs-overlay": "emacs-overlay",

     

       1059
       1076
        
               "eon": "eon",

     

       1060
       1077
        
               "fn06-website": "fn06-website",

     

       1061
       1078
        
               "home-manager": "home-manager_2",

+2

flake.nix

···

       18
       18
        
           hyperbib-eeg.url = "github:RyanGibb/hyperbib?ref=nixify";

     

       19
       19
        
           nix-rpi5.url = "gitlab:vriska/nix-rpi5?ref=main";

     

       20
       20
        
           nur.url = "github:nix-community/NUR/e9e77b7985ef9bdeca12a38523c63d47555cc89b";

     

       21
       21
       +
           emacs-overlay.url = "github:nix-community/emacs-overlay";

     

       21
       22
        
       

     

       22
       23
        
           # deduplicate flake inputs

     

       23
       24
        
           eilean.inputs.nixpkgs.follows = "nixpkgs";

     
···

       34
       35
        
           hyperbib-eeg.inputs.nixpkgs.follows = "nixpkgs";

     

       35
       36
        
           nix-rpi5.inputs.nixpkgs.follows = "nixpkgs";

     

       36
       37
        
           nur.inputs.nixpkgs.follows = "nixpkgs";

     

       38
       38
       +
           emacs-overlay.inputs.nixpkgs.follows = "nixpkgs";

     

       37
       39
        
         };

     

       38
       40
        
       

     

       39
       41
        
         outputs =

+26 -23

home/emacs/default.nix

···

       3
       3
        
         lib,

     

       4
       4
        
         config,

     

       5
       5
        
         ...

     

       6
       6
       -
       }:

     

       6
       6
       +
       }@inputs:

     

       7
       7
        
       

     

       8
       8
        
       let

     

       9
       9
        
         cfg = config.custom.emacs;

     

       10
       10
       +
         emacs = (pkgs.emacsPackagesFor pkgs.emacs29-pgtk).emacsWithPackages (

     

       11
       11
       +
           epkgs: with epkgs; [

     

       12
       12
       +
             treesit-grammars.with-all-grammars

     

       13
       13
       +
             vterm

     

       14
       14
       +
             mu4e

     

       15
       15
       +
           ]

     

       16
       16
       +
         );

     

       10
       17
        
       in

     

       11
       18
        
       {

     

       12
       19
        
         options.custom.emacs.enable = lib.mkEnableOption "emacs";

     

       13
       20
        
       

     

       14
       21
        
         config = lib.mkIf cfg.enable {

     

       15
       15
       -
           programs.emacs = {

     

       16
       16
       -
             enable = true;

     

       17
       17
       -
             package = pkgs.emacs29-pgtk;

     

       18
       18
       -
             extraPackages =

     

       19
       19
       -
               epkgs: with epkgs; [

     

       20
       20
       -
                 evil

     

       21
       21
       -
                 evil-leader

     

       22
       22
       -
                 # https://github.com/emacs-evil/evil-collection/pull/812/commits/149eacce58354f0ee3a55d4c12059148ef4ff953

     

       23
       23
       -
                 pkgs.overlay-unstable.emacsPackages.evil-collection

     

       24
       24
       -
                 evil-ledger

     

       25
       25
       -
                 evil-org

     

       26
       26
       -
                 undo-tree

     

       27
       27
       -
                 gruvbox-theme

     

       28
       28
       -
                 helm

     

       29
       29
       -
                 mu4e

     

       30
       30
       -
                 ledger-mode

     

       31
       31
       -
                 org

     

       32
       32
       -
                 org-evil

     

       33
       33
       -
               ];

     

       34
       34
       -
           };

     

       22
       22
       +
           nixpkgs.overlays = [

     

       23
       23
       +
             inputs.emacs-overlay.overlays.default

     

       24
       24
       +
           ];

     

       25
       25
       +
       

     

       26
       26
       +
           home.packages = with pkgs; [

     

       27
       27
       +
             binutils

     

       28
       28
       +
             emacs

     

       29
       29
       +
             gnutls

     

       30
       30
       +
             imagemagick

     

       31
       31
       +
             pinentry-emacs

     

       32
       32
       +
             # for undo-fu-session/undo-tree compression

     

       33
       33
       +
             zstd

     

       34
       34
       +
           ];

     

       35
       35
       +
       

     

       36
       36
       +
           home.sessionPath = [ "$XDG_CONFIG_HOME/emacs/bin" ];

     

       37
       37
       +
       

     

       38
       38
       +
           # modules.shell.zsh.rcFiles = [ "${config.xdg.configHome}/emacs/aliases.zsh" ];

     

       39
       39
       +
       

     

       35
       40
        
           home.file = {

     

       36
       36
       -
             ".emacs.d/init.el".source = ./init.el;

     

       37
       37
       -
             ".emacs.d/config".source = ./config;

     

       38
       41
        
             ".mail.cap".text = ''

     

       39
       42
        
               application/pdf; xdg-open %s

     

       40
       43
        
             '';

+1 -1

home/gui/i3.nix

···

       24
       24
        
           displays = "arandr";

     

       25
       25
        
           bar = "i3bar";

     

       26
       26
        
           notification_deamon = "dunst";

     

       27
       27
       -
           i3_workspace_history = "${i3-workspace-history}";

     

       27
       27
       +
           i3_workspace_history = "${i3-workspace-history}/bin/i3-workspace-history";

     

       28
       28
        
           i3_workspace_history_args = "";

     

       29
       29
        
         };

     

       30
       30
        
         util = import ./util.nix { inherit pkgs lib; };

+1 -1

home/gui/sway.nix

···

       26
       26
        
           displays = "wdisplays";

     

       27
       27
        
           bar = "swaybar";

     

       28
       28
        
           notification_deamon = "dunst";

     

       29
       29
       -
           i3_workspace_history = "${i3-workspace-history}";

     

       29
       29
       +
           i3_workspace_history = "${i3-workspace-history}/bin/i3-workspace-history";

     

       30
       30
        
           i3_workspace_history_args = "-sway";

     

       31
       31
        
         };

     

       32
       32
        
         util = import ./util.nix { inherit pkgs lib; };