nrabulinski/nix-config - Change ZGEGHEOD2S77CSNWOOFVB7Q3RGOU3WOWDOXJ4S2LKAS2JMS3UAZAC

Bought a macbook

Created by nrabulinski on November 19, 2022

ZGEGHEOD2S77CSNWOOFVB7Q3RGOU3WOWDOXJ4S2LKAS2JMS3UAZAC

Dependencies

In channels

main

Change contents

Replacement in nixos/wrappedForGpg.nix at line 1 [3.42]

B:BD[3.42] → [3.43:1021]

          { pkgs, lib, ...}: let
            gpgUpdateTty = pkgs.writeShellScript "gpgUpdateTty" ''
              ${pkgs.gnupg}/bin/gpg-connect-agent updatestartuptty /bye > /dev/null
            '';
            writeGpgWrapper = pkg: let
              bin = lib.getExe pkg;
              binName = lib.last (lib.splitString "/" bin);
            in pkgs.writeShellScriptBin binName ''
              ${gpgUpdateTty}
              exec ${bin} "$@"
            '';
            wrapForGpg = pkg: pkgs.symlinkJoin {
              name = "${lib.getName pkg}-wrapped-for-gpg";
              paths = [
                (writeGpgWrapper pkg)
                pkg
              ];
            };
          in {
            nixpkgs.overlays = [ 
              (final: prev: {
                openssh-wrapped = wrapForGpg final.openssh;
                git-wrapped = wrapForGpg final.git;
                pijul-wrapped = wrapForGpg final.pijul;
              })
            ];
            }

[3.42]

{ pkgs, lib, ... }:
let
  gpgUpdateTty = pkgs.writeShellScript "gpgUpdateTty" ''
    ${pkgs.gnupg}/bin/gpg-connect-agent updatestartuptty /bye > /dev/null
  '';
  writeGpgWrapper = pkg:
    let
      bin = lib.getExe pkg;
      binName = lib.last (lib.splitString "/" bin);
    in
    pkgs.writeShellScriptBin binName ''
      ${gpgUpdateTty}
      exec ${bin} "$@"
    '';
  wrapForGpg = pkg: pkgs.symlinkJoin {
    name = "${lib.getName pkg}-wrapped-for-gpg";
    paths = [
      (writeGpgWrapper pkg)
      pkg
    ];
  };
in
{
  nixpkgs.overlays = [
    (final: prev: {
      openssh-wrapped = wrapForGpg final.openssh;
      git-wrapped = wrapForGpg final.git;
      pijul-wrapped = wrapForGpg final.pijul;
    })
  ];
}

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

B:BD[4.4500] → [2.176:249]

  environment.systemPackages = with pkgs; [ 
    vim 
    foot.terminfo

[4.4500]

[2.249]

  environment.systemPackages = with pkgs; [
    vim
    foot.terminfo

Replacement in nixos/scaleway.nix at line 39 [4.3558]
B:BD[2.277] → [2.277:280]
```
  
```
[2.277]
[2.280]
Replacement in nixos/scaleway.nix at line 44 [4.3558]
B:BD[2.374] → [2.374:379]
```
    
```
[2.374]
[2.379]
Replacement in nixos/scaleway.nix at line 51 [4.3558]
B:BD[2.609] → [2.609:614]
```
    
```
[2.609]
[2.614]

File addition: mkhome.nix (----------)

[3.1037]

{}:
attrs:
{
  imports = [
    attrs
    ../home-manager/home.nix
    ../home-manager/modules
  ];
}

Insertion in lib/default.nix at line 4 [3.1454]
[3.1517]
[3.1517]
```
  mkHome = callPackage ./mkhome.nix { };
```
Replacement in home-manager/pijul.nix at line 2 [5.8784]
B:BD[4.9344] → [2.838:880]
```
  home.packages = [ pkgs.pijul-wrapped ];
```
[4.9344]
[5.8832]
```
  home.packages = [ pkgs.pijul ];
```
Replacement in home-manager/modules/dev/rust.nix at line 47 [3.1747]
B:BD[3.2895] → [3.2895:2930]
```
  
  config = lib.mkIf cfg.enable 
```
[3.2895]
[3.2930]
```
  config = lib.mkIf cfg.enable
```
Replacement in home-manager/modules/dev/rust.nix at line 50 [3.1747]
B:BD[3.2936] → [3.2936:2961]
```
      home.packages = [ 
```
[3.2936]
[3.2961]
```
      home.packages = [
```

Replacement in home-manager/modules/dev/rust.nix at line 52 [3.1747]

B:BD[3.2986] → [3.2986:3157]

        cfg.package 
        pkgs.stdenv.cc 
        ]
        ++ (lib.optional cfg.lldb pkgs.lldb)
        ++ (lib.optionals cfg.mold [ pkgs.clang pkgs.mold ]);

[3.2986]

[3.3157]

        cfg.package
        pkgs.stdenv.cc
      ]
      ++ (lib.optional cfg.lldb pkgs.lldb)
      ++ (lib.optionals cfg.mold [ pkgs.clang pkgs.mold ]);

Replacement in home-manager/modules/dev/rust.nix at line 59 [3.1747]

B:BD[3.3195] → [3.3195:3282]

        ".cargo/config.toml".source = (pkgs.formats.toml {}).generate "cargo-config" {

[3.3195]

[3.3282]

        ".cargo/config.toml".source = (pkgs.formats.toml { }).generate "cargo-config" {

File addition: desktop (d--x------)
[3.1695]

File addition: alacritty.nix (----------)

[0.141]

{ config, pkgs, lib, ... }:
let
  theme = import ../../../theme.nix;
  cfg = config.niko.desktop.alacritty;
in
{
  options.niko.desktop.alacritty = {
    enable = lib.mkEnableOption "Alacritty terminal emulator";
    fontSize = with lib; mkOption {
      type = types.int;
      default = if pkgs.hostPlatform.isLinux then 9 else 14;
      description = ''
        Font size for alacritty.
        By default on Macs the size will be larger because HiDPI and stuff
        so we want it to look pretty but still readable.
      '';
    };
  };
  config = lib.mkIf cfg.enable {
    programs.alacritty = {
      enable = true;
      settings = {
        colors = {
          primary = theme.primary;
          selection = theme.secondary;
          normal = theme.dark;
          bright = theme.bright;
          indexed_colors = [
            { index = 16; color = theme.extra.idx16; }
            { index = 17; color = theme.extra.idx17; }
          ];
        };
        font = {
          normal.family = theme.fontFamily;
          size = cfg.fontSize;
        };
      };
    };
  };
}

Insertion in home-manager/modules/default.nix at line 9 [3.3513]
[3.3715]
[3.3715]
```
    ./desktop/alacritty.nix
```
Replacement in home-manager/home.nix at line 5 [6.1801]
B:BD[4.325631] → [2.897:904]
```
}: let
```
[4.325631]
[2.904]
```
}:
let
```
Replacement in home-manager/home.nix at line 20 [6.1801]
B:BD[4.325764] → [2.1012:1032]
```
    openssh-wrapped
```
[4.325764]
[4.325764]
```
    openssh
```
Deletion in home-manager/home.nix at line 62 [6.1801]
B:BD[6.2827] → [2.1033:1065]
```
    package = pkgs.git-wrapped;
```

Insertion in home-manager/home.nix at line 69 [6.1801]

[7.84]

[6.2937]

    extraConfig = {
      push.followTags = true;
    };

Replacement in home-manager/home.nix at line 85 [6.1801]
B:BD[6.3708] → [6.3708:3727]
```
    enable = true;
```
[6.3708]
[6.3727]
```
    enable = pkgs.hostPlatform.isLinux;
```

File deletion: alacritty.nix

BF:BFD[5.5182] → [4.338219:338256]

BF:BFD[4.338256] → [4.338257:338257]

B:BD[4.338257] → [4.338258:338753]

B:BD[4.338753] → [8.3100160:3100178]

∅:D[8.3100178] → [4.338771:338794]

B:BD[4.338771] → [4.338771:338794]

{ config, pkgs, lib, ... }:
let
  theme = import ../../../theme.nix;
in
{
  programs.alacritty = {
    enable = true;
    settings = {
      colors = {
        primary = theme.primary;
        selection = theme.secondary;
        normal = theme.dark;
        bright = theme.bright;
        indexed_colors = [
          { index = 16; color = theme.extra.idx16; }
          { index = 17; color = theme.extra.idx17; }
        ];
      };
      font = {
        normal.family = theme.fontFamily;
        size = 9;
      };
    };
  };
}

Insertion in home-manager/desktop/chromium.nix at line 10 [8.3099722]
[8.3099884]
[8.3099884]
```
    package = pkgs.x86-compat.chromium;
```

Replacement in flake.nix at line 5 [6.1162]

B:BD[6.1285] → [6.1285:1342]

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

[6.1225]

[9.1226]

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

Insertion in flake.nix at line 21 [6.1162]

[2.2217]

[8.3104312]

      inputs.nixpkgs.follows = "nixpkgs";
    };
    niko-nur = {
      url = "github:nrabulinski/nur-packages";

Insertion in flake.nix at line 27 [6.1162]

[8.3104361]

[6.1395]

    firefox-darwin = {
      url = "github:bandithedoge/nixpkgs-firefox-darwin";
      inputs.nixpkgs.follows = "nixpkgs";
    };

Insertion in flake.nix at line 41 [6.1162]
[2.2235]
[8.3104456]
```
    , niko-nur
    , firefox-darwin
```

Replacement in flake.nix at line 68 [6.1162]

B:BD[2.2275] → [2.2275:2316]

            niko.dev.rust.enable = rust;

[2.2275]

[8.3105158]

          niko.dev.rust.enable = rust;

Replacement in flake.nix at line 86 [6.1162]

B:BD[6.1637] → [2.2474:2567]

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

[6.1637]

[5.3342]

      homeConfigurations.mbp = home-manager.lib.homeManagerConfiguration {
        modules = [
          (lib.mkHome ({ config, pkgs, lib, ... }: {
            imports = [
              ./home-manager/node.nix
              ./home-manager/pijul.nix
              # ./home-manager/desktop/chromium.nix
            ];
            nix = {
              package = pkgs.nixVersions.stable;
              settings.experimental-features = [ "nix-command" "flakes" ];
            };
            home = {
              username = user;
              homeDirectory = "/Users/${user}";
              stateVersion = "22.05";
            };
            nixpkgs = {
              overlays = [
                fenix.overlay
                nur.overlay
                niko-nur.overlay
                (final: prev: {
                  x86-compat = import nixpkgs { system = "x86_64-darwin"; };
                })
                firefox-darwin.overlay
              ];
              config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
                "slack"
              ];
            };
            niko = {
              desktop.alacritty.enable = true;
              dev.rust.enable = true;
            };

Replacement in flake.nix at line 124 [6.1162]

B:BD[5.3343] → [2.2568:2611]

      #   specialArgs = { inherit user; };

[5.3343]

[5.3428]

            home.packages = with pkgs; [
              nerdfonts
              utm
              podman
              podman-compose
              qemu
              cocoapods
              slack
              lunar
            ];

Replacement in flake.nix at line 135 [6.1162]

B:BD[5.3429] → [2.2612:3091]

      #   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;
      #       };
      #     }
      #   ];
      # };

[5.3429]

[5.3466]

            programs.firefox = {
              enable = true;
              package = pkgs.firefox-bin;
            };
          }))
        ];
        pkgs = nixpkgs.legacyPackages.aarch64-darwin;
      };

Replacement in flake.nix at line 154 [6.1162]

B:BD[8.3106570] → [2.3129:3219]

            nixpkgs.overlays = [ 
              fenix.overlay 
              nur.overlay

[8.3106570]

[2.3219]

            nixpkgs.overlays = [
              fenix.overlay
              nur.overlay

Deletion in flake.nix at line 211 [6.1162]

B:BD[8.3107974] → [2.3530:3631]

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

Replacement in flake.nix at line 212 [6.1162]

B:BD[8.3107975] → [8.3107975:3108049]

      formatter.${system} = nixpkgs.legacyPackages.${system}.nixpkgs-fmt;

[8.3107975]

[8.3108049]

      devShells =
        let
          mkShell = pkgs: pkgs.mkShellNoCC {
            packages = [ pkgs.deploy-rs ];
          };
        in
        {
          ${system}.default = mkShell pkgs;
          aarch64-darwin.default = mkShell nixpkgs.legacyPackages.aarch64-darwin;
        };
      formatter = {
        ${system} = nixpkgs.legacyPackages.${system}.nixpkgs-fmt;
        aarch64-darwin = nixpkgs.legacyPackages.aarch64-darwin.nixpkgs-fmt;
      };

Replacement in flake.lock at line 28 [6.4]

B:BD[8.3108343] → [8.3108343:3108453]

        "lastModified": 1659725433,
        "narHash": "sha256-1ZxuK67TL29YLw88vQ18Y2Y6iYg8Jb7I6/HVzmNB6nM=",

[8.3108343]

[8.3108453]

        "lastModified": 1668797197,
        "narHash": "sha256-0w6iD3GSSQbIeSFVDzAAQZB+hDq670ZTms3d9XI+BtM=",

Replacement in flake.lock at line 32 [6.4]

B:BD[8.3108511] → [8.3108511:3108570]

        "rev": "41f15759dd8b638e7b4f299730d94d5aa46ab7eb",

[8.3108511]

[8.3108570]

        "rev": "2a3c5f70eee04a465aa534d8bd4fcc9bb3c4a8ce",

Replacement in flake.lock at line 49 [6.4]

B:BD[9.162] → [2.4090:4200]

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

[9.162]

[9.272]

        "lastModified": 1668839162,
        "narHash": "sha256-kGpqBpxEbzy/AEEKia2Hd5swMou2Pl9ATAviSTQy/NM=",

Replacement in flake.lock at line 53 [6.4]

B:BD[9.331] → [2.4201:4260]

        "rev": "5fe1e430e990d5b0715f82dbd8b6c0cb7086c7e1",

[9.331]

[9.390]

        "rev": "16ba830351ba5e7c018919e8c70ef31350755f42",

Insertion in flake.lock at line 59 [6.4]

[9.503]

[5.231]

        "type": "github"
      }
    },
    "firefox-darwin": {
      "inputs": {
        "nixpkgs": [
          "nixpkgs"
        ]
      },
      "locked": {
        "lastModified": 1668819566,
        "narHash": "sha256-8mbtIZinm9WJ4bw5jAU9o5WWyYuSz0q5lE2XUkh+ap8=",
        "owner": "bandithedoge",
        "repo": "nixpkgs-firefox-darwin",
        "rev": "59b704892c13a348e211cc2992d9d9b0c5af4ae6",
        "type": "github"
      },
      "original": {
        "owner": "bandithedoge",
        "repo": "nixpkgs-firefox-darwin",

Insertion in flake.lock at line 98 [6.4]

[9.543]

[6.20]

    "flake-parts": {
      "inputs": {
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
        "lastModified": 1666885127,
        "narHash": "sha256-uXA/3lhLhwOTBMn9a5zJODKqaRT+SuL5cpEmOz2ULoo=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
        "rev": "0e101dbae756d35a376a5e1faea532608e4a4b9a",
        "type": "github"
      },
      "original": {
        "owner": "hercules-ci",
        "repo": "flake-parts",
        "type": "github"
      }
    },

Replacement in flake.lock at line 124 [6.4]

B:BD[6.138] → [2.4261:4371]

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

[6.138]

[6.248]

        "lastModified": 1668788863,
        "narHash": "sha256-FsdUG+YkRX7JZKZm6T44J2h+0pXB1sWA9AobyiozFK0=",

Replacement in flake.lock at line 128 [6.4]

B:BD[6.314] → [2.4372:4431]

        "rev": "04e844090ed17298bfbe0f8249109b15770571bc",

[6.314]

[6.373]

        "rev": "948d1f8a5cef55a281d4f5d17f3b79df6c82fce1",

Insertion in flake.lock at line 160 [6.4]

[6.533]

    "niko-nur": {
      "inputs": {
        "flake-parts": "flake-parts",
        "nixpkgs": [
          "nixpkgs"
        ]
      },
      "locked": {
        "lastModified": 1668543486,
        "narHash": "sha256-88npledd2wMly8DpeIk7HmiKZ5F06scfzKbtBs7IfXI=",
        "owner": "nrabulinski",
        "repo": "nur-packages",
        "rev": "908e04a28d59cadb67ab0d2da0e6d82beffe14df",
        "type": "github"
      },
      "original": {
        "owner": "nrabulinski",
        "repo": "nur-packages",
        "type": "github"
      }
    },

Replacement in flake.lock at line 183 [6.4]

B:BD[6.568] → [2.5068:5178]

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

[6.568]

[6.678]

        "lastModified": 1668852955,
        "narHash": "sha256-1ozaNW9uFRvm3cP9M6FPx+hdqyFQnf49M3HrLQ6nqrk=",

Replacement in flake.lock at line 187 [6.4]

B:BD[6.731] → [2.5179:5238]

        "rev": "d40fea9aeb8840fea0d377baa4b38e39b9582458",

[6.731]

[6.790]

        "rev": "2fb6f9fb0ef3ca727cbd9ae30b90d1ce49d5fcca",

Replacement in flake.lock at line 192 [6.4]
B:BD[6.870] → [6.870:903]
```
        "ref": "nixos-unstable",
```
[6.870]
[6.903]
```
        "ref": "nixpkgs-unstable",
```

Insertion in flake.lock at line 212 [6.4]

[2.5653]

[8.3109435]

    "nixpkgs-lib": {
      "locked": {
        "dir": "lib",
        "lastModified": 1665349835,
        "narHash": "sha256-UK4urM3iN80UXQ7EaOappDzcisYIuEURFRoGQ/yPkug=",
        "owner": "NixOS",
        "repo": "nixpkgs",
        "rev": "34c5293a71ffdb2fe054eb5288adc1882c1eb0b1",
        "type": "github"
      },
      "original": {
        "dir": "lib",
        "owner": "NixOS",
        "ref": "nixos-unstable",
        "repo": "nixpkgs",
        "type": "github"
      }
    },

Replacement in flake.lock at line 232 [6.4]

B:BD[5.1196] → [2.5654:5764]

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

[5.1196]

[8.3109559]

        "lastModified": 1668876151,
        "narHash": "sha256-12pz+OzWzjlYRIXgwu7tUBtqga6MwpG8C3tyeehkzl0=",

Replacement in flake.lock at line 236 [6.4]

B:BD[8.3109616] → [2.5765:5824]

        "rev": "1fce06a72e9b1cd602e877d3a0415453fc4bdb9a",

[8.3109616]

[8.3109675]

        "rev": "0745a777359ca736b6852dc79cfc93f1f11835b7",

Insertion in flake.lock at line 249 [6.4]
[9.741]
[6.1002]
```
        "firefox-darwin": "firefox-darwin",
```
Insertion in flake.lock at line 252 [6.4]
[2.5861]
[8.3109819]
```
        "niko-nur": "niko-nur",
```

Replacement in flake.lock at line 260 [6.4]

B:BD[9.824] → [2.5862:5972]

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

[9.824]

[9.934]

        "lastModified": 1668800018,
        "narHash": "sha256-v2fKKwMFOhc0iTAbrzybwOwmgaO76eYuBOiFkPcd0rU=",

Replacement in flake.lock at line 264 [6.4]

B:BD[9.997] → [2.5973:6032]

        "rev": "c1305fa5d92640ce847dc8e6aeefd53cb6302dbf",

[9.997]

[9.1056]

        "rev": "791cb87cdf47ddfd2a2b1a726dab3aa66ec2bff3",

Replacement in flake.lock at line 291 [6.4]

B:BD[8.3110400] → [2.6033:6143]

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

[8.3110400]

[8.3110510]

        "lastModified": 1667395993,
        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",

Replacement in flake.lock at line 295 [6.4]

B:BD[8.3110569] → [2.6144:6203]

        "rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817",

[8.3110569]

[2.6203]

        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",

Bought a macbook

Dependencies

In channels

Change contents

Replacement in nixos/wrappedForGpg.nix at line 1 [3.42]

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

Replacement in nixos/scaleway.nix at line 39 [4.3558]

Replacement in nixos/scaleway.nix at line 44 [4.3558]

Replacement in nixos/scaleway.nix at line 51 [4.3558]

File addition: mkhome.nix (----------)

Insertion in lib/default.nix at line 4 [3.1454]

Replacement in home-manager/pijul.nix at line 2 [5.8784]

Replacement in home-manager/modules/dev/rust.nix at line 47 [3.1747]

Replacement in home-manager/modules/dev/rust.nix at line 50 [3.1747]