nrabulinski/nix-config - Change YVZDXEX34EVRGBLOY4LIDKPFZVMTINZQ5UCAJVDMYSBWIDFPNBQQC

Modularization

Created by nrabulinski on November 4, 2022

YVZDXEX34EVRGBLOY4LIDKPFZVMTINZQ5UCAJVDMYSBWIDFPNBQQC

Dependencies

In channels

main

Change contents

Insertion in nixos/scaleway.nix at line 9 [3.3558]
[3.3708]
[3.3708]
```
  boot.supportedFilesystems = [ "btrfs" ];
```

Insertion in nixos/scaleway.nix at line 14 [3.3558]

[3.3935]

  fileSystems."/nix" = {
    device = "/dev/sda";
    fsType = "btrfs";
    options = [ "compress=zstd" "noatime" ];
  };

Replacement in nixos/scaleway.nix at line 34 [3.3558]

B:BD[3.4500] → [3.4500:4566]

  environment.systemPackages = with pkgs; [ vim kitty.terminfo ];

[3.4500]

[3.4566]

  environment.systemPackages = with pkgs; [ 
    vim 
    foot.terminfo 
    alacritty.terminfo
  ];
  
  mailserver = {
    enable = true;
    fqdn = "mail.nrab.lol";
    domains = [ "nrab.lol" ];
    
    # nix run nixpkgs.apacheHttpd -c htpasswd -nbB "" "super secret password" | cut -d: -f2
    loginAccounts = {
      "1337@nrab.lol" = {
        hashedPasswordFile = pkgs.copyPathToStore ../assets/leetpassword;
      };
    };
    
    certificateScheme = 3;
  };
  security.acme = {
    acceptTerms = true;
    defaults.email = "nikodem@rabulinski.com";
  };

Insertion in nixos/legion.nix at line 34 [4.10258]
[4.11020]
[4.11020]
```
  hardware.opentabletdriver.enable = true;
```
Replacement in nixos/common.nix at line 6 [5.3274]
B:BD[5.3311] → [4.9662:9692]
```
    package = pkgs.nixFlakes;
```
[5.3311]
[5.3343]
```
    package = pkgs.nixVersions.stable;
```

File deletion: rust.nix

BF:BFD[5.1324] → [5.2362:2394]

BF:BFD[5.2394] → [5.1574:1574]

∅:D[3.8975] → [5.1609:1803]

∅:D[4.9187] → [5.1609:1803]

B:BD[5.1609] → [5.1609:1803]

∅:D[3.8981] → [6.3290:3355]

B:BD[5.1808] → [6.3290:3355]

∅:D[6.3355] → [5.1877:1878]

B:BD[5.1877] → [5.1877:1878]

∅:D[3.9147] → [4.9350:9390]

B:BD[4.9350] → [4.9350:9390]

B:BD[4.9390] → [3.9148:9246]

∅:D[3.9246] → [5.2196:2203]

∅:D[4.9482] → [5.2196:2203]

B:BD[5.2196] → [5.2196:2203]

∅:D[4.9489] → [5.2208:2229]

B:BD[5.2208] → [5.2208:2229]

∅:D[4.9631] → [5.2354:2361]

B:BD[5.2354] → [5.2354:2361]

B:BD[5.2229] → [4.9490:9539]

∅:D[3.9326] → [4.9616:9631]

B:BD[4.9616] → [4.9616:9631]

B:BD[4.9539] → [3.9247:9326]

B:BD[5.2203] → [4.9483:9489]

B:BD[5.1878] → [3.8982:9147]

B:BD[5.1803] → [3.8976:8981]

B:BD[5.1574] → [4.9102:9141]

B:BD[4.9141] → [3.8934:8975]

  rustToolchain = pkgs.fenix.complete.withComponents [
    "cargo"
    "clippy"
    "llvm-tools-preview"
    "rust-analyzer-preview"
    "rust-src"
    "rust-std"
    "rustc"
    "rustfmt"
  ];
  nixpkgs.overlays = lib.optional (fenix != null) fenix.overlay;
    target.x86_64-unknown-linux-gnu = {
      # linker = "clang";
      # rustflags = [ "-C" "link-arg=-fuse-ld=${pkgs.mold}/bin/mold" ];
    };
  programs.helix = {
  };
}
    languages = [
      {
        name = "rust";
      }
    ];
        language-server = { command = "${rustToolchain}/bin/rust-analyzer"; };
  };
  home.packages = with pkgs; [ bintools clang lldb rustToolchain mold ];
  home.file.".cargo/config.toml".source = (pkgs.formats.toml { }).generate "cargo-config" {
in
{
# TODO: Only use mold on x86_64-linux.
{ pkgs
, lib
, fenix ? null
, ...
}:
let

Replacement in home-manager/pijul.nix at line 2 [4.8784]
B:BD[3.9344] → [3.9344:9378]
```
  home.packages = [ pkgs.pijul ];
```
[3.9344]
[4.8832]
```
  home.packages = [ pkgs.pijul-wrapped ];
```
Insertion in home-manager/home.nix at line 3 [7.1801]
[3.325625]
[3.325625]
```
, lib
```

Replacement in home-manager/home.nix at line 5 [7.1801]

∅:D[3.325631] → [4.8257:8262]

B:BD[4.8257] → [4.8257:8262]

B:BD[4.8262] → [3.325632:325695]

}: {
  imports = [ ./helix.nix ./nnn.nix ./tmux.nix ./zellij.nix ];

[3.325631]

[4.8289]

}: let
in {
  imports = [
    ./helix.nix
    # ./nnn.nix 
    # ./tmux.nix 
    ./zellij.nix
    ./xplr.nix
  ];

Insertion in home-manager/home.nix at line 19 [7.1801]
[3.325764]
[3.325764]
```
    openssh-wrapped
```

Deletion in home-manager/home.nix at line 31 [7.1801]

B:BD[3.325851] → [3.325851:325948]

      let
        gpgUpdateTty = "gpg-connect-agent updatestartuptty /bye > /dev/null";
      in

Deletion in home-manager/home.nix at line 33 [7.1801]

B:BD[3.326006] → [3.326006:326184]

        git = "${gpgUpdateTty} && ${pkgs.git}/bin/git";
        ssh = "${gpgUpdateTty} && ${pkgs.openssh}/bin/ssh";
        pijul = "${gpgUpdateTty} && ${pkgs.pijul}/bin/pijul";

Insertion in home-manager/home.nix at line 61 [7.1801]
[7.2827]
[7.2827]
```
    package = pkgs.git-wrapped;
```

Insertion in home-manager/desktop/xorg/i3.nix at line 13 [4.5200]

[4.5390]

    # Workaround for hiding the titlebar
    # Ref: https://github.com/i3/i3/issues/5149
    extraConfig = ''
      for_window [all] default_border pixel 2
      for_window [all] border pixel 2
    '';

Replacement in home-manager/desktop/wayland/foot.nix at line 1 [3.341623]
B:BD[3.341623] → [3.341624:341634]
```
{ ... }:
```
[3.341623]
[3.341634]
```
{ theme, ... }:
let
  theme' = theme.noHash;
  inherit (theme') bright dark;
in
```

Replacement in home-manager/desktop/wayland/foot.nix at line 11 [3.341623]

B:BD[3.341709] → [3.341709:341771]

        foreground = "E8E3E3";
        background = "151515";

[3.341709]

[3.341771]

        foreground = theme'.primary.foreground;
        background = theme'.primary.background;

Replacement in home-manager/desktop/wayland/foot.nix at line 14 [3.341623]

B:BD[3.341772] → [3.341772:342066]

        regular0 = "151515"; # Black
        regular1 = "B66467"; # Red
        regular2 = "8C977D"; # Green
        regular3 = "D9BC8C"; # Yello
        regular4 = "8DA3B9"; # Blue
        regular5 = "A988B0"; # Magenta
        regular6 = "8AA6A2"; # Cyan
        regular7 = "E8E3E3"; # White

[3.341772]

[3.342066]

        regular0 = dark.black; # Black
        regular1 = dark.red; # Red
        regular2 = dark.green; # Green
        regular3 = dark.yellow; # Yellow
        regular4 = dark.blue; # Blue
        regular5 = dark.magenta; # Magenta
        regular6 = dark.cyan; # Cyan
        regular7 = dark.white; # White

Replacement in home-manager/desktop/wayland/foot.nix at line 23 [3.341623]

B:BD[3.342067] → [3.342067:342353]

        bright0 = "424242"; # Black
        bright1 = "B66467"; # Red
        bright2 = "8C977D"; # Green
        bright3 = "D9BC8C"; # Yello
        bright4 = "8DA3B9"; # Blue
        bright5 = "A988B0"; # Magenta
        bright6 = "8AA6A2"; # Cyan
        bright7 = "E8E3E3"; # White

[3.342067]

[3.342353]

        bright0 = bright.black; # Black
        bright1 = bright.red; # Red
        bright2 = bright.green; # Green
        bright3 = bright.yellow; # Yellow
        bright4 = bright.blue; # Blue
        bright5 = bright.magenta; # Magenta
        bright6 = bright.cyan; # Cyan
        bright7 = bright.white; # White

Replacement in flake.nix at line 18 [7.1162]

B:BD[8.1450] → [2.3104260:3104312]

    nur = {
      url = "github:nix-community/NUR";

[8.1450]

[2.3104312]

    nur.url = "github:nix-community/NUR";
    mailserver = {
      url = "gitlab:simple-nixos-mailserver/nixos-mailserver";

Insertion in flake.nix at line 32 [7.1162]
[2.3104456]
[2.3104456]
```
    , mailserver
```
Insertion in flake.nix at line 50 [7.1162]
[2.3104815]
[2.3104815]
```
              ./home-manager/modules
```
Deletion in flake.nix at line 52 [7.1162]
B:BD[2.3104829] → [2.3104829:3104882]
```
            ++ optional rust ./home-manager/rust.nix
```
Insertion in flake.nix at line 57 [7.1162]
[2.3105158]
[2.3105158]
```
            niko.dev.rust.enable = rust;
```

Replacement in flake.nix at line 60 [7.1162]

B:BD[2.3105169] → [2.3105169:3105219]

      nurpkgs = nixpkgs.legacyPackages.${system};

[2.3105169]

[2.3105219]

      pkgs = nixpkgs.legacyPackages.${system};
      lib = pkgs.callPackage ./lib { };
      theme = lib.mkTheme (import ./theme.nix);

Insertion in flake.nix at line 65 [7.1162]
[2.3105232]
[2.3105232]
```
      inherit lib;
```

Replacement in flake.nix at line 76 [7.1162]

B:BD[7.1637] → [2.3105509:3105598]

      nixosConfigurations.virtualBox = nixpkgs.lib.nixosSystem {
        inherit system;

[7.1637]

[4.3342]

      # nixosConfigurations.virtualBox = nixpkgs.lib.nixosSystem {
      #   inherit system;

Replacement in flake.nix at line 79 [7.1162]

B:BD[4.3343] → [2.3105599:3105640]

        specialArgs = { inherit user; };

[4.3343]

[4.3428]

      #   specialArgs = { inherit user; };

Replacement in flake.nix at line 81 [7.1162]

B:BD[4.3429] → [2.3105641:3106089]

        modules = [
          ./nixos/virtualBox.nix
          ({ ... }: {
            nixpkgs.overlays = [ fenix.overlay ];
          })
          home-manager.nixosModules.home-manager
          {
            home-manager.useGlobalPkgs = true;
            home-manager.useUserPackages = true;
            home-manager.users.${user} = hmConfig {
              rust = true;
              sway = true;
            };
          }
        ];
      };

[4.3429]

[4.3466]

      #   modules = [
      #     ./nixos/virtualBox.nix
      #     home-manager.nixosModules.home-manager
      #     ./nixos/wrappedForGpg.nix
      #     {
      #       nixpkgs.overlays = [ fenix.overlay ];
      #       home-manager.useGlobalPkgs = true;
      #       home-manager.useUserPackages = true;
      #       home-manager.users.${user} = hmConfig {
      #         rust = true;
      #         sway = true;
      #       };
      #     }
      #   ];
      # };

Deletion in flake.nix at line 104 [7.1162]

B:BD[2.3106267] → [2.3106267:3106509]

          ({ ... }: {
            nixpkgs.overlays = [ fenix.overlay ];
            nixpkgs.config.packageOverrides = pkgs: {
              nur = import nur {
                inherit pkgs nurpkgs;
              };
            };
          })

Insertion in flake.nix at line 105 [7.1162]
[2.3106558]
[2.3106558]
```
          ./nixos/wrappedForGpg.nix
```

Insertion in flake.nix at line 107 [7.1162]

[2.3106570]

            nixpkgs.overlays = [ 
              fenix.overlay 
              nur.overlay 
            ];
            nix.registry.nixpkgs.flake = nixpkgs;

Insertion in flake.nix at line 128 [7.1162]

[2.3107164]

            home-manager.extraSpecialArgs = { inherit theme; };

Insertion in flake.nix at line 140 [7.1162]

[2.3107376]

          mailserver.nixosModule
          ./nixos/wrappedForGpg.nix

Insertion in flake.nix at line 151 [7.1162]

[2.3107684]

            home-manager.extraSpecialArgs = { inherit theme; };

Replacement in flake.nix at line 157 [7.1162]
B:BD[2.3107749] → [2.3107749:3107783]
```
        hostname = "51.15.70.96";
```
[2.3107749]
[2.3107783]
```
        hostname = "satelite.vps.nrab.lol";
```

Insertion in flake.nix at line 164 [7.1162]

[2.3107974]

      
      devShell.${system} = pkgs.mkShellNoCC {
        packages = [ pkgs.deploy-rs ];
      };

Insertion in flake.lock at line 3 [7.4]

[7.20]

[2.3108162]

    "blobs": {
      "flake": false,
      "locked": {
        "lastModified": 1604995301,
        "narHash": "sha256-wcLzgLec6SGJA8fx1OEN1yV/Py5b+U5iyYpksUY/yLw=",
        "owner": "simple-nixos-mailserver",
        "repo": "blobs",
        "rev": "2cccdf1ca48316f2cfd1c9a0017e8de5a7156265",
        "type": "gitlab"
      },
      "original": {
        "owner": "simple-nixos-mailserver",
        "repo": "blobs",
        "type": "gitlab"
      }
    },

Replacement in flake.lock at line 49 [7.4]

B:BD[8.162] → [2.3108723:3108833]

        "lastModified": 1663311104,
        "narHash": "sha256-FgFdhRPr/PGB/KXZGXe+alNBW96vzyNj8QIwJTX9pnM=",

[8.162]

[8.272]

        "lastModified": 1667370833,
        "narHash": "sha256-Xqfhr+G34C6YkcwUPFYVTMN+Sbjog14XBbx7ohe/pX4=",

Replacement in flake.lock at line 53 [7.4]

B:BD[8.331] → [2.3108834:3108893]

        "rev": "d5a8751249c2818d85c55506f7c4772179bee41f",

[8.331]

[8.390]

        "rev": "5fe1e430e990d5b0715f82dbd8b6c0cb7086c7e1",

Replacement in flake.lock at line 86 [7.4]

B:BD[7.138] → [2.3109093:3109203]

        "lastModified": 1663328500,
        "narHash": "sha256-7n+J/exp8ky4dmk02y5a9R7CGmJvHpzrHMzfEkMtSWA=",

[7.138]

[7.248]

        "lastModified": 1667347482,
        "narHash": "sha256-KuRYeitjusSdkJ/PeHzPfAIVwVjbtG5v+To6ffy8tiQ=",

Replacement in flake.lock at line 90 [7.4]

B:BD[7.314] → [2.3109204:3109263]

        "rev": "5427f3d1f0ea4357cd4af0bffee7248d640c6ffc",

[7.314]

[7.373]

        "rev": "04e844090ed17298bfbe0f8249109b15770571bc",

Insertion in flake.lock at line 97 [7.4]

[7.518]

      }
    },
    "mailserver": {
      "inputs": {
        "blobs": "blobs",
        "nixpkgs": [
          "nixpkgs"
        ],
        "nixpkgs-22_05": "nixpkgs-22_05",
        "utils": "utils_3"
      },
      "locked": {
        "lastModified": 1658267644,
        "narHash": "sha256-NJRe1rnlF112eZwxNASlRL8/ghwD8g+lpHIYRkWQxC8=",
        "owner": "simple-nixos-mailserver",
        "repo": "nixos-mailserver",
        "rev": "004c229ca44c069d93c92abf67ff1619fb508c6a",
        "type": "gitlab"
      },
      "original": {
        "owner": "simple-nixos-mailserver",
        "repo": "nixos-mailserver",
        "type": "gitlab"

Replacement in flake.lock at line 124 [7.4]

B:BD[7.568] → [2.3109264:3109374]

        "lastModified": 1663178737,
        "narHash": "sha256-ayOtdyoNx6BqJtTYVzdQCDz/YWb67TY/CMGacFCgNQo=",

[7.568]

[7.678]

        "lastModified": 1667231093,
        "narHash": "sha256-RERXruzBEBuf0c7OfZeX1hxEKB+PTCUNxWeB6C1jd8Y=",

Replacement in flake.lock at line 128 [7.4]

B:BD[7.731] → [2.3109375:3109434]

        "rev": "1158501e7c7cba26d922723cf9f70099995eb755",

[7.731]

[7.790]

        "rev": "d40fea9aeb8840fea0d377baa4b38e39b9582458",

Insertion in flake.lock at line 138 [7.4]

[7.970]

[2.3109435]

    "nixpkgs-22_05": {
      "locked": {
        "lastModified": 1654936503,
        "narHash": "sha256-soKzdhI4jTHv/rSbh89RdlcJmrPgH8oMb/PLqiqIYVQ=",
        "owner": "NixOS",
        "repo": "nixpkgs",
        "rev": "dab6df51387c3878cdea09f43589a15729cae9f4",
        "type": "github"
      },
      "original": {
        "id": "nixpkgs",
        "ref": "nixos-22.05",
        "type": "indirect"
      }
    },

Replacement in flake.lock at line 155 [7.4]

B:BD[4.1196] → [2.3109449:3109559]

        "lastModified": 1663330052,
        "narHash": "sha256-jvMr54DdvkwR3WGsT8pS7CRp2qW0HRtFpXExYJ8FoJI=",

[4.1196]

[2.3109559]

        "lastModified": 1667372649,
        "narHash": "sha256-F2tsUn/BbkyRFkOLTcMooZwBVfyjxqzVY1oU2lCVoPs=",

Replacement in flake.lock at line 159 [7.4]

B:BD[2.3109616] → [2.3109616:3109675]

        "rev": "5144a46baaccc807cd6ca6fad428068b05cd8d53",

[2.3109616]

[2.3109675]

        "rev": "1fce06a72e9b1cd602e877d3a0415453fc4bdb9a",

Insertion in flake.lock at line 173 [7.4]
[7.1042]
[2.3109819]
```
        "mailserver": "mailserver",
```

Replacement in flake.lock at line 181 [7.4]

B:BD[8.824] → [2.3109871:3109981]

        "lastModified": 1662896065,
        "narHash": "sha256-1LkSsXzI1JTAmP/GMTz4fTJd8y/tw8R79l96q+h7mu8=",

[8.824]

[8.934]

        "lastModified": 1667322067,
        "narHash": "sha256-PmIrDg9fAZl0XYlSdwMqhutIQxsQpP5YVEiaBeI3NB8=",

Replacement in flake.lock at line 185 [7.4]

B:BD[8.997] → [2.3109982:3110041]

        "rev": "2e9f1204ca01c3e20898d4a67c8b84899d394a88",

[8.997]

[8.1056]

        "rev": "c1305fa5d92640ce847dc8e6aeefd53cb6302dbf",

Replacement in flake.lock at line 212 [7.4]

B:BD[2.3110400] → [2.3110400:3110510]

        "lastModified": 1659877975,
        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",

[2.3110400]

[2.3110510]

        "lastModified": 1667077288,
        "narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=",

Replacement in flake.lock at line 216 [7.4]

B:BD[2.3110569] → [2.3110569:3110628]

        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",

[2.3110569]

[4.2411]

        "rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817",
        "type": "github"
      },
      "original": {
        "owner": "numtide",
        "repo": "flake-utils",

Insertion in flake.lock at line 223 [7.4]

[4.2436]

      }
    },
    "utils_3": {
      "locked": {
        "lastModified": 1605370193,
        "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=",
        "owner": "numtide",
        "repo": "flake-utils",
        "rev": "5021eac20303a61fafe17224c087f5519baed54d",
        "type": "github"

Insertion in .ignore at line 3 [2.3100007]
[2.3100023]
```
assets
.direnv
```