diff --git a/Makefile b/Makefile index 8dfe8ff..5ea174d 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ home : home-manager $(MODE) $(FLAGS) --flake $(FLAKE)#$(HOST) iso : - nix build ".#nixosConfigurations.iso.config.system.build.isoImage" + nix build ".#nixosConfigurations.iso.config.system.build.isoImage" $(FLAGS) cp result/iso/*.iso . rm -rf result diff --git a/flake.lock b/flake.lock index 93f0b6d..30aaa52 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1741786843, - "narHash": "sha256-1m1krwWuROjou56kuILpYZ3imlOgpW2hPqczObinQwQ=", + "lastModified": 1742270601, + "narHash": "sha256-oR9tN8QhUMdiMOUfJCbiT8yxYf1aF4dEPsLUH784sL0=", "owner": "rycee", "repo": "nur-expressions", - "rev": "51bc10cdd5c2ea8f2cd5adcc587ba0479409312e", + "rev": "89347d57851b57975201ef4941e3d57dc3922d59", "type": "gitlab" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1741791118, - "narHash": "sha256-4Y427uj0eql4yRU5rely3EcOlB9q457UDbG9omPtXiA=", + "lastModified": 1742305478, + "narHash": "sha256-iYCinzZnnUeCkZ031qGRwPdwRsqW6o9Y0MgGpA7Zva4=", "owner": "nix-community", "repo": "home-manager", - "rev": "18780912345970e5b546b1b085385789b6935a83", + "rev": "fb74bb76d94a6c55632376c931fc108131260ee9", "type": "github" }, "original": { @@ -60,11 +60,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1741792691, - "narHash": "sha256-f0BVt1/cvA0DQ/q3rB+HY4g4tKksd03ZkzI4xehC2Ew=", + "lastModified": 1742217307, + "narHash": "sha256-3fwpN7KN226ghLlpO9TR0/WpgQOmOj1e8bieUxpIYSk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e1f12151258b12c567f456d8248e4694e9390613", + "rev": "4f4d97d7b7be387286cc9c988760a7ebaa5be1f1", "type": "github" }, "original": { @@ -76,27 +76,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741513245, - "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", + "lastModified": 1742069588, + "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", - "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", + "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", "type": "github" }, "original": { @@ -108,7 +92,9 @@ }, "plymouth-theme-ycontre-glow": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1731939263, @@ -117,11 +103,11 @@ "rev": "702e7b014ef6cf748252e797724e4096bafcaafa", "revCount": 1, "type": "git", - "url": "file:///home/tom/Desktop/bordel/ycontre-glow" + "url": "file:///home/tom/desktop/bordel/ycontre-glow" }, "original": { "type": "git", - "url": "file:///home/tom/Desktop/bordel/ycontre-glow" + "url": "file:///home/tom/desktop/bordel/ycontre-glow" } }, "root": { diff --git a/flake.nix b/flake.nix index 4cff45b..013ba3f 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ # 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 = { - 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 { inherit pkgs; - extraSpecialArgs = { inherit inputs; username = username; homeDir = homeDir; }; + extraSpecialArgs = { inherit inputs; username = username; homeDir = homeDir; isOs = false; }; modules = nixpkgs.lib.concatLists [ [ ./homeConfigs/home.nix ./homeConfigs/hosts/${flakeName}.nix] extraModules @@ -61,9 +62,12 @@ iso = nixpkgs.lib.nixosSystem { inherit pkgs; + specialArgs = { inherit inputs; }; modules = [ (nixpkgs + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix") ./osConfigs/hosts/iso.nix + inputs.home-manager.nixosModules.default + ]; }; }; diff --git a/homeConfigs/home.nix b/homeConfigs/home.nix index 618c634..4c731ba 100644 --- a/homeConfigs/home.nix +++ b/homeConfigs/home.nix @@ -6,23 +6,29 @@ # 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 [ [ ./packages.nix ] (lib.fileset.toList ./modules) ]; - - home.username = "${username}"; - home.homeDirectory = "${homeDir}"; + + home.username = lib.mkIf (!isOs) "${username}"; + home.homeDirectory = lib.mkIf (!isOs) "${homeDir}"; home.stateVersion = "24.05"; +# programs.ghostty.enable = true; +# programs.ghostty.settings = { +# theme = "catppuccin-mocha"; +# font-size = 9; +# }; + home.pointerCursor = { gtk.enable = true; package = pkgs.bibata-cursors; diff --git a/homeConfigs/modules/alacritty.nix b/homeConfigs/modules/alacritty.nix index fb96407..eac17ff 100644 --- a/homeConfigs/modules/alacritty.nix +++ b/homeConfigs/modules/alacritty.nix @@ -13,7 +13,7 @@ settings = { window.opacity = 0.9; env.XTERM = "xterm-256color"; - font.size = 10; + font.size = 9; }; }; }; diff --git a/osConfigs/hosts/iso.nix b/osConfigs/hosts/iso.nix index 99a7a43..6efc6c3 100644 --- a/osConfigs/hosts/iso.nix +++ b/osConfigs/hosts/iso.nix @@ -1,17 +1,21 @@ -{ ... }: +{lib, inputs, pkgs, ... }: { - imports = [ ../packages.nix ]; + imports = [ + ../packages.nix + ]; + + users.users.tom = { + isNormalUser = true; + extraGroups = [ "wheel" "networkmanager" "video" ]; + initialHashedPassword = ""; + }; - environment.etc."skel/nix-config".source = "${builtins.fetchGit { - url = "https://github.com/ARandomPig/nix-config"; - rev = "6982747ec65962a13dd07948b2317d8d571f39b8"; - ref = "master"; - }}"; - - system.activationScripts.populateUser.text = '' - mkdir -p /home/nixos - cp -r /etc/skel/nix-config - chown -R nixos:nixos /home/nixos/nix-config - ''; + services.getty.autologinUser = lib.mkForce "tom"; + services.getty.helpLine = lib.mkForce ""; + + home-manager.extraSpecialArgs = { inherit inputs; inherit pkgs; isOs = true;}; + home-manager.users.tom = { + imports = [ ../../homeConfigs/home.nix ]; + }; } diff --git a/osConfigs/packages.nix b/osConfigs/packages.nix index a888884..057ccc2 100644 --- a/osConfigs/packages.nix +++ b/osConfigs/packages.nix @@ -3,7 +3,6 @@ { environment.systemPackages = with pkgs; [ home-manager - killall vim pciutils pigz @@ -25,5 +24,6 @@ ffmpeg cryptsetup acpi + dconf ]; }