flake.lock: Update

Flake lock file updates:

• Updated input 'emacs':
    'github:nix-community/emacs-overlay/1a47948bbbe3eea50deaabf5f260d3b2a233aaa5' (2023-11-09)
  → 'github:nix-community/emacs-overlay/2dc0beb6d0f3d19c577faab69b6338fb5a1ce17e' (2023-11-10)
• Updated input 'hyprland':
    'github:hyprwm/Hyprland/b8a615ffb892aaa35a15dc732208bb7ad2a60209' (2023-11-10)
  → 'github:hyprwm/Hyprland/1e6e9b66a5837d62d374edd405bdf561813ebbce' (2023-11-10)
This commit is contained in:
Kyle Brown 2023-11-10 14:17:15 -08:00
parent b2cd580ff5
commit cf8459857a
3 changed files with 62 additions and 57 deletions

12
flake.lock generated
View file

@ -74,11 +74,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1699551543,
"narHash": "sha256-ebN9O4T4wFu9C0vXNsnDREtBP1FUi0M1aqfABGMA5P0=",
"lastModified": 1699641089,
"narHash": "sha256-GFCZUagiE11YLA9FV6CXlrVtNe/LbxrX35Sp2wdZ1LE=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "1a47948bbbe3eea50deaabf5f260d3b2a233aaa5",
"rev": "2dc0beb6d0f3d19c577faab69b6338fb5a1ce17e",
"type": "github"
},
"original": {
@ -280,11 +280,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1699575202,
"narHash": "sha256-IDNZZErKzweLJ48nsFEwy3Kz81QFIyBQVkRbypoVu2M=",
"lastModified": 1699652720,
"narHash": "sha256-OAS146JedQbCAySJ3xOs6kaG1GVWYT6+vIK3p6HcYus=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "b8a615ffb892aaa35a15dc732208bb7ad2a60209",
"rev": "1e6e9b66a5837d62d374edd405bdf561813ebbce",
"type": "github"
},
"original": {

100
flake.nix
View file

@ -1,54 +1,6 @@
{
description = "Your new nix config";
inputs = {
# Nixpkgs
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
# You can access packages and modules from different nixpkgs revs
# at the same time. Here's an working example:
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
# Also see the 'unstable-packages' overlay at 'overlays/default.nix'.
# Home manager
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
darwin = {
url = "github:lnl7/nix-darwin";
inputs.nixpkgs.follows = "nixpkgs";
};
apple-silicon = {
url = "github:tpwrules/nixos-apple-silicon";
inputs.nixpkgs.follows = "nixpkgs";
};
nixvim = {
url = "github:pta2002/nixvim";
inputs.nixpkgs.follows = "nixpkgs";
};
hyprland = {
url = "github:hyprwm/Hyprland";
inputs.nixpkgs.follows = "nixpkgs";
};
emacs = {
url = "github:nix-community/emacs-overlay";
inputs.nixpkgs.follows = "nixpkgs";
};
pre-commit-hooks = {
url = "github:cachix/pre-commit-hooks.nix";
inputs.nixpkgs.follows = "nixpkgs";
};
nix-index-database = {
url = "github:Mic92/nix-index-database";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = {
self,
nixpkgs,
@ -118,11 +70,11 @@
# Reusable nixos modules you might want to export
# These are usually stuff you would upstream into nixpkgs
nixosModules = import ./modules/nixos;
# nixosModules = import ./modules/nixos;
# Reusable home-manager modules you might want to export
# These are usually stuff you would upstream into home-manager
homeManagerModules = import ./modules/home-manager;
# homeManagerModules = import ./modules/home-manager;
# NixOS configuration entrypoint
# Available through 'nixos-rebuild --flake .#your-hostname'
@ -157,4 +109,52 @@
"kdb424@zapp" = mkHome [./home-manager/machines/headless.nix] nixpkgs.legacyPackages.x86_64-linux;
};
};
inputs = {
# Nixpkgs
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
# You can access packages and modules from different nixpkgs revs
# at the same time. Here's an working example:
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
# Also see the 'unstable-packages' overlay at 'overlays/default.nix'.
# Home manager
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
darwin = {
url = "github:lnl7/nix-darwin";
inputs.nixpkgs.follows = "nixpkgs";
};
apple-silicon = {
url = "github:tpwrules/nixos-apple-silicon";
inputs.nixpkgs.follows = "nixpkgs";
};
nixvim = {
url = "github:pta2002/nixvim";
inputs.nixpkgs.follows = "nixpkgs";
};
hyprland = {
url = "github:hyprwm/Hyprland";
inputs.nixpkgs.follows = "nixpkgs";
};
emacs = {
url = "github:nix-community/emacs-overlay";
inputs.nixpkgs.follows = "nixpkgs";
};
pre-commit-hooks = {
url = "github:cachix/pre-commit-hooks.nix";
inputs.nixpkgs.follows = "nixpkgs";
};
nix-index-database = {
url = "github:Mic92/nix-index-database";
inputs.nixpkgs.follows = "nixpkgs";
};
};
}

View file

@ -44,6 +44,11 @@ rebuild_flags := `if [ -d /boot/asahi ]; then echo "--impure"; else echo ""; fi`
build target_host=hostname flags="":
nixos-rebuild build --flake .#{{target_host}} {{rebuild_flags}} {{flags}}
# Build the NixOS configuration without switching to it
[linux]
build-vm target_host=hostname flags="":
nixos-rebuild build-vm --flake .#{{target_host}} {{rebuild_flags}} {{flags}}
# Build the NixOS config with the --show-trace flag set
[linux]
trace target_host=hostname: (build target_host "--show-trace")
@ -55,7 +60,7 @@ switch target_host=hostname:
# Update flake inputs to their latest revisions
update:
nix flake update
nix flake update --commit-lock-file
# Garbage collect old OS generations and remove stale packages from the nix store