diff --git a/flake.nix b/flake.nix index 8f5b787..49ca655 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "NixOS Configuration"; + description = "Lyes' nix files"; inputs = { # nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; @@ -38,8 +38,12 @@ desktop-iso = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = inputs; - modules = [ ./hosts/iso ]; + modules = [ ./hosts/desktop-iso ]; }; }; + + packages."x86_64-linux" = { + desktop-iso = self.nixosConfigurations.desktop-iso.config.system.build.isoImage; + }; }; } diff --git a/hosts/iso/default.nix b/hosts/desktop-iso/default.nix similarity index 80% rename from hosts/iso/default.nix rename to hosts/desktop-iso/default.nix index b54ea2d..017b663 100644 --- a/hosts/iso/default.nix +++ b/hosts/desktop-iso/default.nix @@ -1,16 +1,21 @@ -{ pkgs, lib, nix-flatpak, nixpkgs, ... }: +{ pkgs, lib, nix-flatpak, agenix, nixpkgs, ... }: let calamares-auto-start = pkgs.makeAutostartItem { name = "io.calamares.calamares"; package = pkgs.calamares-nixos; }; in { - import = + imports = [ + ../../users/lyes + ../../users/lyes/desktop + ../../modules ../../modules/desktop ../../modules/gaming - ../../modules/nvidia + ../../modules/gnome + ../../modules/sway nix-flatpak.nixosModules.nix-flatpak + agenix.nixosModules.default "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix" "${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix" ]; diff --git a/users/lyes/desktop/dconf.nix b/users/lyes/desktop/dconf.nix index 347bfe9..ff0e89e 100644 --- a/users/lyes/desktop/dconf.nix +++ b/users/lyes/desktop/dconf.nix @@ -127,11 +127,11 @@ in }; "dash-to-panel" = { - animate-appicon-hover-animation-extent = { - RIPPLE = 4; - PLANK = 4; - SIMPLE = 1; - }; + # animate-appicon-hover-animation-extent = { + # RIPPLE = 4; + # PLANK = 4; + # SIMPLE = 1; + # }; appicon-margin = 0; appicon-padding = 4; appicon-style = "NORMAL";