Skip to content

Commit

Permalink
Unfree update
Browse files Browse the repository at this point in the history
  • Loading branch information
dmadisetti committed Jun 10, 2024
1 parent 867a530 commit e57e466
Show file tree
Hide file tree
Showing 3 changed files with 73 additions and 55 deletions.
2 changes: 2 additions & 0 deletions dot/gitconfig
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@

[alias]
l = log --graph --pretty=format:\"%C(auto)%h%<(3)%d %s %C(bold blue)(%cr, %an)%Creset\" --abbrev-commit --all
sync = "!f() { git fetch; git checkout origin/$1; git branch -f $1; git checkout $1; }; f"
squash = "!f() { git merge --squash $1; }; f"

[init]
defaultBranch = main
Expand Down
118 changes: 66 additions & 52 deletions flake.lock

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

8 changes: 5 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
# This ensures that we always use the official nix cache.
# nixpkgs.url = "/home/user/src/nixpkgs-local?cache-bust=4";
# TODO: Change to patch system NixOs/nix/issues#3920
nixpkgs.url = github:nixos/nixpkgs/57610d2f8f0937f39dbd72251e9614b1561942d8;
nixpkgs.url = github:nixos/nixpkgs/051f920625ab5aabe37c920346e3e69d7d34400e;
nixos-hardware.url = github:NixOS/nixos-hardware;

# Really just to streamline deps.
Expand Down Expand Up @@ -75,7 +75,7 @@
grub2-themes.inputs.nixpkgs.follows = "nixpkgs";

# Hyprland is **such** eye candy
hyprland.url = github:hyprwm/Hyprland/v0.40.0;
hyprland.url = github:hyprwm/Hyprland/v0.41.0;
hyprland.inputs.nixpkgs.follows = "nixpkgs";
hyprland.inputs.systems.follows = "systems";

Expand All @@ -101,6 +101,8 @@
overlays = import ./nix/overlays.nix { inherit sensitive inputs; };
config.allowUnfree = sensitive.lib.sellout or false;
# allow X to be installed if you don't have unfree enabled already
# You may have to flush sensitive from lock for this to work with
# changes.
config.allowUnfreePredicate = pkg: builtins.elem (nixpkgs.lib.getName pkg)
(if sensitive.lib ? unfree then sensitive.lib.unfree else []);

Expand Down Expand Up @@ -132,7 +134,7 @@

lambda = utils.mkComputer {
machineConfig = ./nix/machines/lambda.nix;
wm = "hyprland";
wm = "xmonad";
userConfigs = [ ./nix/home/daily-driver.nix ];
};

Expand Down

0 comments on commit e57e466

Please sign in to comment.