wymiller/nix-config-v2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include NixOS into configuration #2

Merged
wymiller merged 18 commits from nixos-snapshot-09092024 into master 2024-11-17 17:16:08 -06:00
Conversation 0 Commits 18 Files Changed 24 +119 -29
6 changed files with 119 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 50d37c0e6b - Show all commits

53
flake.lock
View File

@ -57,18 +57,36 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "nix-ld": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": { "locked": {
"lastModified": 1725693463, "lastModified": 1728031945,
"narHash": "sha256-ZPzhebbWBOr0zRWW10FfqfbJlan3G96/h3uqhiFqmwg=", "narHash": "sha256-NRkLjdMtVfC6dD1gEbYZWFEtbmC2xfD6ft1IP7l76Vw=",
"owner": "nixos", "owner": "Mic92",
"repo": "nixpkgs", "repo": "nix-ld",
"rev": "68e7dce0a6532e876980764167ad158174402c6f", "rev": "4524c512e8729ccb5a1b9239d01e1474cbf074a2",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "Mic92",
"ref": "nixos-24.05", "repo": "nix-ld",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1727634051,
"narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -89,12 +107,29 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1726243404,
"narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"darwin": "darwin", "darwin": "darwin",
"home-manager": "home-manager", "home-manager": "home-manager",
"nix-flatpak": "nix-flatpak", "nix-flatpak": "nix-flatpak",
"nixpkgs": "nixpkgs", "nix-ld": "nix-ld",
"nixpkgs": "nixpkgs_2",
"nixpkgs-darwin": "nixpkgs-darwin" "nixpkgs-darwin": "nixpkgs-darwin"
} }
} }

76
flake.nix
View File

@ -1,9 +1,10 @@
{ {
description = "Wyatt's nix configuration suite"; description = "Wyatt's nix configuration suite";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1"; nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1";
nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-24.05-darwin"; nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-24.05-darwin";
nix-ld.url = "github:Mic92/nix-ld";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-24.05"; url = "github:nix-community/home-manager/release-24.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -18,6 +19,7 @@
self, self,
nixpkgs, nixpkgs,
nix-flatpak, nix-flatpak,
nix-ld,
darwin, darwin,
home-manager, home-manager,
... ...
@ -25,7 +27,7 @@
userName = "wyatt"; userName = "wyatt";
userEmail = "wyatt@wyattjmiller.com"; userEmail = "wyatt@wyattjmiller.com";
extraSpecialArgs = { extraSpecialArgs = {
inherit userName userEmail; inherit userName userEmail ;
}; };
in { in {
# Primary laptop - MacBook Pro (2023, M3) # Primary laptop - MacBook Pro (2023, M3)
@ -36,10 +38,10 @@
hostname = "sephiroth"; hostname = "sephiroth";
}; };
modules = [ modules = [
./modules/nix-core.nix ./modules/common/nix-core.nix
./modules/darwin/configuration.nix ./modules/common/host-users.nix
./modules/darwin/apps.nix ./modules/machine/sephiroth/configuration.nix
./modules/host-users.nix ./modules/machine/sephiroth/apps.nix
home-manager.darwinModules.home-manager home-manager.darwinModules.home-manager
{ {
@ -59,11 +61,12 @@
hostname = "cloud"; hostname = "cloud";
}; };
modules = [ modules = [
nix-flatpak.nixosModules.nix-flatpak nix-flatpak.nixosModules.nix-flatpak
./modules/nixos/hardware-configuration.nix nix-ld.nixosModules.nix-ld
./modules/nix-core.nix ./modules/common/nix-core.nix
./modules/nixos/configuration.nix ./modules/common/host-users.nix
./modules/host-users.nix ./modules/machine/cloud/hardware-configuration.nix
./modules/machine/cloud/configuration.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
@ -76,5 +79,56 @@
} }
]; ];
}; };
# Apartment appliance server
nixosConfigurations."valefor" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {
inherit userName userEmail;
hostname = "valefor";
};
# modules = [
# nix-ld.nixosModules.nix-ld
# ./modules/nix-core.nix
# ./modules/host-users.nix
#
# home-manager.nixosModules.home-manager
# {
# home-manager.useGlobalPkgs = true;
# home-manager.useUserPackages = true;
# home-manager.extraSpecialArgs = extraSpecialArgs;
# home-manager.users.${userName}.imports = [
# ./home
# ];
# }
# ];
};
# Storage, status, game, and media server
nixosConfigurations."ixion" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {
inherit userName userEmail;
hostname = "ixion";
};
# modules = [
# nix-flatpak.nixosModules.nix-flatpak
# nix-ld.nixosModules.nix-ld
# ./modules/nixos/hardware-configuration.nix
# ./modules/nix-core.nix
# ./modules/nixos/configuration.nix
# ./modules/host-users.nix
#
# home-manager.nixosModules.home-manager
# {
# home-manager.useGlobalPkgs = true;
# home-manager.useUserPackages = true;
# home-manager.extraSpecialArgs = extraSpecialArgs;
# home-manager.users.${userName}.imports = [
# ./home
# ];
# }
# ];
};
}; };
} }

1
home/core.nix
View File

@ -22,6 +22,7 @@
aria2 aria2
yt-dlp yt-dlp
imv imv
xdg-utils
# misc # misc
cowsay cowsay

9
home/default.nix
View File

@ -36,12 +36,17 @@ in {
sessionVariables = { sessionVariables = {
XDG_CURRENT_DESKTOP = "sway"; XDG_CURRENT_DESKTOP = "sway";
XDG_SESSION_TYPE = "wayland";
XDG_CONFIG_HOME = "$HOME/.config";
XDG_CACHE_HOME = "$HOME/.cache";
XDG_DATA_HOME = "$HOME/.local/share";
XDG_STATE_HOME = "$HOME/.local/state";
}; };
pointerCursor = { pointerCursor = {
gtk.enable = true; gtk.enable = true;
package = pkgs.bibata-cursors; package = pkgs.catppuccin-cursors.mochaDark;
name = "Bibata-Modern-Classic"; name = "catppuccin-mocha-dark-cursors";
size = 22; size = 22;
}; };

3
home/git.nix
View File

@ -32,7 +32,8 @@
# common aliases # common aliases
br = "branch"; br = "branch";
co = "checkout"; co = "checkout";
st = "status"; st = "status -sb";
status = "status -sb";
ls = "log --pretty=format:\"%C(yellow)%h%Cred%d\\\\ %Creset%s%Cblue\\\\ [%cn]\" --decorate"; ls = "log --pretty=format:\"%C(yellow)%h%Cred%d\\\\ %Creset%s%Cblue\\\\ [%cn]\" --decorate";
ll = "log --pretty=format:\"%C(yellow)%h%Cred%d\\\\ %Creset%s%Cblue\\\\ [%cn]\" --decorate --numstat"; ll = "log --pretty=format:\"%C(yellow)%h%Cred%d\\\\ %Creset%s%Cblue\\\\ [%cn]\" --decorate --numstat";
cm = "commit -m"; cm = "commit -m";

6
home/shairport.nix
View File

@ -1,6 +0,0 @@
{ pkgs, ... }: {
services.shairport-sync = {
enable = pkgs.stdenv.isLinux;
openFirewall = pkgs.stdenv.isLinux;
};
}