lytedev/nix
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/unstable' into unstable

Browse source
This commit is contained in:
Daniel Flanagan 2024-07-29 11:29:39 -05:00
commit af7eaf7c57
5 changed files with 72 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
flake.lock
View file

@ -211,6 +211,26 @@
"type": "github" "type": "github"
} }
}, },
"home-manager-unstable": {
"inputs": {
"nixpkgs": [
"nixpkgs-unstable"
]
},
"locked": {
"lastModified": 1722203588,
"narHash": "sha256-91V5FMSQ4z9bkhTCf0f86Zjw0bh367daSf0mzCIW0vU=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "792757f643cedc13f02098d8ed506d82e19ec1da",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"hyprcursor": { "hyprcursor": {
"inputs": { "inputs": {
"hyprlang": [ "hyprlang": [
@ -474,6 +494,7 @@
"hardware": "hardware", "hardware": "hardware",
"helix": "helix", "helix": "helix",
"home-manager": "home-manager", "home-manager": "home-manager",
"home-manager-unstable": "home-manager-unstable",
"hyprland": "hyprland", "hyprland": "hyprland",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",

29
flake.nix
View file

@ -16,6 +16,9 @@
home-manager.url = "github:nix-community/home-manager/release-24.05"; home-manager.url = "github:nix-community/home-manager/release-24.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
home-manager-unstable.url = "github:nix-community/home-manager";
home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs-unstable";
helix.url = "github:helix-editor/helix/master"; helix.url = "github:helix-editor/helix/master";
hardware.url = "github:nixos/nixos-hardware"; hardware.url = "github:nixos/nixos-hardware";
hyprland.url = "github:hyprwm/Hyprland"; hyprland.url = "github:hyprwm/Hyprland";
@ -53,6 +56,7 @@
sops-nix, sops-nix,
git-hooks, git-hooks,
home-manager, home-manager,
home-manager-unstable,
helix, helix,
hardware, hardware,
# nnf, # nnf,
@ -217,12 +221,12 @@
}; };
nixosModules = import ./modules/nixos { nixosModules = import ./modules/nixos {
inherit home-manager helix nixosModules homeManagerModules pubkey overlays colors sops-nix disko; inherit home-manager home-manager-unstable helix nixosModules homeManagerModules pubkey overlays colors sops-nix disko;
flakeInputs = self.inputs; flakeInputs = self.inputs;
}; };
homeManagerModules = import ./modules/home-manager { homeManagerModules = import ./modules/home-manager {
inherit home-manager helix nixosModules homeManagerModules pubkey overlays colors; inherit home-manager home-manager-unstable helix nixosModules homeManagerModules pubkey overlays colors;
inherit (nixpkgs) lib; inherit (nixpkgs) lib;
flakeInputs = self.inputs; flakeInputs = self.inputs;
}; };
@ -231,6 +235,8 @@
beefcake = nixpkgs.lib.nixosSystem { beefcake = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = with nixosModules; [ modules = with nixosModules; [
home-manager-defaults
hardware.nixosModules.common-cpu-intel hardware.nixosModules.common-cpu-intel
common common
@ -249,9 +255,11 @@
]; ];
}; };
dragon = nixpkgs.lib.nixosSystem { dragon = nixpkgs-unstable.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = with nixosModules; [ modules = with nixosModules; [
home-manager-unstable-defaults
outputs.diskoConfigurations.standard outputs.diskoConfigurations.standard
hardware.nixosModules.common-cpu-amd hardware.nixosModules.common-cpu-amd
hardware.nixosModules.common-pc-ssd hardware.nixosModules.common-pc-ssd
@ -284,6 +292,8 @@
htpc = nixpkgs.lib.nixosSystem { htpc = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = with nixosModules; [ modules = with nixosModules; [
home-manager-defaults
hardware.nixosModules.common-pc-ssd hardware.nixosModules.common-pc-ssd
common common
@ -304,6 +314,8 @@
foxtrot = nixpkgs-unstable.lib.nixosSystem { foxtrot = nixpkgs-unstable.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = with nixosModules; [ modules = with nixosModules; [
home-manager-unstable-defaults
outputs.diskoConfigurations.standard outputs.diskoConfigurations.standard
hardware.nixosModules.framework-13-7040-amd hardware.nixosModules.framework-13-7040-amd
@ -341,9 +353,10 @@
]; ];
}; };
thablet = nixpkgs.lib.nixosSystem { thablet = nixpkgs-unstable.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = with nixosModules; [ modules = with nixosModules; [
home-manager-unstable-defaults
outputs.diskoConfigurations.standard outputs.diskoConfigurations.standard
hardware.nixosModules.lenovo-thinkpad-x1-yoga hardware.nixosModules.lenovo-thinkpad-x1-yoga
@ -399,9 +412,11 @@
# ]; # ];
# }; # };
thinker = nixpkgs.lib.nixosSystem { thinker = nixpkgs-unstable.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = with nixosModules; [ modules = with nixosModules; [
home-manager-unstable-defaults
{ {
_module.args = { _module.args = {
disks = ["/dev/nvme0n1"]; disks = ["/dev/nvme0n1"];
@ -439,6 +454,8 @@
musicbox = nixpkgs.lib.nixosSystem { musicbox = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = with nixosModules; [ modules = with nixosModules; [
home-manager-defaults
{ {
_module.args = { _module.args = {
disks = ["/dev/sda"]; disks = ["/dev/sda"];
@ -474,6 +491,7 @@
rascal = nixpkgs.lib.nixosSystem { rascal = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = with nixosModules; [ modules = with nixosModules; [
home-manager-defaults
hardware.nixosModules.common-cpu-amd hardware.nixosModules.common-cpu-amd
common common
./nixos/rascal.nix ./nixos/rascal.nix
@ -483,6 +501,7 @@
router = nixpkgs.lib.nixosSystem { router = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = with nixosModules; [ modules = with nixosModules; [
home-manager-defaults
outputs.diskoConfigurations.unencrypted outputs.diskoConfigurations.unencrypted
common common
linux linux

1
modules/home-manager/default.nix
View file

@ -4,6 +4,7 @@
flakeInputs, flakeInputs,
homeManagerModules, homeManagerModules,
home-manager, home-manager,
home-manager-unstable,
helix, helix,
nixosModules, nixosModules,
pubkey, pubkey,

13
modules/nixos/default.nix
View file

@ -5,6 +5,7 @@
flakeInputs, flakeInputs,
homeManagerModules, homeManagerModules,
home-manager, home-manager,
home-manager-unstable,
helix, helix,
nixosModules, nixosModules,
pubkey, pubkey,
@ -32,6 +33,16 @@
home-manager.backupFileExtension = "hm-backup"; home-manager.backupFileExtension = "hm-backup";
}; };
home-manager-unstable-defaults = {
imports = [
# enable home-manager
home-manager-unstable.nixosModules.home-manager
];
home-manager.useGlobalPkgs = true;
home-manager.backupFileExtension = "hm-backup";
};
mdns-and-lan-service-discovery = { mdns-and-lan-service-discovery = {
services.avahi = { services.avahi = {
enable = true; enable = true;
@ -875,8 +886,6 @@
my-favorite-default-system-apps my-favorite-default-system-apps
mosh mosh
home-manager-defaults
daniel daniel
]; ];

18
nixos/dragon.nix
View file

@ -4,10 +4,13 @@
config, config,
... ...
}: { }: {
imports = [
{
system.stateVersion = "24.05"; system.stateVersion = "24.05";
home-manager.users.daniel.home.stateVersion = "24.05"; home-manager.users.daniel.home.stateVersion = "24.05";
networking.hostName = "dragon"; networking.hostName = "dragon";
}
];
hardware.graphics.extraPackages = [ hardware.graphics.extraPackages = [
# pkgs.rocmPackages.clr.icd # pkgs.rocmPackages.clr.icd
pkgs.amdvlk pkgs.amdvlk
@ -17,11 +20,14 @@
pkgs.vaapiVdpau pkgs.vaapiVdpau
]; ];
boot.loader.efi.canTouchEfiVariables = true; boot = {
boot.loader.systemd-boot.enable = true; kernelPackages = pkgs.linuxPackages_zen;
boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "ahci" "usbhid"]; loader.efi.canTouchEfiVariables = true;
boot.kernelModules = ["kvm-amd"]; loader.systemd-boot.enable = true;
boot.supportedFilesystems = ["ntfs"]; initrd.availableKernelModules = ["xhci_pci" "nvme" "ahci" "usbhid"];
kernelModules = ["kvm-amd"];
supportedFilesystems = ["ntfs"];
};
hardware.bluetooth = { hardware.bluetooth = {
enable = true; enable = true;