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

make custom iso have its own home configurations

Browse Source
This commit is contained in:
tomoron
2025-03-21 19:00:57 +01:00
parent 1fd70894ae
commit 0e2523c2eb
7 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -17,7 +17,7 @@ home :
home-manager $(MODE) $(FLAGS) --flake $(FLAKE)#$(HOST) home-manager $(MODE) $(FLAGS) --flake $(FLAKE)#$(HOST)
iso : iso :
nix build ".#nixosConfigurations.iso.config.system.build.isoImage" nix build ".#nixosConfigurations.iso.config.system.build.isoImage" $(FLAGS)
cp result/iso/*.iso . cp result/iso/*.iso .
rm -rf result rm -rf result

48
flake.lock generated
View File

@ -9,11 +9,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1741786843, "lastModified": 1742270601,
"narHash": "sha256-1m1krwWuROjou56kuILpYZ3imlOgpW2hPqczObinQwQ=", "narHash": "sha256-oR9tN8QhUMdiMOUfJCbiT8yxYf1aF4dEPsLUH784sL0=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "51bc10cdd5c2ea8f2cd5adcc587ba0479409312e", "rev": "89347d57851b57975201ef4941e3d57dc3922d59",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -45,11 +45,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741791118, "lastModified": 1742305478,
"narHash": "sha256-4Y427uj0eql4yRU5rely3EcOlB9q457UDbG9omPtXiA=", "narHash": "sha256-iYCinzZnnUeCkZ031qGRwPdwRsqW6o9Y0MgGpA7Zva4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "18780912345970e5b546b1b085385789b6935a83", "rev": "fb74bb76d94a6c55632376c931fc108131260ee9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -60,11 +60,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1741792691, "lastModified": 1742217307,
"narHash": "sha256-f0BVt1/cvA0DQ/q3rB+HY4g4tKksd03ZkzI4xehC2Ew=", "narHash": "sha256-3fwpN7KN226ghLlpO9TR0/WpgQOmOj1e8bieUxpIYSk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "e1f12151258b12c567f456d8248e4694e9390613", "rev": "4f4d97d7b7be387286cc9c988760a7ebaa5be1f1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -76,27 +76,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1741513245, "lastModified": 1742069588,
"narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1741513245,
"narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -108,7 +92,9 @@
}, },
"plymouth-theme-ycontre-glow": { "plymouth-theme-ycontre-glow": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_2" "nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1731939263, "lastModified": 1731939263,
@ -117,11 +103,11 @@
"rev": "702e7b014ef6cf748252e797724e4096bafcaafa", "rev": "702e7b014ef6cf748252e797724e4096bafcaafa",
"revCount": 1, "revCount": 1,
"type": "git", "type": "git",
"url": "file:///home/tom/Desktop/bordel/ycontre-glow" "url": "file:///home/tom/desktop/bordel/ycontre-glow"
}, },
"original": { "original": {
"type": "git", "type": "git",
"url": "file:///home/tom/Desktop/bordel/ycontre-glow" "url": "file:///home/tom/desktop/bordel/ycontre-glow"
} }
}, },
"root": { "root": {

10
flake.nix
View File

@ -6,7 +6,7 @@
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ # # By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2024/10/17 18:15:24 by tomoron #+# #+# # # Created: 2024/10/17 18:15:24 by tomoron #+# #+# #
# Updated: 2025/03/10 00:53:03 by tomoron ### ########.fr # # Updated: 2025/03/19 15:48:10 by tomoron ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -27,7 +27,8 @@
}; };
plymouth-theme-ycontre-glow = { plymouth-theme-ycontre-glow = {
url = "git+file:///home/tom/Desktop/bordel/ycontre-glow"; url = "git+file:///home/tom/desktop/bordel/ycontre-glow";
inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };
@ -45,7 +46,7 @@
homeConfig = {flakeName, extraModules ? [], username ? "tom", homeDir ? "/home/tom"}: home-manager.lib.homeManagerConfiguration { homeConfig = {flakeName, extraModules ? [], username ? "tom", homeDir ? "/home/tom"}: home-manager.lib.homeManagerConfiguration {
inherit pkgs; inherit pkgs;
extraSpecialArgs = { inherit inputs; username = username; homeDir = homeDir; }; extraSpecialArgs = { inherit inputs; username = username; homeDir = homeDir; isOs = false; };
modules = nixpkgs.lib.concatLists [ modules = nixpkgs.lib.concatLists [
[ ./homeConfigs/home.nix ./homeConfigs/hosts/${flakeName}.nix] [ ./homeConfigs/home.nix ./homeConfigs/hosts/${flakeName}.nix]
extraModules extraModules
@ -61,9 +62,12 @@
iso = nixpkgs.lib.nixosSystem { iso = nixpkgs.lib.nixosSystem {
inherit pkgs; inherit pkgs;
specialArgs = { inherit inputs; };
modules = [ modules = [
(nixpkgs + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix") (nixpkgs + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix")
./osConfigs/hosts/iso.nix ./osConfigs/hosts/iso.nix
inputs.home-manager.nixosModules.default
]; ];
}; };
}; };

14
homeConfigs/home.nix
View File

@ -6,11 +6,11 @@
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ # # By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2024/10/17 18:15:38 by tomoron #+# #+# # # Created: 2024/10/17 18:15:38 by tomoron #+# #+# #
# Updated: 2025/03/05 23:44:33 by tomoron ### ########.fr # # Updated: 2025/03/19 15:45:13 by tomoron ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
{lib, pkgs, username,homeDir, ... }: {lib, pkgs, username ? "tom" ,homeDir ? "/home/tom", isOs ? false, ... }:
{ {
imports = lib.concatLists [ imports = lib.concatLists [
@ -18,11 +18,17 @@
(lib.fileset.toList ./modules) (lib.fileset.toList ./modules)
]; ];
home.username = "${username}"; home.username = lib.mkIf (!isOs) "${username}";
home.homeDirectory = "${homeDir}"; home.homeDirectory = lib.mkIf (!isOs) "${homeDir}";
home.stateVersion = "24.05"; home.stateVersion = "24.05";
# programs.ghostty.enable = true;
# programs.ghostty.settings = {
# theme = "catppuccin-mocha";
# font-size = 9;
# };
home.pointerCursor = { home.pointerCursor = {
gtk.enable = true; gtk.enable = true;
package = pkgs.bibata-cursors; package = pkgs.bibata-cursors;

2
homeConfigs/modules/alacritty.nix
View File

@ -13,7 +13,7 @@
settings = { settings = {
window.opacity = 0.9; window.opacity = 0.9;
env.XTERM = "xterm-256color"; env.XTERM = "xterm-256color";
font.size = 10; font.size = 9;
}; };
}; };
}; };

28
osConfigs/hosts/iso.nix
View File

@ -1,17 +1,21 @@
{ ... }: {lib, inputs, pkgs, ... }:
{ {
imports = [ ../packages.nix ]; imports = [
../packages.nix
];
environment.etc."skel/nix-config".source = "${builtins.fetchGit { users.users.tom = {
url = "https://github.com/ARandomPig/nix-config"; isNormalUser = true;
rev = "6982747ec65962a13dd07948b2317d8d571f39b8"; extraGroups = [ "wheel" "networkmanager" "video" ];
ref = "master"; initialHashedPassword = "";
}}"; };
system.activationScripts.populateUser.text = '' services.getty.autologinUser = lib.mkForce "tom";
mkdir -p /home/nixos services.getty.helpLine = lib.mkForce "";
cp -r /etc/skel/nix-config
chown -R nixos:nixos /home/nixos/nix-config home-manager.extraSpecialArgs = { inherit inputs; inherit pkgs; isOs = true;};
''; home-manager.users.tom = {
imports = [ ../../homeConfigs/home.nix ];
};
} }

2
osConfigs/packages.nix
View File

@ -3,7 +3,6 @@
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
home-manager home-manager
killall
vim vim
pciutils pciutils
pigz pigz
@ -25,5 +24,6 @@
ffmpeg ffmpeg
cryptsetup cryptsetup
acpi acpi
dconf
]; ];
} }