Compare commits

..

No commits in common. "e1871a2030f98ada9693e140ea5d3bdf9c288413" and "71395424ee79bc179d4c04f22c383fb1cc4002e8" have entirely different histories.

6 changed files with 37 additions and 35 deletions

54
flake.lock generated
View File

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1690247892, "lastModified": 1689825754,
"narHash": "sha256-WMGc1yq1cqRd+kzjWgbvHxckJIe8VQfiZ5RfR8tgABw=", "narHash": "sha256-u3W3WGO3BA63nb+CeNLBajbJ/sl8tDXBHKxxeTOCxfo=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "efd35d99ce412335c478dff9da9a4256bbd39757", "rev": "531c3de7eccf95155828e0cd9f18c25e7f937777",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -56,11 +56,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1690231853, "lastModified": 1676918308,
"narHash": "sha256-kayhWrLn6kcf2tLT20Lj9ldsjhjtxmDyaLT6tp+k1T0=", "narHash": "sha256-KMh5uMk43TMkB0MMzwwBIIYU7PNbi3glzBEvrayV9ss=",
"owner": "walkah", "owner": "walkah",
"repo": "dotfiles", "repo": "dotfiles",
"rev": "63b05b74b4a7166d099049d39dad4d13860411b0", "rev": "65e0539591df9939c2c1aba34d70d6d7d52c79ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -213,11 +213,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1690269402, "lastModified": 1689891262,
"narHash": "sha256-SybA24IOGigiHfcTB5eBge4UZQI6a0z8Ah+EzD17tdk=", "narHash": "sha256-Pc4wDczbdgd6QXKJIXprgxe7L9AVDsoAkMnvm5vmpUU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0306d5ed7e9d1662b55ec0d08afc73d4cb5eadca", "rev": "ee5673246de0254186e469935909e821b8f4ec15",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -249,11 +249,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1690133435, "lastModified": 1689558522,
"narHash": "sha256-YNZiefETggroaTLsLJG2M+wpF0pJPwiauKG4q48ddNU=", "narHash": "sha256-diNpqSRebzvT3P4fLX+40VWZbf2H2hraJDDdg5NJSj0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-generators", "repo": "nixos-generators",
"rev": "b1171de4d362c022130c92d7c8adc4bf2b83d586", "rev": "11c98929963a95ad3830960a9216d00e2f792502",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -264,11 +264,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1690200740, "lastModified": 1689320556,
"narHash": "sha256-aRkEXGmCbAGcvDcdh/HB3YN+EvoPoxmJMOaqRZmf6vM=", "narHash": "sha256-vODUkZLWFVCvo1KPK3dC2CbXjxa9antEn5ozwlcTr48=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "ba9650b14e83b365fb9e731f7d7c803f22d2aecf", "rev": "d4ea64f2063820120c05f6ba93ee02e6d4671d6b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -280,11 +280,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1690031011, "lastModified": 1689534811,
"narHash": "sha256-kzK0P4Smt7CL53YCdZCBbt9uBFFhE0iNvCki20etAf4=", "narHash": "sha256-jnSUdzD/414d94plCyNlvTJJtiTogTep6t7ZgIKIHiE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "12303c652b881435065a98729eb7278313041e49", "rev": "6cee3b5893090b0f5f0a06b4cf42ca4e60e5d222",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -312,11 +312,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1690066826, "lastModified": 1689473667,
"narHash": "sha256-6L2qb+Zc0BFkh72OS9uuX637gniOjzU6qCDBpjB2LGY=", "narHash": "sha256-41ePf1ylHMTogSPAiufqvBbBos+gtB6zjQlYFSEKFMM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ce45b591975d070044ca24e3003c830d26fea1c8", "rev": "13231eccfa1da771afa5c0807fdd73e05a1ec4e6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -328,11 +328,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1690235791, "lastModified": 1689935543,
"narHash": "sha256-QkPVQ859F0wXyd74A7UPYbmi4B5xYN4Ns7AQ0pvM0Wo=", "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dfcffbd74fd6f0419370d8240e445252a39f4d10", "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -390,11 +390,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1690199016, "lastModified": 1689534977,
"narHash": "sha256-yTLL72q6aqGmzHq+C3rDp3rIjno7EJZkFLof6Ika7cE=", "narHash": "sha256-EB4hasmjKgetTR0My2bS5AwELZFIQ4zANLqHKi7aVXg=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "c36df4fe4bf4bb87759b1891cab21e7a05219500", "rev": "bd695cc4d0a5e1bead703cc1bec5fa3094820a81",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -141,9 +141,9 @@
darwin-local darwin-local
deploy-rs.packages.${system}.deploy-rs deploy-rs.packages.${system}.deploy-rs
deadnix deadnix
nil
nixpkgs-fmt nixpkgs-fmt
statix statix
rnix-lsp
sops sops
]; ];

View File

@ -1,4 +1,4 @@
{ ... }: { pkgs, ... }:
{ {
imports = [ imports = [
./homebrew.nix ./homebrew.nix
@ -10,7 +10,7 @@
# List packages installed in system profile. To search by name, run: # List packages installed in system profile. To search by name, run:
# $ nix-env -qaP | grep wget # $ nix-env -qaP | grep wget
# environment.systemPackages = with pkgs; [ emacs-nox ]; environment.systemPackages = with pkgs; [ emacs-nox ];
# Use a custom configuration.nix location. # Use a custom configuration.nix location.
# $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix # $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix

View File

@ -35,7 +35,6 @@ _:
"hazel" "hazel"
"iterm2" "iterm2"
"logi-options-plus" "logi-options-plus"
"logitech-camera-settings"
"logseq" "logseq"
"loom" "loom"
"microsoft-edge" "microsoft-edge"

View File

@ -9,5 +9,7 @@ _: {
} }
]; ];
nix.linux-builder.enable = true; # TODO: waiting on fix for https://github.com/NixOS/nixpkgs/issues/243685
# nix.linux-builder.enable = true;
} }

View File

@ -2,10 +2,11 @@
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
emacs29 emacs
# Cloud # Cloud
awscli2 awscli2
pulumi-bin
# Elixir # Elixir
elixir elixir
@ -22,10 +23,10 @@
# Nix # Nix
cachix cachix
nil
niv niv
nixfmt nixfmt
nixpkgs-fmt nixpkgs-fmt
rnix-lsp
# Node/JS # Node/JS
deno deno