Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): lock file maintenance #133

Merged
merged 4 commits into from
Dec 23, 2024
Merged

chore(deps): lock file maintenance #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
97f9a6e
chore(deps): lock file maintenance
anthonyenr1quez-renovate[bot] Dec 8, 2024
f9c5181
update flake locks
AnthonyEnr1quez Dec 23, 2024
cb446b7
error: nur.hmModules.nur has been replaced by nur.modules.homeManager…
AnthonyEnr1quez Dec 23, 2024
b922178
catppuccin option changes
AnthonyEnr1quez Dec 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 79 additions & 30 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 9 additions & 3 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@
inputs.nixpkgs.follows = "nixpkgs";
};
catppuccin.url = "github:catppuccin/nix";
nur.url = "github:nix-community/NUR";
nur = {
url = "github:nix-community/NUR";
inputs.nixpkgs.follows = "nixpkgs";
};

nixos-wsl = {
url = "github:nix-community/NixOS-WSL";
Expand Down Expand Up @@ -67,11 +70,14 @@
(
{ pkgs, config, inputs, ... }:
{
nixpkgs.overlays = [ firefox-darwin.overlay ];
nixpkgs.overlays = [
firefox-darwin.overlay
nur.overlays.default
];
home-manager.sharedModules = [
catppuccin.homeManagerModules.catppuccin
mac-app-util.homeManagerModules.default
nur.hmModules.nur
nur.modules.homeManager.default
];
}
)
Expand Down
6 changes: 3 additions & 3 deletions hosts/darwin/MacBook-Pro-2/direnvs/mf/flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions hosts/darwin/damascus/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
hm = {
firefox-dev = {
bookmarksToolbar = "never";
# lol, there has to be an easier way
extraExtensions = with config.home-manager.users.${config.user.name}.nur.repos.rycee.firefox-addons; [
extraExtensions = with pkgs.nur.repos.rycee.firefox-addons; [
facebook-container
multi-account-containers
news-feed-eradicator
Expand Down
13 changes: 6 additions & 7 deletions modules/home-manager/catppuccin/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
{ config, pkgs, ... }: {
catppuccin.flavor = "mocha";
catppuccin = {
flavor = "mocha";

# todo, probably should be where we enable these
programs = {
bat.catppuccin.enable = true;
fzf.catppuccin.enable = true;
# k9s.catppuccin.enable = true;
kitty.catppuccin.enable = true;
bat.enable = true;
fzf.enable = true;
# k9s.enable = true; # TODO
kitty.enable = true;
};
}
2 changes: 1 addition & 1 deletion modules/home-manager/firefox/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ in
profiles.default = {
isDefault = true;

extensions = with config.nur.repos.rycee.firefox-addons; [
extensions = with pkgs.nur.repos.rycee.firefox-addons; [
bitwarden
privacy-badger
refined-github
Expand Down
Loading