commit 0be2bcaa47d13adbff27fa9315fd3b2e050acd58 · ryan.freumh.org/nixos

+2 -3

flake.nix

···

       53
       53
        
                   # to override attributes of a package

     

       54
       54
        
                   # package = prev.package.overrideAttrs

     

       55
       55
        
                   #  (_: { patches = [ ./pkgs/package.patch ]; });

     

       56
       56
       -
                   neovim-unwrapped = (import nixpkgs-neovim {

     

       57
       57
       -
                     inherit system;

     

       58
       58
       -
                   }).neovim-unwrapped;

     

       56
       56
       +
                   neovim-unwrapped =

     

       57
       57
       +
                     (import nixpkgs-neovim { inherit system; }).neovim-unwrapped;

     

       59
       58
        
                   sway-unwrapped = prev.callPackage ./pkgs/sway-im/package.nix {

     

       60
       59
        
                     libdrm = prev.libdrm;

     

       61
       60
        
                     wlroots = prev.callPackage ./pkgs/wlroots/default.nix {

+2 -1

home/aerc-binds.nix

···

       84
       84
        
           "<C-a>" = ":mark -a<Enter>";

     

       85
       85
        
           "e" = ":envelope<Enter>";

     

       86
       86
        
           "E" = ":envelope -h<Enter>";

     

       87
       87
       -
           "s" = ":exec mu find --clearlinks --format=links --linksdir=~/mail/search/results<space>";

     

       87
       87
       +
           "s" =

     

       88
       88
       +
             ":exec mu find --clearlinks --format=links --linksdir=~/mail/search/results<space>";

     

       88
       89
        
         };

     

       89
       90
        
       

     

       90
       91
        
         "messages:folder=Drafts" = { "<Enter>" = ":recall<Enter>"; };

+1 -2

home/emacs/default.nix

···

       1
       1
        
       { pkgs, lib, config, ... }:

     

       2
       2
        
       

     

       3
       3
       -
       let

     

       4
       4
       -
         cfg = config.custom.emacs;

     

       3
       3
       +
       let cfg = config.custom.emacs;

     

       5
       4
        
       in {

     

       6
       5
        
         options.custom.emacs.enable = lib.mkEnableOption "emacs";

     

       7
       6

+1 -3

home/mail.nix

···

       297
       297
        
                 realName = "Search Index";

     

       298
       298
        
                 address = "search@local";

     

       299
       299
        
                 aerc.enable = true;

     

       300
       300
       -
                 aerc.extraAccounts = {

     

       301
       301
       -
                   source = "maildir://~/mail/search";

     

       302
       302
       -
                 };

     

       300
       300
       +
                 aerc.extraAccounts = { source = "maildir://~/mail/search"; };

     

       303
       301
        
                 aerc.extraConfig = {

     

       304
       302
        
                   ui = {

     

       305
       303
        
                     index-columns = "flags>4,date<*,to<30,name<30,subject<*";

+2 -2

home/nvim/default.nix

···

       302
       302
        
                     vim.g.ledger_extra_options = '--pedantic'

     

       303
       303
        
                     vim.g.ledger_align_at = 50

     

       304
       304
        
                     vim.g.ledger_accounts_cmd = 'ledger accounts --add-budget'

     

       305
       305
       -
                     

     

       305
       305
       +
       

     

       306
       306
        
                     vim.g.ledger_date_format = '%Y-%m-%d'

     

       307
       307
       -
                     

     

       307
       307
       +
       

     

       308
       308
        
                     vim.cmd([[

     

       309
       309
        
                     autocmd FileType ledger nnoremap <buffer> <leader>e :call ledger#entry()<CR>

     

       310
       310
        
                     ]])

+6 -6

home/sway.nix

···

       38
       38
        
               buildInputs = [ pkgs.bash ];

     

       39
       39
        
               dontUnpack = true;

     

       40
       40
        
               installPhase = ''

     

       41
       41
       -
                 mkdir -p $out/bin

     

       42
       42
       -
                 cat > $out/bin/xterm <<EOF

     

       43
       43
       -
       #!/usr/bin/env bash

     

       41
       41
       +
                           mkdir -p $out/bin

     

       42
       42
       +
                           cat > $out/bin/xterm <<EOF

     

       43
       43
       +
                 #!/usr/bin/env bash

     

       44
       44
        
       

     

       45
       45
       -
       exec \$TERMINAL "\$@"

     

       46
       46
       -
       EOF

     

       47
       47
       -
                 chmod +x $out/bin/xterm

     

       45
       45
       +
                 exec \$TERMINAL "\$@"

     

       46
       46
       +
                 EOF

     

       47
       47
       +
                           chmod +x $out/bin/xterm

     

       48
       48
        
               '';

     

       49
       49
        
             })

     

       50
       50
        
           ];

+1 -1

hosts/gecko/default.nix

···

       101
       101
        
           '')

     

       102
       102
        
           ddcutil

     

       103
       103
        
           anki

     

       104
       104
       -
           (aspellWithDicts (ps: with ps; [en]))

     

       104
       104
       +
           (aspellWithDicts (ps: with ps; [ en ]))

     

       105
       105
        
           moreutils

     

       106
       106
        
           gnome-calendar

     

       107
       107
        
         ];

+5 -9

hosts/shrew/default.nix

···

       84
       84
        
             "google_assistant"

     

       85
       85
        
             "google_translate"

     

       86
       86
        
           ];

     

       87
       87
       -
           customComponents = with pkgs.overlay-unstable.home-assistant-custom-components; [

     

       88
       88
       -
             adaptive_lighting

     

       89
       89
       -
           ];

     

       87
       87
       +
           customComponents =

     

       88
       88
       +
             with pkgs.overlay-unstable.home-assistant-custom-components;

     

       89
       89
       +
             [ adaptive_lighting ];

     

       90
       90
        
           config = {

     

       91
       91
        
             # Includes dependencies for a basic setup

     

       92
       92
        
             # https://www.home-assistant.io/integrations/default_config/

     
···

       131
       131
        
             adaptive_lighting = {

     

       132
       132
        
               sunrise_time = "06:00:00";

     

       133
       133
        
               sunset_time = "18:00:00";

     

       134
       134
       -
               lights = [

     

       135
       135
       -
                 "light.bed_left"

     

       136
       136
       -
                 "light.bed_right"

     

       137
       137
       -
                 "light.ceiling"

     

       138
       138
       -
                 "light.strip"

     

       139
       139
       -
               ];

     

       134
       134
       +
               lights =

     

       135
       135
       +
                 [ "light.bed_left" "light.bed_right" "light.ceiling" "light.strip" ];

     

       140
       136
        
             };

     

       141
       137
        
           };

     

       142
       138
        
         };

+1 -3

modules/gui/default.nix

···

       38
       38
        
           boot.kernelModules = [ "hid-apple" ];

     

       39
       39
        
       

     

       40
       40
        
           services.xserver = {

     

       41
       41
       -
             excludePackages = with pkgs; [

     

       42
       42
       -
               xterm

     

       43
       43
       -
             ];

     

       41
       41
       +
             excludePackages = with pkgs; [ xterm ];

     

       44
       42
        
             displayManager.startx.enable = true;

     

       45
       43
        
             xkb.layout = "gb";

     

       46
       44
        
           };