Compare commits

...

7 commits

Author SHA1 Message Date
4e5dd3183c
feat: use vesktop-bin overlay 2024-08-25 06:10:47 -07:00
9079af661f
callisto: use pre-compiled vesktop to avoid long updates 2024-08-25 05:19:43 -07:00
efaa5c81cd
callisto: pin vesktop to stable to stop constant rebuilds 2024-08-25 04:07:29 -07:00
df1ecf6de4
overlays: refactor and fix error 2024-08-25 03:57:33 -07:00
43224bd176
overlays: remove typst-lsp; add librewolf from stable to build 2024-08-25 03:52:29 -07:00
6f597d83f5
git: add safe directory so nix can rebuild with doas 2024-08-25 03:52:13 -07:00
8804431c97
flake.lock: Update
Flake lock file updates:

• Updated input 'bleedingpkgs':
    'github:nixos/nixpkgs/4c97b427ece2d45026ab6c5264adb67c763e7927' (2024-08-21)
  → 'github:nixos/nixpkgs/cefe8a71e78741c16e88181c8cdf467d07a4b401' (2024-08-25)
• Updated input 'catppuccin':
    'github:catppuccin/nix/8886a68edadb1d93c7101337f995ffce4b410ff2' (2024-08-20)
  → 'github:catppuccin/nix/874e668ddaf3687e8d38ccd0188a641ffefe1cfb' (2024-08-24)
• Updated input 'home-manager':
    'github:nix-community/home-manager/2598861031b78aadb4da7269df7ca9ddfc3e1671' (2024-08-18)
  → 'github:nix-community/home-manager/c2cd2a52e02f1dfa1c88f95abeb89298d46023be' (2024-08-23)
• Updated input 'homebrew-cask':
    'github:homebrew/homebrew-cask/761ddda3d71597c6b594af9416492fbf67ec813e' (2024-08-21)
  → 'github:homebrew/homebrew-cask/f3046f799c32d169398e9940d00018c3535ec8f6' (2024-08-25)
• Updated input 'homebrew-core':
    'github:homebrew/homebrew-core/7270362c593e96b2368834f6a87cd0d904874eb9' (2024-08-21)
  → 'github:homebrew/homebrew-core/0f996959e7c025eb54aa1ada8b43dad0737e78a6' (2024-08-25)
• Updated input 'nix-darwin':
    'github:LnL7/nix-darwin/d6703b988728b89456b32bac242c8689902e5a5b' (2024-08-21)
  → 'github:LnL7/nix-darwin/ac5694a0b855a981e81b4d9f14052e3ff46ca39e' (2024-08-25)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/8a3354191c0d7144db9756a74755672387b702ba' (2024-08-18)
  → 'github:nixos/nixpkgs/c374d94f1536013ca8e92341b540eba4c22f9c62' (2024-08-21)
• Updated input 'personal-neovim':
    'github:youwen5/neovim-flake/707837ca26cf3e125309b883815d4bbfd25ccc92' (2024-08-25)
  → 'github:youwen5/neovim-flake/e78144554b191f08a05c7e3d0cb7966c363fcdbb' (2024-08-25)
• Updated input 'spicetify':
    'github:Gerg-L/spicetify-nix/3caf2a241f7af52419ce97c6682b0467219ab914' (2024-08-24)
  → 'github:Gerg-L/spicetify-nix/8d823dea059ec5de57f276360acbd0601b20e433' (2024-08-25)
• Updated input 'stablepkgs':
    'github:nixos/nixpkgs/f1bad50880bae73ff2d82fafc22010b4fc097a9c' (2024-08-19)
  → 'github:nixos/nixpkgs/797f7dc49e0bc7fab4b57c021cdf68f595e47841' (2024-08-22)
2024-08-25 03:41:38 -07:00
5 changed files with 117 additions and 34 deletions

View file

@ -24,11 +24,11 @@
},
"bleedingpkgs": {
"locked": {
"lastModified": 1724277913,
"narHash": "sha256-88IaCyNgVQHq1WoyK1mSOzedz3UAfwhtDLUca7qGB3I=",
"lastModified": 1724581532,
"narHash": "sha256-h9a24T9AE4/kIsK1m6zoeEo8XyRDI83sVXQS4OOmVfk=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "4c97b427ece2d45026ab6c5264adb67c763e7927",
"rev": "cefe8a71e78741c16e88181c8cdf467d07a4b401",
"type": "github"
},
"original": {
@ -57,11 +57,11 @@
},
"catppuccin": {
"locked": {
"lastModified": 1724156255,
"narHash": "sha256-rpUCeS/QZwQdJmDrvCm0hRi8bFvQNQKAnIMK5ZDBfpM=",
"lastModified": 1724469296,
"narHash": "sha256-p3R4LUNk6gC+fTKRUm9ByXaoRIocnQMwVuJSIxECQ8o=",
"owner": "catppuccin",
"repo": "nix",
"rev": "8886a68edadb1d93c7101337f995ffce4b410ff2",
"rev": "874e668ddaf3687e8d38ccd0188a641ffefe1cfb",
"type": "github"
},
"original": {
@ -307,6 +307,24 @@
"type": "github"
}
},
"flake-utils_5": {
"inputs": {
"systems": "systems_5"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flakey-profile": {
"locked": {
"lastModified": 1712898590,
@ -407,11 +425,11 @@
]
},
"locked": {
"lastModified": 1723986931,
"narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=",
"lastModified": 1724435763,
"narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671",
"rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
"type": "github"
},
"original": {
@ -445,11 +463,11 @@
"homebrew-cask": {
"flake": false,
"locked": {
"lastModified": 1724279485,
"narHash": "sha256-izbAx5wx4QS332G9dJ/E1U/NA9nrUjS0qS6b1thPQuE=",
"lastModified": 1724579842,
"narHash": "sha256-izixjuJn9JjWhmfRXCSVSODosdNcK0nEZVDWzk8+vJ0=",
"owner": "homebrew",
"repo": "homebrew-cask",
"rev": "761ddda3d71597c6b594af9416492fbf67ec813e",
"rev": "f3046f799c32d169398e9940d00018c3535ec8f6",
"type": "github"
},
"original": {
@ -461,11 +479,11 @@
"homebrew-core": {
"flake": false,
"locked": {
"lastModified": 1724279403,
"narHash": "sha256-k/OW0HDkdJHfo1E52PyfeEyBDH0LwXuM1VmmFxCvYk0=",
"lastModified": 1724581596,
"narHash": "sha256-/IEFvoNS7LM3mVIUvmKyekFTByORdTkcTWrmCz3gja8=",
"owner": "homebrew",
"repo": "homebrew-core",
"rev": "7270362c593e96b2368834f6a87cd0d904874eb9",
"rev": "0f996959e7c025eb54aa1ada8b43dad0737e78a6",
"type": "github"
},
"original": {
@ -543,11 +561,11 @@
]
},
"locked": {
"lastModified": 1724219898,
"narHash": "sha256-7PwlnEQDIbww8+nk0CHLeYTYMA23F/CkynHsX7Mxk+s=",
"lastModified": 1724561770,
"narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "d6703b988728b89456b32bac242c8689902e5a5b",
"rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e",
"type": "github"
},
"original": {
@ -676,11 +694,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1723991338,
"narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=",
"lastModified": 1724224976,
"narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "8a3354191c0d7144db9756a74755672387b702ba",
"rev": "c374d94f1536013ca8e92341b540eba4c22f9c62",
"type": "github"
},
"original": {
@ -706,6 +724,22 @@
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1724224976,
"narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c374d94f1536013ca8e92341b540eba4c22f9c62",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixvim": {
"inputs": {
"devshell": "devshell",
@ -765,11 +799,11 @@
"nixvim": "nixvim"
},
"locked": {
"lastModified": 1724568951,
"narHash": "sha256-hAZPVkjZi1xUEi4OGrVb+CYUlBjBbxUgCzzpB1MDPQQ=",
"lastModified": 1724569831,
"narHash": "sha256-GwBiSvqGOlkWqRfsgv9A+e+v6dPDd8J3YEwtez3jnkI=",
"owner": "youwen5",
"repo": "neovim-flake",
"rev": "707837ca26cf3e125309b883815d4bbfd25ccc92",
"rev": "e78144554b191f08a05c7e3d0cb7966c363fcdbb",
"type": "github"
},
"original": {
@ -820,7 +854,8 @@
"nixpkgs": "nixpkgs_3",
"personal-neovim": "personal-neovim",
"spicetify": "spicetify",
"stablepkgs": "stablepkgs"
"stablepkgs": "stablepkgs",
"vesktop-bin": "vesktop-bin"
}
},
"rust-overlay": {
@ -872,11 +907,11 @@
]
},
"locked": {
"lastModified": 1724472954,
"narHash": "sha256-65NfzEvwdJGHsOZA+w4AUFUG10RyfuQltct3h++gsw0=",
"lastModified": 1724559309,
"narHash": "sha256-9y3yreHjQyyn8bIQmTx1ZkiNGgq1og/PDUZLiE96iJA=",
"owner": "Gerg-L",
"repo": "spicetify-nix",
"rev": "3caf2a241f7af52419ce97c6682b0467219ab914",
"rev": "8d823dea059ec5de57f276360acbd0601b20e433",
"type": "github"
},
"original": {
@ -887,11 +922,11 @@
},
"stablepkgs": {
"locked": {
"lastModified": 1724098845,
"narHash": "sha256-D5HwjQw/02fuXbR4LCTo64koglP2j99hkDR79/3yLOE=",
"lastModified": 1724316499,
"narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "f1bad50880bae73ff2d82fafc22010b4fc097a9c",
"rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841",
"type": "github"
},
"original": {
@ -961,6 +996,21 @@
"type": "github"
}
},
"systems_5": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
@ -982,6 +1032,25 @@
"repo": "treefmt-nix",
"type": "github"
}
},
"vesktop-bin": {
"inputs": {
"flake-utils": "flake-utils_5",
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1724591359,
"narHash": "sha256-BOjN/xLegrPM02Uhhs3WyyTvin4tdWC+iBamoA7EtHY=",
"owner": "youwen5",
"repo": "vesktop-bin-flake",
"rev": "fe8b5fff01426dcb04dee671d228032c6894316f",
"type": "github"
},
"original": {
"owner": "youwen5",
"repo": "vesktop-bin-flake",
"type": "github"
}
}
},
"root": "root",

View file

@ -55,6 +55,8 @@
};
personal-neovim.url = "github:youwen5/neovim-flake";
vesktop-bin.url = "github:youwen5/vesktop-bin-flake";
};
outputs = {

View file

@ -36,8 +36,12 @@
settings.General.EnableNetworkConfiguration = true;
};
nixpkgs.overlays = [
nixpkgs.overlays = let
stablepkgs = inputs.stablepkgs.legacyPackages.${pkgs.system};
in [
inputs.apple-silicon.overlays.apple-silicon-overlay
inputs.vesktop-bin.overlays.default
(final: prev: {
hyprland = prev.hyprland.overrideAttrs (oldAttrs: {
src = oldAttrs.src;

View file

@ -1,7 +1,14 @@
{inputs, ...}: {
{
inputs,
pkgs,
...
}: let
stablepkgs = inputs.stablepkgs.legacyPackages.${pkgs.system};
bleedingpkgs = inputs.bleedingpkgs.legacyPackages.${pkgs.system};
in {
nixpkgs.overlays = [
(self: super: {
typst-lsp = inputs.stablepkgs.legacyPackages.${self.system}.typst-lsp;
librewolf = stablepkgs.librewolf;
})
];
}

View file

@ -26,6 +26,7 @@
init.defaultBranch = "main";
commit.gpgsign = pkgs.lib.mkDefault "true";
user.signingkey = "8F5E6C1AF90976CA7102917A865658ED1FE61EC3";
safe.directory = "/etc/nixos/.git";
};
};