fiddlerwoaroof/dotfiles - Change ZNA55M3OW2RZXC4MA5UDS4V3KRBSAKFNAYVYE4I2EASXUSI4WXMQC

refactor: cleanup home-manager configurations

Created by Edward Langley on March 8, 2025

ZNA55M3OW2RZXC4MA5UDS4V3KRBSAKFNAYVYE4I2EASXUSI4WXMQC

Dependencies

In channels

main

Change contents

File deletion: dependencies, dependencies
BFD:BFD[3.1] → [4.129:152]
BFD:BFD[3.1] → [4.129:152]
BFD:BFD[4.152] → [4.128:128]
File addition: ouranos (d--x------)
[5.152]

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

[0.183]

{
  self,
  system,
  nixpkgs,
  home-manager,
  alejandra,
  emacs-community,
  ...
}: let
  pkgs = import nixpkgs {
    inherit system;
    overlays = [
      (import ../personal-flake/elangley-overlay)
    ];
  };
in
  home-manager.lib.homeManagerConfiguration {
    pkgs = pkgs;
    # Specify your home configuration modules here, for example,
    # the path to your home.nix.
    modules = [
      self.homeManagerModules.common
      self.homeManagerModules.main
      self.homeManagerModules.git-config
      self.homeManagerModules.fonts
      self.homeManagerModules.mac-apps
      {
        home.packages = [
          pkgs.cmake
          pkgs.nasm
          pkgs.ninja
          pkgs.autoconf
          pkgs.automake
          pkgs.autoconf-archive
        ];
      }
      {
        # You can update Home Manager without changing this value. See
        # the Home Manager release notes for a list of state version
        # changes in each release.
        home.stateVersion = "22.05";
        home.packages = [pkgs.aria2];
      }
    ];
    # Optionally use extraSpecialArgs
    # to pass through arguments to home.nix
    extraSpecialArgs = {
      inherit system;
      fwoar-pkgs = self.packages.${system};
      emacs-pkgs = emacs-community.packages.${system};
      alejandra-pkgs = alejandra.packages.${system};
    };
  }

Insertion in nix/mac-apps/default.nix at line 5 [6.204]
[6.232]
[6.232]
```
  emacs-pkgs,
```
Replacement in nix/mac-apps/default.nix at line 11 [6.204]
B:BD[6.305] → [6.305:324]
```
    pkgs.emacs-git
```
[6.305]
[6.324]
```
    emacs-pkgs.emacs-git
```

Deletion in nix/flake.nix at line 41 [7.189]

B:BD[7.1109] → [7.1109:1352]

B:BD[7.1352] → [6.2068:2111]

∅:D[6.2111] → [7.2574:2740]

B:BD[7.2574] → [7.2574:2740]

B:BD[7.2740] → [6.2112:2192]

∅:D[6.2192] → [7.2850:2897]

B:BD[7.2850] → [7.2850:2897]

    };
    packages.aarch64-darwin.mycurl = pkgs.curl.override {
      http3Support = true;
      rustlsSupport = true;
      gnutlsSupport = false;
      opensslSupport = false;
      wolfsslSupport = false;
    };
    homeManagerModules = {
      common = import ./common-module.nix;
      fonts = {
        home.packages = [
          pkgs.lato
          pkgs.alegreya
          pkgs.source-code-pro
          pkgs.alegreya-sans
        ];
      };
      git-config = import ./git-config.nix;
      mac-apps = import ./mac-apps;
      main = import ./personal-flake/home.nix;

Deletion in nix/flake.nix at line 42 [7.189]

B:BD[7.2904] → [7.2904:3321]

B:BD[7.3321] → [6.2193:2304]

∅:D[6.2304] → [7.3321:3697]

B:BD[7.3321] → [7.3321:3697]

B:BD[7.3697] → [6.2305:2429]

∅:D[6.2429] → [7.3697:3704]

B:BD[7.3697] → [7.3697:3704]

    homeConfigurations."ouranos" = home-manager.lib.homeManagerConfiguration {
      pkgs = pkgs;
      # Specify your home configuration modules here, for example,
      # the path to your home.nix.
      modules = [
        self.homeManagerModules.common
        self.homeManagerModules.main
        self.homeManagerModules.git-config
        self.homeManagerModules.fonts
        self.homeManagerModules.mac-apps
        {home.packages = [pkgs.cmake pkgs.nasm pkgs.ninja pkgs.autoconf pkgs.automake pkgs.autoconf-archive];}
        {
          # You can update Home Manager without changing this value. See
          # the Home Manager release notes for a list of state version
          # changes in each release.
          home.stateVersion = "22.05";
          home.packages = [pkgs.aria2];
        }
      ];
      # Optionally use extraSpecialArgs
      # to pass through arguments to home.nix
      extraSpecialArgs = {
        inherit system;
        extraFlakes = {
          inherit alejandra;
        };
      };
    };

Replacement in nix/common-module.nix at line 1 [6.2441]

B:BD[6.2441] → [6.2442:2478]

{extraFlakes, pkgs, system, ...}: {

[6.2441]

[6.2478]

{
  alejandra-pkgs,
  fwoar-pkgs,
  pkgs,
  system,
  ...
}: {

Replacement in nix/common-module.nix at line 9 [6.2441]

B:BD[6.2498] → [6.2498:2549]

    extraFlakes.alejandra.defaultPackage.${system}

[6.2498]

[6.2549]

    alejandra-pkgs.default
    fwoar-pkgs.zenburn

Replacement in nix/common-module.nix at line 47 [6.2441]

B:BD[6.3237] → [6.3237:3398]

     // {
       meta =
         pkgs.zsh.meta
         // {
           outputsToInstall = pkgs.zsh.meta.outputsToInstall ++ ["info" "doc"];
         };
     })

[6.3237]

[6.3398]

      // {
        meta =
          pkgs.zsh.meta
          // {
            outputsToInstall = pkgs.zsh.meta.outputsToInstall ++ ["info" "doc"];
          };
      })

Insertion in iterm-preferences-m4/com.googlecode.iterm2.plist at line 1599 [8.266]
[8.42785]
[8.42785]
```
			<false/>
			<key>Enable Triggers in Interactive Apps</key>
```

Replacement in flake.nix at line 7 [9.3405]

B:BD[9.3507] → [9.3507:3534]

      ref = "nixos-24.11";

[9.3507]

[9.3534]

      ref = "nixos-unstable";
    };
    home-manager = {
      url = "github:nix-community/home-manager";
      inputs.nixpkgs.follows = "nixpkgs";
    };
    alejandra = {
      url = "github:kamadorueda/alejandra";
      inputs.nixpkgs.follows = "nixpkgs";
    };
    emacs-community = {
      url = "github:nix-community/emacs-overlay";

Replacement in flake.nix at line 25 [9.3405]

B:BD[9.3584] → [9.3584:3593]

  }: let

[9.3584]

[10.256]

    home-manager,
    alejandra,
    emacs-community,
  } @ inputs: let

Insertion in flake.nix at line 83 [9.3405]

[9.4309]

[11.256]

    mkCurl = system: let
      pkgs = nixpkgs.legacyPackages.${system};
    in
      pkgs.curl.override {
        openssl = pkgs.quictls;
        http3Support = true;
      };

Insertion in flake.nix at line 94 [9.3405]
[12.2997]
[11.314]
```
      mycurl = mkCurl system;
```

Insertion in flake.nix at line 96 [9.3405]

[11.321]

[9.4309]

    withSystem = system: attrSet: attrSet // {inherit system;};
    withAppleSilicon = withSystem "aarch64-darwin";

Insertion in flake.nix at line 104 [9.3405]

[10.856]

[9.4499]


    homeManagerModules = {
      common = import ./nix/common-module.nix;
      fonts = {pkgs, ...}: {
        home.packages = [
          pkgs.lato
          pkgs.alegreya
          pkgs.source-code-pro
          pkgs.alegreya-sans
        ];
      };
      git-config = import ./nix/git-config.nix;
      mac-apps = import ./nix/mac-apps;
      main = import ./nix/personal-flake/home.nix;
    };
    homeConfigurations = {
      "ouranos" = import ./nix/ouranos/home.nix (withAppleSilicon inputs);
    };

Insertion in flake.lock at line 3 [9.4542]

[9.4558]

    "alejandra": {
      "inputs": {
        "fenix": "fenix",
        "flakeCompat": "flakeCompat",
        "nixpkgs": [
          "nixpkgs"
        ]
      },
      "locked": {
        "lastModified": 1730773997,
        "narHash": "sha256-nOo970Pm12BK1DH7hfS800i8mg5h8me1IxokGUKMgb8=",
        "owner": "kamadorueda",
        "repo": "alejandra",
        "rev": "264e23546663a5676a77174cab31340a81aa2cc0",
        "type": "github"
      },
      "original": {
        "owner": "kamadorueda",
        "repo": "alejandra",
        "type": "github"
      }
    },
    "emacs-community": {
      "inputs": {
        "nixpkgs": "nixpkgs",
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
        "lastModified": 1731463490,
        "narHash": "sha256-AtyI66bBn9IX9s+rXQEJHrkAQv3430urS6IxK5m1Uzs=",
        "owner": "nix-community",
        "repo": "emacs-overlay",
        "rev": "395675b281ab1aea12ab75a6296b83e3b3152f13",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
        "repo": "emacs-overlay",
        "type": "github"
      }
    },
    "fenix": {
      "inputs": {
        "nixpkgs": [
          "alejandra",
          "nixpkgs"
        ],
        "rust-analyzer-src": "rust-analyzer-src"
      },
      "locked": {
        "lastModified": 1730615655,
        "narHash": "sha256-2HBR3zLn57LXKNRtxBb+O+uDqHM4n0pz51rPayMl4cg=",
        "owner": "nix-community",
        "repo": "fenix",
        "rev": "efeb50e2535b17ffd4a135e6e3e5fd60a525180c",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
        "repo": "fenix",
        "type": "github"
      }
    },
    "flakeCompat": {
      "flake": false,
      "locked": {
        "lastModified": 1696426674,
        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
        "owner": "edolstra",
        "repo": "flake-compat",
        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
        "type": "github"
      },
      "original": {
        "owner": "edolstra",
        "repo": "flake-compat",
        "type": "github"
      }
    },
    "home-manager": {
      "inputs": {
        "nixpkgs": [
          "nixpkgs"
        ]
      },
      "locked": {
        "lastModified": 1741461731,
        "narHash": "sha256-BBQfGvO3GWOV+5tmqH14gNcZrRaQ7Q3tQx31Frzoip8=",
        "owner": "nix-community",
        "repo": "home-manager",
        "rev": "7f4c60a3d6e548dbc13666565c22cb3f8dcdad44",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
        "repo": "home-manager",
        "type": "github"
      }
    },

Replacement in flake.lock at line 104 [9.4542]

B:BD[9.4593] → [9.4593:4703]

        "lastModified": 1741196730,
        "narHash": "sha256-0Sj6ZKjCpQMfWnN0NURqRCQn2ob7YtXTAOTwCuz7fkA=",

[9.4593]

[9.4703]

        "lastModified": 1731139594,
        "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
        "owner": "NixOS",
        "repo": "nixpkgs",
        "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
        "ref": "nixos-unstable",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs-stable": {
      "locked": {
        "lastModified": 1731239293,
        "narHash": "sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc=",
        "owner": "NixOS",
        "repo": "nixpkgs",
        "rev": "9256f7c71a195ebe7a218043d9f93390d49e6884",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
        "ref": "nixos-24.05",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs_2": {
      "locked": {
        "lastModified": 1741379970,
        "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=",

Replacement in flake.lock at line 140 [9.4542]

B:BD[9.4756] → [9.4756:4815]

        "rev": "48913d8f9127ea6530a2a2f1bd4daa1b8685d8a3",

[9.4756]

[9.4815]

        "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f",

Replacement in flake.lock at line 145 [9.4542]
B:BD[9.4895] → [9.4895:4925]
```
        "ref": "nixos-24.11",
```
[9.4895]
[9.4925]
```
        "ref": "nixos-unstable",
```

Replacement in flake.lock at line 152 [9.4542]

B:BD[9.5024] → [9.5024:5053]

        "nixpkgs": "nixpkgs"

[9.5024]

[9.5053]

        "alejandra": "alejandra",
        "emacs-community": "emacs-community",
        "home-manager": "home-manager",
        "nixpkgs": "nixpkgs_2"
      }
    },
    "rust-analyzer-src": {
      "flake": false,
      "locked": {
        "lastModified": 1730555913,
        "narHash": "sha256-KNHZUlqsEibg3YtfUyOFQSofP8hp1HKoY+laoesBxRM=",
        "owner": "rust-lang",
        "repo": "rust-analyzer",
        "rev": "f17a5bbfd0969ba2e63a74505a80e55ecb174ed9",
        "type": "github"
      },
      "original": {
        "owner": "rust-lang",
        "ref": "nightly",
        "repo": "rust-analyzer",
        "type": "github"

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

[0.183]

{
  self,
  system,
  nixpkgs,
  home-manager,
  alejandra,
  emacs-community,
  ...
}: let
  pkgs = import nixpkgs {
    inherit system;
    overlays = [
      (import ../personal-flake/elangley-overlay)
    ];
  };
in
  home-manager.lib.homeManagerConfiguration {
    pkgs = pkgs;
    # Specify your home configuration modules here, for example,
    # the path to your home.nix.
    modules = [
      self.homeManagerModules.common
      self.homeManagerModules.main
      self.homeManagerModules.git-config
      self.homeManagerModules.fonts
      self.homeManagerModules.mac-apps
      {
        home.packages = [
          pkgs.cmake
          pkgs.nasm
          pkgs.ninja
          pkgs.autoconf
          pkgs.automake
          pkgs.autoconf-archive
        ];
      }
      {
        # You can update Home Manager without changing this value. See
        # the Home Manager release notes for a list of state version
        # changes in each release.
        home.stateVersion = "22.05";
        home.packages = [pkgs.aria2];
      }
    ];
    # Optionally use extraSpecialArgs
    # to pass through arguments to home.nix
    extraSpecialArgs = {
      inherit system;
      fwoar-pkgs = self.packages.${system};
      emacs-pkgs = emacs-community.packages.${system};
      alejandra-pkgs = alejandra.packages.${system};
    };
  }

refactor: cleanup home-manager configurations

Dependencies

In channels

Change contents

File deletion: dependencies, dependencies

File addition: ouranos (d--x------)

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

Insertion in nix/mac-apps/default.nix at line 5 [6.204]

Replacement in nix/mac-apps/default.nix at line 11 [6.204]

Deletion in nix/flake.nix at line 41 [7.189]

Deletion in nix/flake.nix at line 42 [7.189]

Replacement in nix/common-module.nix at line 1 [6.2441]

Replacement in nix/common-module.nix at line 9 [6.2441]

Replacement in nix/common-module.nix at line 47 [6.2441]

Insertion in iterm-preferences-m4/com.googlecode.iterm2.plist at line 1599 [8.266]

Replacement in flake.nix at line 7 [9.3405]

Replacement in flake.nix at line 25 [9.3405]

Insertion in flake.nix at line 83 [9.3405]

Insertion in flake.nix at line 94 [9.3405]

Insertion in flake.nix at line 96 [9.3405]

Insertion in flake.nix at line 104 [9.3405]

Insertion in flake.lock at line 3 [9.4542]

Replacement in flake.lock at line 104 [9.4542]

Replacement in flake.lock at line 140 [9.4542]

Replacement in flake.lock at line 145 [9.4542]

Replacement in flake.lock at line 152 [9.4542]

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