commit b99eb35c63b4874da8a27c48c76e79d54b5e7780 · ryan.freumh.org/nixos

+81 -73

flake.nix

···

       52
       52
        
           hyperbib-eeg,

     

       53
       53
        
           neovim,

     

       54
       54
        
           ...

     

       55
       55
       -
         }@inputs: rec {

     

       56
       56
       -
           nixosConfigurations =

     

       57
       57
       -
             let

     

       58
       58
       -
               getSystemOverlays = system: nixpkgsConfig:

     

       59
       59
       -
                 [

     

       60
       60
       -
                   (final: prev: {

     

       61
       61
       -
                     overlay-unstable = import nixpkgs-unstable {

     

       62
       62
       -
                       inherit system;

     

       63
       63
       -
                       # follow stable nixpkgs config

     

       64
       64
       -
                       config = nixpkgsConfig;

     

       65
       65
       -
                     };

     

       66
       66
       -
                     overlay-compat = import nixpkgs-compat {

     

       67
       67
       -
                       inherit system;

     

       68
       68
       -
                       config = nixpkgsConfig;

     

       69
       69
       -
                     };

     

       70
       70
       -
                     agenix = agenix.packages.${system}.default;

     

       71
       71
       -
                     eeww = eeww.defaultPackage.${system};

     

       72
       72
       -
                     eon = eon.defaultPackage.${system};

     

       73
       73
       -
                     mautrix-signal = final.overlay-unstable.mautrix-signal;

     

       74
       74
       -
                     i3-workspace-history = i3-workspace-history.packages.${system}.default;

     

       75
       75
       -
                     maildir-rank-addr = final.callPackage ./pkgs/maildir-rank-addr.nix { };

     

       76
       76
       -
                     # https://github.com/NixOS/nixpkgs/issues/86349#issuecomment-624489806

     

       77
       77
       -
                     aerc = (prev.callPackage "${prev.path}/pkgs/applications/networking/mailreaders/aerc/default.nix" {

     

       78
       78
       -
                       buildGoModule = args: prev.buildGoModule (args // {

     

       79
       79
       -
                          src = prev.fetchFromSourcehut {

     

       80
       80
       -
                           owner = "~rjarry";

     

       81
       81
       -
                           repo = "aerc";

     

       82
       82
       -
                           rev = "930e50328c3a57faeec7fd23881e044257eda157";

     

       83
       83
       -
                           hash = "sha256-V1cjjJBAGqfBZIizAweMUYl7X3QorgLh/8J4HulmKAE=";

     

       55
       55
       +
         }@inputs:

     

       56
       56
       +
           let

     

       57
       57
       +
             getSystemOverlays = system: nixpkgsConfig:

     

       58
       58
       +
               [

     

       59
       59
       +
                 (final: prev: {

     

       60
       60
       +
                   overlay-unstable = import nixpkgs-unstable {

     

       61
       61
       +
                     inherit system;

     

       62
       62
       +
                     # follow stable nixpkgs config

     

       63
       63
       +
                     config = nixpkgsConfig;

     

       64
       64
       +
                   };

     

       65
       65
       +
                   overlay-compat = import nixpkgs-compat {

     

       66
       66
       +
                     inherit system;

     

       67
       67
       +
                     config = nixpkgsConfig;

     

       68
       68
       +
                   };

     

       69
       69
       +
                   agenix = agenix.packages.${system}.default;

     

       70
       70
       +
                   eeww = eeww.defaultPackage.${system};

     

       71
       71
       +
                   eon = eon.defaultPackage.${system};

     

       72
       72
       +
                   mautrix-signal = final.overlay-unstable.mautrix-signal;

     

       73
       73
       +
                   i3-workspace-history = i3-workspace-history.packages.${system}.default;

     

       74
       74
       +
                   maildir-rank-addr = final.callPackage ./pkgs/maildir-rank-addr.nix { };

     

       75
       75
       +
                   # https://github.com/NixOS/nixpkgs/issues/86349#issuecomment-624489806

     

       76
       76
       +
                   aerc = (prev.callPackage "${prev.path}/pkgs/applications/networking/mailreaders/aerc/default.nix" {

     

       77
       77
       +
                     buildGoModule = args: prev.buildGoModule (args // {

     

       78
       78
       +
                        src = prev.fetchFromSourcehut {

     

       79
       79
       +
                         owner = "~rjarry";

     

       80
       80
       +
                         repo = "aerc";

     

       81
       81
       +
                         rev = "930e50328c3a57faeec7fd23881e044257eda157";

     

       82
       82
       +
                         hash = "sha256-V1cjjJBAGqfBZIizAweMUYl7X3QorgLh/8J4HulmKAE=";

     

       83
       83
       +
                       };

     

       84
       84
       +
                       vendorHash = "sha256-IzQKgNilBq53w41gNLXCd1BgYXW/aUuQQtFeKEI/dKw=";

     

       85
       85
       +
                     });

     

       86
       86
       +
                   });

     

       87
       87
       +
                   # https://github.com/swaywm/sway/pull/7226

     

       88
       88
       +
                   sway-unwrapped = prev.callPackage ./pkgs/sway-im/package.nix {

     

       89
       89
       +
                     libdrm = final.overlay-unstable.libdrm;

     

       90
       90
       +
                     wlroots = prev.callPackage ./pkgs/wlroots/default.nix {

     

       91
       91
       +
                       # for libdrm >=2.4.120

     

       92
       92
       +
                       mesa = final.overlay-unstable.mesa;

     

       93
       93
       +
                       wayland-protocols = prev.wayland-protocols.overrideAttrs (old: rec {

     

       94
       94
       +
                         pname = "wayland-protocols";

     

       95
       95
       +
                         version = "1.33";

     

       96
       96
       +
                         src = prev.fetchurl {

     

       97
       97
       +
                           url = "https://gitlab.freedesktop.org/wayland/${pname}/-/releases/${version}/downloads/${pname}-${version}.tar.xz";

     

       98
       98
       +
                           hash = "sha256-lPDFCwkNbmGgP2IEhGexmrvoUb5OEa57NvZfi5jDljo=";

     

       84
       99
        
                         };

     

       85
       85
       -
                         vendorHash = "sha256-IzQKgNilBq53w41gNLXCd1BgYXW/aUuQQtFeKEI/dKw=";

     

       86
       100
        
                       });

     

       87
       87
       -
                     });

     

       88
       88
       -
                     # https://github.com/swaywm/sway/pull/7226

     

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

     

       90
       90
       -
                       libdrm = final.overlay-unstable.libdrm;

     

       91
       91
       -
                       wlroots = prev.callPackage ./pkgs/wlroots/default.nix {

     

       92
       92
       -
                         # for libdrm >=2.4.120

     

       93
       93
       -
                         mesa = final.overlay-unstable.mesa;

     

       94
       94
       -
                         wayland-protocols = prev.wayland-protocols.overrideAttrs (old: rec {

     

       95
       95
       -
                           pname = "wayland-protocols";

     

       96
       96
       -
                           version = "1.33";

     

       97
       97
       -
                           src = prev.fetchurl {

     

       98
       98
       -
                             url = "https://gitlab.freedesktop.org/wayland/${pname}/-/releases/${version}/downloads/${pname}-${version}.tar.xz";

     

       99
       99
       -
                             hash = "sha256-lPDFCwkNbmGgP2IEhGexmrvoUb5OEa57NvZfi5jDljo=";

     

       100
       100
       -
                           };

     

       101
       101
       -
                         });

     

       102
       102
       -
                       };

     

       103
       101
        
                     };

     

       104
       104
       -
                     neovim-unwrapped = neovim.packages.${system}.default;

     

       105
       105
       -
                     # https://github.com/NixOS/nixpkgs/pull/291559

     

       106
       106
       -
                     libvpl = final.overlay-unstable.libvpl.overrideAttrs (_: {

     

       107
       107
       -
                       patches = [ ./pkgs/opengl-driver-lib.patch ];

     

       108
       108
       -
                     });

     

       109
       109
       -
                     # https://github.com/jellyfin/jellyfin-media-player/issues/165#issuecomment-1966131861

     

       110
       110
       -
                     jellyfin-media-player = prev.jellyfin-media-player.overrideAttrs (old: {

     

       111
       111
       -
                       buildInputs =

     

       112
       112
       -
                         (prev.lib.filter (input: input != prev.mpv) old.buildInputs) ++ [

     

       113
       113
       -
                         (prev.mpv-unwrapped.overrideAttrs (old: {

     

       114
       114
       -
                           buildInputs =

     

       115
       115
       -
                             (prev.lib.filter (input: input != prev.libva) old.buildInputs) ++ [

     

       116
       116
       -
                             (prev.libva.overrideAttrs (_: {

     

       117
       117
       -
                               src = prev.fetchFromGitHub {

     

       118
       118
       -
                                 owner = "emersion";

     

       119
       119
       -
                                 repo = "libva";

     

       120
       120
       -
                                 rev = "linux-dmabuf";

     

       121
       121
       -
                                 hash = "sha256-d1cT6zOZHnrBBWjxOtSMAijPr4Tab+0GetZ6aqzhvrQ=";

     

       122
       122
       -
                               };

     

       123
       123
       -
                             }))

     

       124
       124
       -
                           ];

     

       125
       125
       -
                         }))

     

       126
       126
       -
                       ];

     

       127
       127
       -
                     });

     

       128
       128
       -
                   })

     

       129
       129
       -
                 ];

     

       130
       130
       -
       

     

       102
       102
       +
                   };

     

       103
       103
       +
                   neovim-unwrapped = neovim.packages.${system}.default;

     

       104
       104
       +
                   # https://github.com/NixOS/nixpkgs/pull/291559

     

       105
       105
       +
                   libvpl = final.overlay-unstable.libvpl.overrideAttrs (_: {

     

       106
       106
       +
                     patches = [ ./pkgs/opengl-driver-lib.patch ];

     

       107
       107
       +
                   });

     

       108
       108
       +
                   # https://github.com/jellyfin/jellyfin-media-player/issues/165#issuecomment-1966131861

     

       109
       109
       +
                   jellyfin-media-player = prev.jellyfin-media-player.overrideAttrs (old: {

     

       110
       110
       +
                     buildInputs =

     

       111
       111
       +
                       (prev.lib.filter (input: input != prev.mpv) old.buildInputs) ++ [

     

       112
       112
       +
                       (prev.mpv-unwrapped.overrideAttrs (old: {

     

       113
       113
       +
                         buildInputs =

     

       114
       114
       +
                           (prev.lib.filter (input: input != prev.libva) old.buildInputs) ++ [

     

       115
       115
       +
                           (prev.libva.overrideAttrs (_: {

     

       116
       116
       +
                             src = prev.fetchFromGitHub {

     

       117
       117
       +
                               owner = "emersion";

     

       118
       118
       +
                               repo = "libva";

     

       119
       119
       +
                               rev = "linux-dmabuf";

     

       120
       120
       +
                               hash = "sha256-d1cT6zOZHnrBBWjxOtSMAijPr4Tab+0GetZ6aqzhvrQ=";

     

       121
       121
       +
                             };

     

       122
       122
       +
                           }))

     

       123
       123
       +
                         ];

     

       124
       124
       +
                       }))

     

       125
       125
       +
                     ];

     

       126
       126
       +
                   });

     

       127
       127
       +
                 })

     

       128
       128
       +
               ];

     

       129
       129
       +
         in rec {

     

       130
       130
       +
           nixosConfigurations =

     

       131
       131
       +
             let

     

       131
       132
        
               mkMode = mode: host:

     

       132
       133
        
                 nixpkgs.lib.nixosSystem {

     

       133
       134
        
                   # use system from config.localSystem

     
···

       193
       194
        
       

     

       194
       195
        
           nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration {

     

       195
       196
        
             modules = [ ./nix-on-droid/default.nix ];

     

       197
       197
       +
             pkgs = import nixpkgs {

     

       198
       198
       +
               overlays = getSystemOverlays "aarch64-linux" { };

     

       199
       199
       +
               config.permittedInsecurePackages = [

     

       200
       200
       +
                 # https://github.com/nix-community/nixd/issues/357

     

       201
       201
       +
                 "nix-2.16.2"

     

       202
       202
       +
               ];

     

       203
       203
       +
             };

     

       196
       204
        
           };

     

       197
       205
        
       

     

       198
       206
        
           legacyPackages = {

+2 -1

modules/personal/zsh.cfg

···

       49
       49
        
       

     

       50
       50
        
       typeset -g -A key

     

       51
       51
        
       

     

       52
       52
       +
       key[Up]="${terminfo[kcuu1]}"

     

       53
       53
       +
       key[Down]="${terminfo[kcud1]}"

     

       52
       54
        
       key[Shift-Tab]="${terminfo[kcbt]}"

     

       53
       55
        
       key[Control-Left]="^[[1;5D"

     

       54
       56
        
       key[Control-Right]="^[[1;5C"

     
···

       58
       60
        
       

     

       59
       61
        
       bindkey "${key[Up]}"                up-line-or-beginning-search

     

       60
       62
        
       bindkey "${key[Down]}"              down-line-or-beginning-search

     

       61
       61
       -
       

     

       62
       63
        
       bindkey "${key[Shift-Tab]}"         reverse-menu-complete

     

       63
       64
        
       bindkey "${key[Control-Left]}"      backward-word

     

       64
       65
        
       bindkey "${key[Control-Right]}"     forward-word

+49 -7

nix-on-droid/default.nix

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       {

     

       4
       4
        
         user.shell = "${pkgs.zsh}/bin/zsh";

     
···

       43
       43
        
         ];

     

       44
       44
        
       

     

       45
       45
        
         environment.etcBackupExtension = ".bak";

     

       46
       46
       -
         

     

       46
       46
       +
       

     

       47
       47
       +
         # Tailscale nameserver https://github.com/nix-community/nix-on-droid/issues/2

     

       48
       48
       +
         environment.etc."resolv.conf".text = lib.mkForce ''

     

       49
       49
       +
           nameserver 100.100.100.100

     

       50
       50
       +
           nameserver 1.1.1.1

     

       51
       51
       +
           nameserver 8.8.8.8

     

       52
       52
       +
         '';

     

       53
       53
       +
       

     

       47
       54
        
         home-manager = {

     

       48
       55
        
           useGlobalPkgs = true;

     

       49
       56
        
           config =

     
···

       52
       59
        
               # Use the same overlays as the system packages

     

       53
       60
        
               nixpkgs = { inherit (config.nixpkgs) overlays; };

     

       54
       61
        
       

     

       62
       62
       +
               nix = {

     

       63
       63
       +
                 package = pkgs.nix;

     

       64
       64
       +
                 settings.experimental-features = [ "nix-command" "flakes" ];

     

       65
       65
       +
               };

     

       66
       66
       +
       

     

       67
       67
       +
               # https://github.com/nix-community/nix-on-droid/issues/185

     

       68
       68
       +
               home.shellAliases = {

     

       69
       69
       +
                 sshd = "$(readlink $(whereis sshd)) -f $HOME/.ssh/sshd_config";

     

       70
       70
       +
                 ping = "/android/system/bin/linker64 /android/system/bin/ping";

     

       71
       71
       +
               };

     

       72
       72
       +
       

     

       55
       73
        
               programs.zsh = {

     

       56
       74
        
                 enable = true;

     

       57
       75
        
                 history.size = 100000;

     
···

       115
       133
        
                   lua-language-server

     

       116
       134
        
                   #pyright

     

       117
       135
        
                   #black

     

       136
       136
       +
                   ltex-ls

     

       118
       137
        
                 ];

     

       119
       138
        
                 extraLuaConfig = builtins.readFile ../modules/personal/nvim/nvim.lua;

     

       120
       120
       -
                 plugins = 

     

       121
       121
       -
                   let obsidian-nvim =

     

       139
       139
       +
                   # undo transparent background

     

       140
       140
       +
                   # + "colorscheme gruvbox";

     

       141
       141
       +
                 plugins = let

     

       142
       142
       +
                     obsidian-nvim =

     

       122
       143
        
                     (pkgs.vimUtils.buildVimPlugin {

     

       123
       144
        
                       pname = "obsidian.nvim";

     

       124
       145
        
                       version = "2.6.0";

     
···

       129
       150
        
                         sha256 = "sha256-+w3XYoobuH17oinPfQxhrizbmQB5IbbulUK69674/Wg=";

     

       130
       151
        
                       };

     

       131
       152
        
                     });

     

       132
       132
       -
                   in with pkgs.vimPlugins; [

     

       133
       133
       -
                   vim-airline

     

       134
       134
       -
                   vim-airline-themes

     

       153
       153
       +
                     ltex-ls-nvim =

     

       154
       154
       +
                       (pkgs.vimUtils.buildVimPlugin {

     

       155
       155
       +
                         pname = "ltex-ls.nvim";

     

       156
       156
       +
                         version = "2.6.0";

     

       157
       157
       +
                         src = pkgs.fetchFromGitHub {

     

       158
       158
       +
                           owner = "vigoux";

     

       159
       159
       +
                           repo = "ltex-ls.nvim";

     

       160
       160
       +
                           rev = "c8139ea6b7f3d71adcff121e16ee8726037ffebd";

     

       161
       161
       +
                           sha256 = "sha256-jY3ALr6h88xnWN2QdKe3R0vvRcSNhFWDW56b2NvnTCs=";

     

       162
       162
       +
                         };

     

       163
       163
       +
                       });

     

       164
       164
       +
                 in with pkgs.vimPlugins; [

     

       135
       165
        
                   gruvbox-nvim

     

       136
       166
        
       

     

       137
       167
        
                   telescope-nvim

     

       168
       168
       +
                   telescope-fzf-native-nvim

     

       169
       169
       +
                   trouble-nvim

     

       138
       170
        
       

     

       139
       171
        
                   obsidian-nvim

     

       140
       172
        
                   plenary-nvim

     
···

       167
       199
        
                   cmp-nvim-lsp-signature-help

     

       168
       200
        
                   cmp-path

     

       169
       201
        
                   cmp-buffer

     

       202
       202
       +
                   cmp-cmdline

     

       170
       203
        
                   cmp-spell

     

       204
       204
       +
                   luasnip

     

       171
       205
        
                   nvim-cmp

     

       172
       206
        
       

     

       173
       207
        
                   vimtex

     

       208
       208
       +
                   nvim-surround

     

       209
       209
       +
                   comment-nvim

     

       210
       210
       +
       

     

       211
       211
       +
                   ltex-ls-nvim

     

       212
       212
       +
                   nvim-jdtls

     

       213
       213
       +
                   # TODO nvim-dap

     

       214
       214
       +
       

     

       215
       215
       +
                   copilot-vim

     

       174
       216
        
                 ];

     

       175
       217
        
               };

     

       176
       218

+39

nix-on-droid/unexpected-keyboard-ortholinear-layout.xml

···

       1
       1
       +
       <?xml version="1.0" encoding="utf-8"?>

     

       2
       2
       +
       <keyboard name="QWERTY (UK)" script="latin">

     

       3
       3
       +
         <row>

     

       4
       4
       +
           <key key0="q" key2="1" key4="esc"/>

     

       5
       5
       +
           <key key0="w" key2="2" key3="&quot;"/>

     

       6
       6
       +
           <key key0="e" key1="!" key2="3" key3="loc £" key4="loc €"/>

     

       7
       7
       +
           <key key0="r" key2="4" key3="$" key1="loc ₪"/>

     

       8
       8
       +
           <key key0="t" key2="5" key3="%"/>

     

       9
       9
       +
           <key key0="y" key2="6" key3="^"/>

     

       10
       10
       +
           <key key0="u" key2="7" key3="&amp;"/>

     

       11
       11
       +
           <key key0="i" key2="8" key3="*"/>

     

       12
       12
       +
           <key key0="o" key1="loc accent_macron" key2="9" key3="(" key4=")"/>

     

       13
       13
       +
           <key key0="p" key2="0" key3="f11_placeholder" key4="f12_placeholder"/>

     

       14
       14
       +
         </row>

     

       15
       15
       +
         <row>

     

       16
       16
       +
           <key key0="a" key2="`" key4="tab"/>

     

       17
       17
       +
           <key key0="s" key1="loc accent_ring" key2="loc §" key3="loc ß" key4="loc accent_ogonek"/>

     

       18
       18
       +
           <key key0="d" key1="loc accent_grave" key3="loc accent_aigu"/>

     

       19
       19
       +
           <key key0="f" key1="loc accent_dot_above"/>

     

       20
       20
       +
           <key key0="g" key1="loc accent_caron" key2="-" key3="_"/>

     

       21
       21
       +
           <key key0="h" key2="=" key3="+"/>

     

       22
       22
       +
           <key key0="j" key1="loc accent_trema" key2="loc accent_circonflexe" key4="}" key3="{"/>

     

       23
       23
       +
           <key key0="k" key1="loc accent_double_aigu" key3="[" key4="]"/>

     

       24
       24
       +
           <key key0="l" key2="\@" key3="'"/>

     

       25
       25
       +
           <key key0=";" key1="\#" key2="~" key3=":"/>

     

       26
       26
       +
         </row>

     

       27
       27
       +
         <row>

     

       28
       28
       +
           <key width="1" key0="shift" key2="loc capslock"/>

     

       29
       29
       +
           <key key0="z" key2="|" key3="\\"/>

     

       30
       30
       +
           <key key0="x" key2="loc †"/>

     

       31
       31
       +
           <key key0="c" key1="loc accent_tilde"/>

     

       32
       32
       +
           <key key0="v"/>

     

       33
       33
       +
           <key key0="b"/>

     

       34
       34
       +
           <key key0="n" key1="loc accent_cedille" key2="&lt;" key3="."/>

     

       35
       35
       +
           <key key0="m" key2="&gt;" key3=","/>

     

       36
       36
       +
           <key key0="/" key3="\?"/>

     

       37
       37
       +
           <key width="1" key0="backspace" key1="delete"/>

     

       38
       38
       +
         </row>

     

       39
       39
       +
       </keyboard>