diff --git a/configuration.nix b/configuration.nix index af9e347..354aa96 100644 --- a/configuration.nix +++ b/configuration.nix @@ -37,24 +37,26 @@ in { time.timeZone = "Europe/Berlin"; # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; - - i18n.extraLocaleSettings = { - LC_ADDRESS = "de_DE.UTF-8"; - LC_IDENTIFICATION = "de_DE.UTF-8"; - LC_MEASUREMENT = "de_DE.UTF-8"; - LC_MONETARY = "de_DE.UTF-8"; - LC_NAME = "de_DE.UTF-8"; - LC_NUMERIC = "de_DE.UTF-8"; - LC_PAPER = "de_DE.UTF-8"; - LC_TELEPHONE = "de_DE.UTF-8"; - LC_TIME = "de_DE.UTF-8"; + i18n = { + defaultLocale = "en_US.UTF-8"; + extraLocaleSettings = { + LC_ADDRESS = "de_DE.UTF-8"; + LC_IDENTIFICATION = "de_DE.UTF-8"; + LC_MEASUREMENT = "de_DE.UTF-8"; + LC_MONETARY = "de_DE.UTF-8"; + LC_NAME = "de_DE.UTF-8"; + LC_NUMERIC = "de_DE.UTF-8"; + LC_PAPER = "de_DE.UTF-8"; + LC_TELEPHONE = "de_DE.UTF-8"; + LC_TIME = "de_DE.UTF-8"; + }; }; services = { displayManager.sddm = { enable = true; }; + xserver = { enable = true; desktopManager.gnome = { @@ -65,6 +67,7 @@ in { layout = "us"; variant = ""; }; + excludePackages = (with pkgs; [ nano @@ -86,6 +89,7 @@ in { # Enable CUPS to print documents. printing.enable = true; }; + # Enable sound with pipewire. sound.enable = true; hardware.pulseaudio.enable = false; diff --git a/nixos-rebuild.sh b/nixos-rebuild.sh index 27ba5d3..6ed5a57 100755 --- a/nixos-rebuild.sh +++ b/nixos-rebuild.sh @@ -45,8 +45,8 @@ sudo nixos-rebuild switch &>nixos-switch.log || (cat nixos-switch.log | grep --c echo -e ": Rebuild successful. Committing changes..." # Get current generation metadata -current=$(nixos-rebuild list-generations --json | jq '.[0]') - +# current=$(nix-instantiate --eval -I ./configuration.nix '' -A config.system.build.toplevel.drvPath | grep -ow '(\d|\w){32}') +current=$(nix-instantiate --eval -I ./configuration.nix '' -A config.system.build.toplevel.drvPath | grep -owP '(\d|\w){32}') echo -e ": $current" # Commit all changes witih the generation metadata sudo git commit -am "$current"