commit d80c442a57e56868ce62447109e91c581cdce3d9 · ryan.freumh.org/nixos

+19 -36

flake.lock

···

       134
        
               ]

     

       135
        
             },

     

       136
        
             "locked": {

     

       137
       -
               "lastModified": 1732635161,

     

       138
       -
               "narHash": "sha256-B0oHgnVyXJndyIA8uiOW/CwW5hP/GsrrzV1UGNHNSAw=",

     

       139
        
               "owner": "RyanGibb",

     

       140
        
               "repo": "eilean-nix",

     

       141
       -
               "rev": "bba3719f32b57b853247e299ea44500938d69166",

     

       142
        
               "type": "github"

     

       143
        
             },

     

       144
        
             "original": {

     
···

       450
        
               ]

     

       451
        
             },

     

       452
        
             "locked": {

     

       453
       -
               "lastModified": 1726989464,

     

       454
       -
               "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",

     

       455
        
               "owner": "nix-community",

     

       456
        
               "repo": "home-manager",

     

       457
       -
               "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",

     

       458
        
               "type": "github"

     

       459
        
             },

     

       460
        
             "original": {

     

       461
        
               "owner": "nix-community",

     

       462
       -
               "ref": "release-24.05",

     

       463
        
               "repo": "home-manager",

     

       464
        
               "type": "github"

     

       465
        
             }

     
···

       594
        
               "nmd": "nmd_2"

     

       595
        
             },

     

       596
        
             "locked": {

     

       597
       -
               "lastModified": 1709879753,

     

       598
       -
               "narHash": "sha256-zEpy3eweBus/cW/oRMBINps6Bnlazpa7TadonwWibHA=",

     

       599
        
               "owner": "nix-community",

     

       600
        
               "repo": "nix-on-droid",

     

       601
       -
               "rev": "7b3cc6e3f9919b2d23003cfafb60c146c3f45793",

     

       602
        
               "type": "github"

     

       603
        
             },

     

       604
        
             "original": {

     

       605
        
               "owner": "nix-community",

     

       606
       -
               "ref": "release-23.11",

     

       607
        
               "repo": "nix-on-droid",

     

       608
        
               "type": "github"

     

       609
        
             }

     
···

       715
        
           },

     

       716
        
           "nixpkgs-for-bootstrap": {

     

       717
        
             "locked": {

     

       718
       -
               "lastModified": 1708105575,

     

       719
       -
               "narHash": "sha256-sS4AItZeUnAei6v8FqxNlm+/27MPlfoGym/TZP0rmH0=",

     

       720
        
               "owner": "NixOS",

     

       721
        
               "repo": "nixpkgs",

     

       722
       -
               "rev": "1d1817869c47682a6bee85b5b0a6537b6c0fba26",

     

       723
        
               "type": "github"

     

       724
        
             },

     

       725
        
             "original": {

     

       726
        
               "owner": "NixOS",

     

       727
        
               "repo": "nixpkgs",

     

       728
       -
               "rev": "1d1817869c47682a6bee85b5b0a6537b6c0fba26",

     

       729
       -
               "type": "github"

     

       730
       -
             }

     

       731
       -
           },

     

       732
       -
           "nixpkgs-neovim": {

     

       733
       -
             "locked": {

     

       734
       -
               "lastModified": 1721818836,

     

       735
       -
               "narHash": "sha256-oN8i9xd91okESBjp2LqXpVI61x3X23F3Y/FIS8bv4Xo=",

     

       736
       -
               "owner": "nixos",

     

       737
       -
               "repo": "nixpkgs",

     

       738
       -
               "rev": "a76212122970925d09aa2021a93e00d359e631dd",

     

       739
       -
               "type": "github"

     

       740
       -
             },

     

       741
       -
             "original": {

     

       742
       -
               "owner": "nixos",

     

       743
       -
               "repo": "nixpkgs",

     

       744
       -
               "rev": "a76212122970925d09aa2021a93e00d359e631dd",

     

       745
        
               "type": "github"

     

       746
        
             }

     

       747
        
           },

     
···

       841
        
           },

     

       842
        
           "nixpkgs_7": {

     

       843
        
             "locked": {

     

       844
       -
               "lastModified": 1731797254,

     

       845
       -
               "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=",

     

       846
        
               "owner": "nixos",

     

       847
        
               "repo": "nixpkgs",

     

       848
       -
               "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59",

     

       849
        
               "type": "github"

     

       850
        
             },

     

       851
        
             "original": {

     

       852
        
               "owner": "nixos",

     

       853
       -
               "ref": "nixos-24.05",

     

       854
        
               "repo": "nixpkgs",

     

       855
        
               "type": "github"

     

       856
        
             }

     
···

       1097
        
               "nix-rpi5": "nix-rpi5",

     

       1098
        
               "nixos-hardware": "nixos-hardware",

     

       1099
        
               "nixpkgs": "nixpkgs_7",

     

       1100
       -
               "nixpkgs-neovim": "nixpkgs-neovim",

     

       1101
        
               "nixpkgs-unstable": "nixpkgs-unstable"

     

       1102
        
             }

     

       1103
        
           },

···

       134
        
               ]

     

       135
        
             },

     

       136
        
             "locked": {

     

       137
       +
               "lastModified": 1733054177,

     

       138
       +
               "narHash": "sha256-Jq/EAXsXO1Ul5iqLx71H2/ffGvmE3GTWDlujpbwdXIY=",

     

       139
        
               "owner": "RyanGibb",

     

       140
        
               "repo": "eilean-nix",

     

       141
       +
               "rev": "7b05921dc47248b4a87cba67a1e53a642adee1fc",

     

       142
        
               "type": "github"

     

       143
        
             },

     

       144
        
             "original": {

     
···

       450
        
               ]

     

       451
        
             },

     

       452
        
             "locked": {

     

       453
       +
               "lastModified": 1732466619,

     

       454
       +
               "narHash": "sha256-T1e5oceypZu3Q8vzICjv1X/sGs9XfJRMW5OuXHgpB3c=",

     

       455
        
               "owner": "nix-community",

     

       456
        
               "repo": "home-manager",

     

       457
       +
               "rev": "f3111f62a23451114433888902a55cf0692b408d",

     

       458
        
               "type": "github"

     

       459
        
             },

     

       460
        
             "original": {

     

       461
        
               "owner": "nix-community",

     

       462
       +
               "ref": "release-24.11",

     

       463
        
               "repo": "home-manager",

     

       464
        
               "type": "github"

     

       465
        
             }

     
···

       594
        
               "nmd": "nmd_2"

     

       595
        
             },

     

       596
        
             "locked": {

     

       597
       +
               "lastModified": 1720396533,

     

       598
       +
               "narHash": "sha256-UFzk/hZWO1VkciIO5UPaSpJN8s765wsngUSvtJM6d5Q=",

     

       599
        
               "owner": "nix-community",

     

       600
        
               "repo": "nix-on-droid",

     

       601
       +
               "rev": "f3d3b8294039f2f9a8fb7ea82c320f29c6b0fe25",

     

       602
        
               "type": "github"

     

       603
        
             },

     

       604
        
             "original": {

     

       605
        
               "owner": "nix-community",

     

       606
       +
               "ref": "release-24.05",

     

       607
        
               "repo": "nix-on-droid",

     

       608
        
               "type": "github"

     

       609
        
             }

     
···

       715
        
           },

     

       716
        
           "nixpkgs-for-bootstrap": {

     

       717
        
             "locked": {

     

       718
       +
               "lastModified": 1720244366,

     

       719
       +
               "narHash": "sha256-WrDV0FPMVd2Sq9hkR5LNHudS3OSMmUrs90JUTN+MXpA=",

     

       720
        
               "owner": "NixOS",

     

       721
        
               "repo": "nixpkgs",

     

       722
       +
               "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40",

     

       723
        
               "type": "github"

     

       724
        
             },

     

       725
        
             "original": {

     

       726
        
               "owner": "NixOS",

     

       727
        
               "repo": "nixpkgs",

     

       728
       +
               "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40",

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       729
        
               "type": "github"

     

       730
        
             }

     

       731
        
           },

     
···

       825
        
           },

     

       826
        
           "nixpkgs_7": {

     

       827
        
             "locked": {

     

       828
       +
               "lastModified": 1732981179,

     

       829
       +
               "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=",

     

       830
        
               "owner": "nixos",

     

       831
        
               "repo": "nixpkgs",

     

       832
       +
               "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65",

     

       833
        
               "type": "github"

     

       834
        
             },

     

       835
        
             "original": {

     

       836
        
               "owner": "nixos",

     

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

     

       838
        
               "repo": "nixpkgs",

     

       839
        
               "type": "github"

     

       840
        
             }

     
···

       1081
        
               "nix-rpi5": "nix-rpi5",

     

       1082
        
               "nixos-hardware": "nixos-hardware",

     

       1083
        
               "nixpkgs": "nixpkgs_7",

     

       0
        
       
     

       1084
        
               "nixpkgs-unstable": "nixpkgs-unstable"

     

       1085
        
             }

     

       1086
        
           },

+6 -33

flake.nix

···

       1
        
       {

     

       2
        
         inputs = {

     

       3
       -
           nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";

     

       4
        
           nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";

     

       5
       -
           nixpkgs-neovim.url =

     

       6
       -
             "github:nixos/nixpkgs/a76212122970925d09aa2021a93e00d359e631dd";

     

       7
        
           nixos-hardware.url = "github:nixos/nixos-hardware";

     

       8
       -
           home-manager.url = "github:nix-community/home-manager/release-24.05";

     

       9
        
           home-manager-unstable.url = "github:nix-community/home-manager/master";

     

       10
        
           agenix.url = "github:ryantm/agenix";

     

       11
        
           deploy-rs.url = "github:serokell/deploy-rs";

     

       12
       -
           nix-on-droid.url = "github:nix-community/nix-on-droid/release-23.11";

     

       13
        
           eon.url = "github:RyanGibb/eon";

     

       14
        
           eilean.url = "github:RyanGibb/eilean-nix/main";

     

       15
        
           alec-website.url = "github:alexanderhthompson/website";

     
···

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

     

       35
        
         };

     

       36
        
       

     

       37
       -
         outputs = { self, nixpkgs, nixpkgs-unstable, nixpkgs-neovim, home-manager

     

       38
        
           , home-manager-unstable, agenix, deploy-rs, nix-on-droid, eilean, ...

     

       39
        
           }@inputs:

     

       40
        
           let

     
···

       55
        
                   # to override attributes of a package

     

       56
        
                   # package = prev.package.overrideAttrs

     

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

     

       58
       -
                   neovim-unwrapped =

     

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

     

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

     

       61
       -
                     libdrm = prev.libdrm;

     

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

     

       63
       -
                       # for libdrm >=2.4.120

     

       64
       -
                       mesa = prev.mesa;

     

       65
       -
                       wayland-protocols = prev.wayland-protocols.overrideAttrs

     

       66
       -
                         (old: rec {

     

       67
       -
                           pname = "wayland-protocols";

     

       68
       -
                           version = "1.33";

     

       69
       -
                           src = prev.fetchurl {

     

       70
       -
                             url =

     

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

     

       72
       -
                             hash =

     

       73
       -
                               "sha256-lPDFCwkNbmGgP2IEhGexmrvoUb5OEa57NvZfi5jDljo=";

     

       74
       -
                           };

     

       75
       -
                         });

     

       76
       -
                     };

     

       77
       -
                   };

     

       78
       -
                   gnome-calendar = final.overlay-unstable.gnome-calendar;

     

       79
        
                   opam = final.overlay-unstable.opam.overrideAttrs (_: {

     

       80
        
                     src = final.fetchurl {

     

       81
        
                       url =

     
···

       91
        
             nixosConfigurations = let

     

       92
        
               mkMode = mode: host:

     

       93
        
                 let

     

       94
       -
                   host-nixpkgs =

     

       95
       -
                     if host == "elephant" then nixpkgs-unstable else nixpkgs;

     

       96
       -
                   host-home-manager = if host == "elephant" then

     

       97
       -
                     home-manager-unstable

     

       98
       -
                   else

     

       99
       -
                     home-manager;

     

       100
        
                 in host-nixpkgs.lib.nixosSystem {

     

       101
        
                   # use system from config.localSystem

     

       102
        
                   # see https://github.com/NixOS/nixpkgs/blob/5297d584bcc5f95c8e87c631813b4e2ab7f19ecc/nixos/lib/eval-config.nix#L55

···

       1
        
       {

     

       2
        
         inputs = {

     

       3
       +
           nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";

     

       4
        
           nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";

     

       0
        
       
     

       0
        
       
     

       5
        
           nixos-hardware.url = "github:nixos/nixos-hardware";

     

       6
       +
           home-manager.url = "github:nix-community/home-manager/release-24.11";

     

       7
        
           home-manager-unstable.url = "github:nix-community/home-manager/master";

     

       8
        
           agenix.url = "github:ryantm/agenix";

     

       9
        
           deploy-rs.url = "github:serokell/deploy-rs";

     

       10
       +
           nix-on-droid.url = "github:nix-community/nix-on-droid/release-24.05";

     

       11
        
           eon.url = "github:RyanGibb/eon";

     

       12
        
           eilean.url = "github:RyanGibb/eilean-nix/main";

     

       13
        
           alec-website.url = "github:alexanderhthompson/website";

     
···

       32
        
           hyperbib-eeg.inputs.nixpkgs.follows = "nixpkgs";

     

       33
        
         };

     

       34
        
       

     

       35
       +
         outputs = { self, nixpkgs, nixpkgs-unstable, home-manager

     

       36
        
           , home-manager-unstable, agenix, deploy-rs, nix-on-droid, eilean, ...

     

       37
        
           }@inputs:

     

       38
        
           let

     
···

       53
        
                   # to override attributes of a package

     

       54
        
                   # package = prev.package.overrideAttrs

     

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

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       56
        
                   opam = final.overlay-unstable.opam.overrideAttrs (_: {

     

       57
        
                     src = final.fetchurl {

     

       58
        
                       url =

     
···

       68
        
             nixosConfigurations = let

     

       69
        
               mkMode = mode: host:

     

       70
        
                 let

     

       71
       +
                   host-nixpkgs = nixpkgs;

     

       72
       +
                   host-home-manager = home-manager;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       73
        
                 in host-nixpkgs.lib.nixosSystem {

     

       74
        
                   # use system from config.localSystem

     

       75
        
                   # see https://github.com/NixOS/nixpkgs/blob/5297d584bcc5f95c8e87c631813b4e2ab7f19ecc/nixos/lib/eval-config.nix#L55

+1 -1

home/gui.nix

···

       32
        
             };

     

       33
        
             pointerCursor = {

     

       34
        
               name = "Adwaita";

     

       35
       -
               package = pkgs.gnome.adwaita-icon-theme;

     

       36
        
               size = 32;

     

       37
        
             };

     

       38
        
             file = {

···

       32
        
             };

     

       33
        
             pointerCursor = {

     

       34
        
               name = "Adwaita";

     

       35
       +
               package = pkgs.adwaita-icon-theme;

     

       36
        
               size = 32;

     

       37
        
             };

     

       38
        
             file = {

+2 -2

home/i3.nix

···

       19
        
           displays = "arandr";

     

       20
        
           bar = "i3bar";

     

       21
        
           notification_deamon = "dunst";

     

       22
       -
           i3-workspace-history = "${i3-workspace-history}";

     

       23
       -
           i3-workspace-history-args = "";

     

       24
        
         };

     

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

     

       26
        
         cfg = config.custom.gui.i3;

···

       19
        
           displays = "arandr";

     

       20
        
           bar = "i3bar";

     

       21
        
           notification_deamon = "dunst";

     

       22
       +
           i3_workspace_history = "${i3-workspace-history}";

     

       23
       +
           i3_workspace_history_args = "";

     

       24
        
         };

     

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

     

       26
        
         cfg = config.custom.gui.i3;

+1 -1

home/nvim/default.nix

···

       61
        
             vimAlias = true;

     

       62
        
             extraPackages = with pkgs;

     

       63
        
               [ ripgrep nixd ] ++ lib.lists.optionals cfg.nvim-lsps [

     

       64
       -
                 nixfmt

     

       65
        
                 # stop complaining when launching but a devshell is better

     

       66
        
                 ocamlPackages.ocaml-lsp

     

       67
        
                 ocamlPackages.ocamlformat

···

       61
        
             vimAlias = true;

     

       62
        
             extraPackages = with pkgs;

     

       63
        
               [ ripgrep nixd ] ++ lib.lists.optionals cfg.nvim-lsps [

     

       64
       +
                 nixfmt-rfc-style

     

       65
        
                 # stop complaining when launching but a devshell is better

     

       66
        
                 ocamlPackages.ocaml-lsp

     

       67
        
                 ocamlPackages.ocamlformat

+1 -1

home/nvim/lsp.lua

···

       37
        
       local lspconfig = require('lspconfig')

     

       38
        
       

     

       39
        
       -- Enable some language servers with the additional completion capabilities offered by nvim-cmp

     

       40
       -
       local servers = { 'nixd', 'ocamllsp', 'clangd', 'rust_analyzer', 'pyright', 'tsserver', 'gopls', 'typst_lsp' }

     

       41
        
       for _, lsp in ipairs(servers) do

     

       42
        
       	lspconfig[lsp].setup {

     

       43
        
       		on_attach = On_attach,

···

       37
        
       local lspconfig = require('lspconfig')

     

       38
        
       

     

       39
        
       -- Enable some language servers with the additional completion capabilities offered by nvim-cmp

     

       40
       +
       local servers = { 'nixd', 'ocamllsp', 'clangd', 'rust_analyzer', 'pyright', 'gopls', 'typst_lsp' }

     

       41
        
       for _, lsp in ipairs(servers) do

     

       42
        
       	lspconfig[lsp].setup {

     

       43
        
       		on_attach = On_attach,

+2 -2

home/sway.nix

···

       21
        
           displays = "wdisplays";

     

       22
        
           bar = "swaybar";

     

       23
        
           notification_deamon = "dunst";

     

       24
       -
           i3-workspace-history = "${i3-workspace-history}";

     

       25
       -
           i3-workspace-history-args = "-sway";

     

       26
        
         };

     

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

     

       28
        
         cfg = config.custom.gui.sway;

···

       21
        
           displays = "wdisplays";

     

       22
        
           bar = "swaybar";

     

       23
        
           notification_deamon = "dunst";

     

       24
       +
           i3_workspace_history = "${i3-workspace-history}";

     

       25
       +
           i3_workspace_history_args = "-sway";

     

       26
        
         };

     

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

     

       28
        
         cfg = config.custom.gui.sway;

+2 -2

home/wm/config.d/bindings

···

       275
        
       

     

       276
        
       bindsym button2 kill

     

       277
        
       

     

       278
       -
       bindsym $mod+i exec i3-workspace-history -mode=forward @i3-workspace-history-args@; exec st workspace -t 500

     

       279
       -
       bindsym $mod+o exec i3-workspace-history -mode=back    @i3-workspace-history-args@; exec st workspace -t 500

     

       280
        
       

     

       281
        
       set $mode_gaps gaps

     

       282
        
       mode "$mode_gaps" {

···

       275
        
       

     

       276
        
       bindsym button2 kill

     

       277
        
       

     

       278
       +
       bindsym $mod+i exec @i3_workspace_history@ -mode=forward @i3_workspace_history_args@; exec st workspace -t 500

     

       279
       +
       bindsym $mod+o exec @i3_workspace_history@ -mode=back    @i3_workspace_history_args@; exec st workspace -t 500

     

       280
        
       

     

       281
        
       set $mode_gaps gaps

     

       282
        
       mode "$mode_gaps" {

+1 -1

home/wm/config.d/exec

···

       6
        
       

     

       7
        
       exec --no-startup-id fcitx5 -d

     

       8
        
       

     

       9
       -
       exec i3-workspace-history @i3-workspace-history-args@

···

       6
        
       

     

       7
        
       exec --no-startup-id fcitx5 -d

     

       8
        
       

     

       9
       +
       exec @i3_workspace_history@ @i3_workspace_history_args@

+2 -2

hosts/elephant/default.nix

···

       49
        
       

     

       50
        
         # Add hardware transcoding support to `ffmpeg_6` and derived packages (like jellyfin-ffmpeg)

     

       51
        
         # for Intel Alder Lake N100's Quick Sync Video (QSV) using Intel OneVPL.

     

       52
       -
         hardware.opengl = {

     

       53
        
           enable = true;

     

       54
        
           extraPackages = with pkgs; [

     

       55
        
             # Video Acceleration API (VA-API) user mode driver

     

       56
        
             intel-media-driver

     

       57
        
             # Intel Video Processing Library (VPL) API runtime implementation

     

       58
        
             # replace with`onevpl-intel-gpu` after https://github.com/NixOS/nixpkgs/pull/264621

     

       59
       -
             onevpl-intel-gpu

     

       60
        
           ];

     

       61
        
         };

     

       62
        
         nixpkgs.config.packageOverrides = prev: {

···

       49
        
       

     

       50
        
         # Add hardware transcoding support to `ffmpeg_6` and derived packages (like jellyfin-ffmpeg)

     

       51
        
         # for Intel Alder Lake N100's Quick Sync Video (QSV) using Intel OneVPL.

     

       52
       +
         hardware.graphics = {

     

       53
        
           enable = true;

     

       54
        
           extraPackages = with pkgs; [

     

       55
        
             # Video Acceleration API (VA-API) user mode driver

     

       56
        
             intel-media-driver

     

       57
        
             # Intel Video Processing Library (VPL) API runtime implementation

     

       58
        
             # replace with`onevpl-intel-gpu` after https://github.com/NixOS/nixpkgs/pull/264621

     

       59
       +
             vpl-gpu-rt

     

       60
        
           ];

     

       61
        
         };

     

       62
        
         nixpkgs.config.packageOverrides = prev: {

-2

hosts/elephant/hardware-configuration.nix

···

       9
        
         boot.kernelModules = [ "kvm-intel" ];

     

       10
        
         boot.extraModulePackages = [ ];

     

       11
        
       

     

       12
       -
         boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;

     

       13
       -
       

     

       14
        
         fileSystems."/" = {

     

       15
        
           device = "/dev/disk/by-uuid/d1b7f032-9c43-4a57-b531-4b1d6f88c999";

     

       16
        
           fsType = "ext4";

···

       9
        
         boot.kernelModules = [ "kvm-intel" ];

     

       10
        
         boot.extraModulePackages = [ ];

     

       11
        
       

     

       0
        
       
     

       0
        
       
     

       12
        
         fileSystems."/" = {

     

       13
        
           device = "/dev/disk/by-uuid/d1b7f032-9c43-4a57-b531-4b1d6f88c999";

     

       14
        
           fsType = "ext4";

+1 -1

hosts/elephant/owntracks.nix

···

       21
        
             default = 8083;

     

       22
        
           };

     

       23
        
           domain = lib.mkOption {

     

       24
       -
             type = lib.types.nullOr lib.types.string;

     

       25
        
             default = null;

     

       26
        
           };

     

       27
        
         };

···

       21
        
             default = 8083;

     

       22
        
           };

     

       23
        
           domain = lib.mkOption {

     

       24
       +
             type = lib.types.nullOr lib.types.str;

     

       25
        
             default = null;

     

       26
        
           };

     

       27
        
         };

+6 -8

hosts/elephant/services.nix

···

       28
        
           virtualHosts = {

     

       29
        
             "nix-cache.vpn.freumh.org" = { listenAddresses = [ "100.64.0.9" ]; };

     

       30
        
             "jellyfin.vpn.freumh.org" = {

     

       31
       -
               enableSSL = true;

     

       32
        
               listenAddresses = [ "100.64.0.9" ];

     

       33
        
               locations."/" = {

     

       34
        
                 proxyPass = ''

     
···

       38
        
               };

     

       39
        
             };

     

       40
        
             "transmission.vpn.freumh.org" = {

     

       41
       -
               enableSSL = true;

     

       42
        
               listenAddresses = [ "100.64.0.9" ];

     

       43
        
               locations."/" = {

     

       44
        
                 proxyPass = with config.services.transmission.settings; ''

     
···

       47
        
               };

     

       48
        
             };

     

       49
        
             "nextcloud.vpn.freumh.org" = {

     

       50
       -
               enableSSL = true;

     

       51
        
               listenAddresses = [ "100.64.0.9" ];

     

       52
        
             };

     

       53
        
             "owntracks.vpn.freumh.org" = {

     

       54
       -
               enableSSL = true;

     

       55
        
               listenAddresses = [ "100.64.0.9" ];

     

       56
        
             };

     

       57
        
             "immich.vpn.freumh.org" = {

     

       58
       -
               enableSSL = true;

     

       59
        
               listenAddresses = [ "100.64.0.9" ];

     

       60
        
               locations."/" = {

     

       61
        
                 proxyPass = with config.services.immich; ''

     
···

       94
        
         services.samba = {

     

       95
        
           enable = true;

     

       96
        
           openFirewall = true;

     

       97
       -
           securityType = "user";

     

       98
        
           settings = {

     

       99
        
             global = {

     

       100
        
               workgroup = "WORKGROUP";

     
···

       110
        
               "guest account" = "nobody";

     

       111
        
               "map to guest" = "bad user";

     

       112
        
             };

     

       113
       -
           };

     

       114
       -
           shares = {

     

       115
        
             tank = {

     

       116
        
               path = "/tank/";

     

       117
        
               browseable = "yes";

     
···

       140
        
         services.transmission = {

     

       141
        
           enable = true;

     

       142
        
           openRPCPort = true;

     

       0
        
       
     

       143
        
           settings = {

     

       144
        
             download-dir = "/tank/media";

     

       145
        
             incomplete-dir-enabled = false;

···

       28
        
           virtualHosts = {

     

       29
        
             "nix-cache.vpn.freumh.org" = { listenAddresses = [ "100.64.0.9" ]; };

     

       30
        
             "jellyfin.vpn.freumh.org" = {

     

       31
       +
               onlySSL = true;

     

       32
        
               listenAddresses = [ "100.64.0.9" ];

     

       33
        
               locations."/" = {

     

       34
        
                 proxyPass = ''

     
···

       38
        
               };

     

       39
        
             };

     

       40
        
             "transmission.vpn.freumh.org" = {

     

       41
       +
               onlySSL = true;

     

       42
        
               listenAddresses = [ "100.64.0.9" ];

     

       43
        
               locations."/" = {

     

       44
        
                 proxyPass = with config.services.transmission.settings; ''

     
···

       47
        
               };

     

       48
        
             };

     

       49
        
             "nextcloud.vpn.freumh.org" = {

     

       50
       +
               onlySSL = true;

     

       51
        
               listenAddresses = [ "100.64.0.9" ];

     

       52
        
             };

     

       53
        
             "owntracks.vpn.freumh.org" = {

     

       54
       +
               onlySSL = true;

     

       55
        
               listenAddresses = [ "100.64.0.9" ];

     

       56
        
             };

     

       57
        
             "immich.vpn.freumh.org" = {

     

       58
       +
               onlySSL = true;

     

       59
        
               listenAddresses = [ "100.64.0.9" ];

     

       60
        
               locations."/" = {

     

       61
        
                 proxyPass = with config.services.immich; ''

     
···

       94
        
         services.samba = {

     

       95
        
           enable = true;

     

       96
        
           openFirewall = true;

     

       0
        
       
     

       97
        
           settings = {

     

       98
        
             global = {

     

       99
        
               workgroup = "WORKGROUP";

     
···

       109
        
               "guest account" = "nobody";

     

       110
        
               "map to guest" = "bad user";

     

       111
        
             };

     

       0
        
       
     

       0
        
       
     

       112
        
             tank = {

     

       113
        
               path = "/tank/";

     

       114
        
               browseable = "yes";

     
···

       137
        
         services.transmission = {

     

       138
        
           enable = true;

     

       139
        
           openRPCPort = true;

     

       140
       +
           package = pkgs.transmission_3;

     

       141
        
           settings = {

     

       142
        
             download-dir = "/tank/media";

     

       143
        
             incomplete-dir-enabled = false;

+4 -4

hosts/gecko/default.nix

···

       50
        
       

     

       51
        
         environment.systemPackages = with pkgs; [

     

       52
        
           dell-command-configure

     

       53
       -
           gnome.file-roller

     

       54
        
           unzip

     

       55
       -
           gnome.cheese

     

       56
        
           gparted

     

       57
        
           chromium

     

       58
        
           calibre

     
···

       71
        
           evince

     

       72
        
           pdfpc

     

       73
        
           krop

     

       74
       -
           transmission

     

       75
       -
           transmission-gtk

     

       76
        
           libreoffice

     

       77
        
           obs-studio

     

       78
        
           xournalpp

···

       50
        
       

     

       51
        
         environment.systemPackages = with pkgs; [

     

       52
        
           dell-command-configure

     

       53
       +
           file-roller

     

       54
        
           unzip

     

       55
       +
           cheese

     

       56
        
           gparted

     

       57
        
           chromium

     

       58
        
           calibre

     
···

       71
        
           evince

     

       72
        
           pdfpc

     

       73
        
           krop

     

       74
       +
           transmission_4

     

       75
       +
           transmission_4-gtk

     

       76
        
           libreoffice

     

       77
        
           obs-studio

     

       78
        
           xournalpp

+5 -8

hosts/owl/default.nix

···

       93
        
           owner = "${config.systemd.services.matrix-synapse.serviceConfig.User}";

     

       94
        
           group = "${config.systemd.services.matrix-synapse.serviceConfig.Group}";

     

       95
        
         };

     

       96
       -
         age.secrets.matrix-sliding-sync = {

     

       97
       -
           file = ../../secrets/matrix-sliding-sync.age;

     

       98
       -
         };

     

       99
        
         eilean.matrix = {

     

       100
        
           enable = true;

     

       101
        
           registrationSecretFile = config.age.secrets.matrix-shared-secret.path;

     
···

       103
        
           bridges.signal = true;

     

       104
        
           bridges.instagram = true;

     

       105
        
           bridges.messenger = true;

     

       106
       -
           slidingSync = {

     

       107
       -
             enable = true;

     

       108
       -
             secretFile = config.age.secrets.matrix-sliding-sync.path;

     

       109
       -
           };

     

       110
        
         };

     

       111
        
         eilean.turn.enable = true;

     

       112
        
         eilean.mastodon.enable = true;

     
···

       412
        
           "net.ipv6.conf.all.forwarding" = 1;

     

       413
        
         };

     

       414
        
       

     

       415
       -
         services.headscale.settings.dns_config.extra_records = vpnRecords;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       416
        
       

     

       417
        
         age.secrets.restic-owl.file = ../../secrets/restic-owl.age;

     

       418
        
         services.restic.backups.${config.networking.hostName} = {

···

       93
        
           owner = "${config.systemd.services.matrix-synapse.serviceConfig.User}";

     

       94
        
           group = "${config.systemd.services.matrix-synapse.serviceConfig.Group}";

     

       95
        
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       96
        
         eilean.matrix = {

     

       97
        
           enable = true;

     

       98
        
           registrationSecretFile = config.age.secrets.matrix-shared-secret.path;

     
···

       100
        
           bridges.signal = true;

     

       101
        
           bridges.instagram = true;

     

       102
        
           bridges.messenger = true;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       103
        
         };

     

       104
        
         eilean.turn.enable = true;

     

       105
        
         eilean.mastodon.enable = true;

     
···

       405
        
           "net.ipv6.conf.all.forwarding" = 1;

     

       406
        
         };

     

       407
        
       

     

       408
       +
         services.headscale.settings.dns = {

     

       409
       +
           extra_records = vpnRecords;

     

       410
       +
           base_domain = "vpn.freumh.org";

     

       411
       +
           nameservers.global = config.networking.nameservers;

     

       412
       +
         };

     

       413
        
       

     

       414
        
         age.secrets.restic-owl.file = ../../secrets/restic-owl.age;

     

       415
        
         services.restic.backups.${config.networking.hostName} = {

+3 -1

hosts/shrew/hardware-configuration.nix

···

       36
        
         powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";

     

       37
        
       

     

       38
        
         hardware.raspberry-pi."4".fkms-3d.enable = true;

     

       39
       -
         boot.loader.raspberryPi.firmwareConfig = "config_hdmi_boost=5";

     

       0
        
       
     

       0
        
       
     

       40
        
       

     

       41
        
         nixpkgs.hostPlatform = "aarch64-linux";

     

       42
        
       }

···

       36
        
         powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";

     

       37
        
       

     

       38
        
         hardware.raspberry-pi."4".fkms-3d.enable = true;

     

       39
       +
         # TODO use https://github.com/nix-community/raspberry-pi-nix?tab=readme-ov-file#configtxt-generation

     

       40
       +
         # https://github.com/NixOS/nixpkgs/pull/241534#issuecomment-2495645336

     

       41
       +
         #boot.loader.raspberryPi.firmwareConfig = "config_hdmi_boost=5";

     

       42
        
       

     

       43
        
         nixpkgs.hostPlatform = "aarch64-linux";

     

       44
        
       }

+2 -2

hosts/vulpine/default.nix

···

       41
        
       

     

       42
        
         environment.systemPackages = with pkgs; [

     

       43
        
           pciutils

     

       44
       -
           gnome.file-roller

     

       45
        
           unzip

     

       46
       -
           gnome.cheese

     

       47
        
           chromium

     

       48
        
           calibre

     

       49
        
           zotero

···

       41
        
       

     

       42
        
         environment.systemPackages = with pkgs; [

     

       43
        
           pciutils

     

       44
       +
           file-roller

     

       45
        
           unzip

     

       46
       +
           cheese

     

       47
        
           chromium

     

       48
        
           calibre

     

       49
        
           zotero

+2 -1

modules/gui/default.nix

···

       17
        
           i18n = {

     

       18
        
             defaultLocale = "en_GB.UTF-8";

     

       19
        
             inputMethod = {

     

       20
       -
               enabled = "fcitx5";

     

       0
        
       
     

       21
        
               fcitx5.addons = with pkgs; [

     

       22
        
                 fcitx5-rime

     

       23
        
                 fcitx5-chinese-addons

···

       17
        
           i18n = {

     

       18
        
             defaultLocale = "en_GB.UTF-8";

     

       19
        
             inputMethod = {

     

       20
       +
               enable = true;

     

       21
       +
               type = "fcitx5";

     

       22
        
               fcitx5.addons = with pkgs; [

     

       23
        
                 fcitx5-rime

     

       24
        
                 fcitx5-chinese-addons

+3 -1

modules/gui/i3.nix

···

       34
        
             xf86_input_wacom

     

       35
        
           ];

     

       36
        
       

     

       0
        
       
     

       0
        
       
     

       37
        
           xdg.portal = {

     

       38
        
             enable = true;

     

       39
        
             wlr.enable = true;

     

       40
       -
             gtkUsePortal = false;

     

       41
        
           };

     

       42
        
       

     

       43
        
           services.geoclue2.appConfig.redshift = {

···

       34
        
             xf86_input_wacom

     

       35
        
           ];

     

       36
        
       

     

       37
       +
           # TODO read this

     

       38
       +
           # https://github.com/flatpak/xdg-desktop-portal/blob/1.18.1/doc/portals.conf.rst.in

     

       39
        
           xdg.portal = {

     

       40
        
             enable = true;

     

       41
        
             wlr.enable = true;

     

       42
       +
             config.common.default = "*";

     

       43
        
           };

     

       44
        
       

     

       45
        
           services.geoclue2.appConfig.redshift = {

+3 -1

modules/gui/sway.nix

···

       34
        
             ];

     

       35
        
           };

     

       36
        
       

     

       0
        
       
     

       0
        
       
     

       37
        
           xdg.portal = {

     

       38
        
             enable = true;

     

       39
        
             wlr.enable = true;

     

       40
       -
             gtkUsePortal = false;

     

       41
        
           };

     

       42
        
       

     

       43
        
           services.geoclue2.appConfig.gammastep = {

···

       34
        
             ];

     

       35
        
           };

     

       36
        
       

     

       37
       +
           # TODO read this

     

       38
       +
           # https://github.com/flatpak/xdg-desktop-portal/blob/1.18.1/doc/portals.conf.rst.in

     

       39
        
           xdg.portal = {

     

       40
        
             enable = true;

     

       41
        
             wlr.enable = true;

     

       42
       +
             config.common.default = "*";

     

       43
        
           };

     

       44
        
       

     

       45
        
           services.geoclue2.appConfig.gammastep = {

-7

secrets/matrix-sliding-sync.age

···

       1
       -
       age-encryption.org/v1

     

       2
       -
       -> ssh-ed25519 2wDnOw yIGmMdEnqCDU+aJKKDd1pCHi/sNKDqKWD40Otgpzzhc

     

       3
       -
       XzXUgmSfXdam//SxQRGIQEhwXVnzBaO95tDlUavkcvw

     

       4
       -
       -> ssh-ed25519 suwb0g PtiPoAcltY6fV6eDGIu0UHBLd6nrf9fHlQTiA3U5tk4

     

       5
       -
       KTCz34YWgak1vRzp1s8tS+uU3WCdLNf3Oj/SMuXSyno

     

       6
       -
       --- nrf3xTg5+L32y7n8VHZEcNCkB9aDbgc8pNVvT22jwxI

     

       7
       -
       �G�i91_���4M�c�I�-m_<�Bk"!������{wi!��#W�غ�L�4r���3����
m�8voe�CO��0�jάg� �?���"����x͸.���RՊ���܅L��

-1

secrets/secrets.nix

···

       31
        
         "eon-capnp.age".publicKeys = user ++ [ owl ];

     

       32
        
         "eon-vpn.freumh.org.cap.age".publicKeys = user ++ [ elephant ];

     

       33
        
         "eon-sirref-primary.cap.age".publicKeys = user ++ [ owl ];

     

       34
       -
         "matrix-sliding-sync.age".publicKeys = user ++ [ owl ];

     

       35
        
       }

···

       31
        
         "eon-capnp.age".publicKeys = user ++ [ owl ];

     

       32
        
         "eon-vpn.freumh.org.cap.age".publicKeys = user ++ [ elephant ];

     

       33
        
         "eon-sirref-primary.cap.age".publicKeys = user ++ [ owl ];

     

       0
        
       
     

       34
        
       }