diff --git a/configs/common.nix b/configs/common.nix index f6ba05f..6ef2faf 100644 --- a/configs/common.nix +++ b/configs/common.nix @@ -164,10 +164,10 @@ tailscale # Thunar stuff - xfce.thunar - xfce.thunar-volman - xfce.thunar-vcs-plugin - xfce.thunar-archive-plugin + thunar + thunar-volman + thunar-vcs-plugin + thunar-archive-plugin # Apps pavucontrol @@ -280,9 +280,4 @@ # The comment system.stateVersion = "25.05"; # Did you read the comment? - system.autoUpgrade = { - enable = true; - allowReboot = false; - }; - } diff --git a/configs/configuration-pc.nix b/configs/configuration-pc.nix index 476c60d..bf8b917 100644 --- a/configs/configuration-pc.nix +++ b/configs/configuration-pc.nix @@ -32,6 +32,8 @@ networking.interfaces.enp5s0.wakeOnLan.enable = true; networking.firewall.enable = false; + systemd.services.NetworkManager-wait-online.enable = false; + services.displayManager = { autoLogin.enable = true; autoLogin.user = "user01"; @@ -68,5 +70,6 @@ virtualisation.docker = { enable = true; + enableOnBoot = false; }; } diff --git a/modules/chataigne/flake.nix b/modules/chataigne/flake.nix index 459a45b..250f496 100644 --- a/modules/chataigne/flake.nix +++ b/modules/chataigne/flake.nix @@ -3,7 +3,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; # Modern Nixpkgs - + # Pinned Nixpkgs for compatibility (the commit that fixes the CURL_GNUTLS_3 issue) pinned-nixpkgs = { url = "github:NixOS/nixpkgs/5171d7b0a9fbaaf216c873622eb5115b6db97957"; @@ -11,31 +11,41 @@ }; }; - outputs = { self, nixpkgs, pinned-nixpkgs, ... }: - let - # Supported systems - supportedSystems = [ "x86_64-linux" ]; + outputs = + { + self, + nixpkgs, + pinned-nixpkgs, + ... + }: + let + # Supported systems + supportedSystems = [ "x86_64-linux" ]; - # The main package definition logic is imported as a function - chataigne-appimage-runner = import ./chataigne.nix; + # The main package definition logic is imported as a function + chataigne-appimage-runner = import ./chataigne.nix; - # Function to generate the package set for each system - forAllSystems = f: nixpkgs.lib.genAttrs supportedSystems (system: f system); - in - { - packages = forAllSystems (system: - let - pkgs = import nixpkgs { inherit system; config.allowUnfree = true; }; - pinnedPkgs = import pinned-nixpkgs { inherit system; }; - in - { - chataigne = chataigne-appimage-runner { - inherit pkgs pinnedPkgs; - }; - - # Also expose the default package for convenience - default = self.packages.${system}.chataigne; - } - ); - }; + # Function to generate the package set for each system + forAllSystems = f: nixpkgs.lib.genAttrs supportedSystems (system: f system); + in + { + packages = forAllSystems ( + system: + let + pkgs = import nixpkgs { + inherit system; + config.allowUnfree = true; + }; + pinnedPkgs = import pinned-nixpkgs { inherit system; }; + in + { + chataigne = chataigne-appimage-runner { + inherit pkgs pinnedPkgs; + }; + + # Also expose the default package for convenience + default = self.packages.${system}.chataigne; + } + ); + }; }