diff --git a/base.nix b/base.nix index d77c4a6..bcda2d7 100644 --- a/base.nix +++ b/base.nix @@ -12,10 +12,9 @@ ]; nixpkgs.config.permittedInsecurePackages = [ - "pulsar-1.106.0" - "pulsar-1.109.0" - "zotero-6.0.26" - "gitea-1.19.4" + pkgs.pulsar.name + pkgs.zotero.name + pkgs.gitea.name ]; environment.systemPackages = with pkgs; [ diff --git a/flake.nix b/flake.nix index 3cad599..dd43003 100644 --- a/flake.nix +++ b/flake.nix @@ -280,7 +280,7 @@ brumlebasse = mk "pbsds.net" "x86_64-linux" inputs-2311 "23.11" [ au amd nspawn ]; nord = mk "pbsds.net" "x86_64-linux" inputs-2311 "23.11" [ au intel-novga hw.common-cpu-intel-sandy-bridge rocm hidpi ]; sopp = mk "pbsds.net" "x86_64-linux" inputs-2311 "23.11" [ au nixld intel cuda p1005 ]; - bjarte = mk "pbsds.net" "x86_64-linux" inputs-2311 "23.11" [ nixld intel hw.lenovo-thinkpad-x1-7th-gen ]; + bjarte = mk "pbsds.net" "x86_64-linux" inputs-2405 "23.11" [ nixld intel hw.lenovo-thinkpad-x1-7th-gen ]; bolle = mk "pbsds.net" "x86_64-linux" inputs-2405 "23.11" [ au dns64 intel ]; eple = mk "pbsds.net" "x86_64-linux" inputs-2311 "23.11" [ au dns64 intel rocm ]; garp = mk "pbsds.net" "x86_64-linux" inputs-2311 "23.11" [ au dns64 intel-novga cuda ]; diff --git a/profiles/desktop/gnome/default.nix b/profiles/desktop/gnome/default.nix index 37a0b13..c8e7a5d 100644 --- a/profiles/desktop/gnome/default.nix +++ b/profiles/desktop/gnome/default.nix @@ -38,11 +38,11 @@ environment.gnome.excludePackages = (with pkgs; [ gnome-photos gnome-tour + (pkgs.gedit or pkgs.gnome.gedit) # text editor (24.05 vs 23.11) ]) ++ (with pkgs.gnome; [ #cheese # webcam tool gnome-music gnome-terminal - gedit # text editor #epiphany # web browser geary # email reader totem # video player diff --git a/profiles/locale-no.nix b/profiles/locale-no.nix index 517eb0a..a9c6ed4 100644 --- a/profiles/locale-no.nix +++ b/profiles/locale-no.nix @@ -1,3 +1,4 @@ +{ lib, ... }: lib.mkMerge [ { # Time zone and internationalisation properties. time.timeZone = "Europe/Oslo"; @@ -12,6 +13,13 @@ i18n.extraLocaleSettings.LC_TELEPHONE = "nb_NO.utf8"; i18n.extraLocaleSettings.LC_TIME = "nb_NO.utf8"; console.keyMap = "no"; +} +(lib.mkIf (lib.versionAtLeast (lib.versions.majorMinor lib.version) "24.05") { + services.xserver.xkb.layout = "no"; + services.xserver.xkb.variant = ""; +}) +(lib.mkIf (lib.versionOlder (lib.versions.majorMinor lib.version) "24.05") { services.xserver.layout = "no"; services.xserver.xkbVariant = ""; -} +}) +] diff --git a/users/pbsds/home/profiles/gnome/default.nix b/users/pbsds/home/profiles/gnome/default.nix index 221fe7b..8ea770f 100644 --- a/users/pbsds/home/profiles/gnome/default.nix +++ b/users/pbsds/home/profiles/gnome/default.nix @@ -33,7 +33,10 @@ in # qt theme qt.enable = true; - qt.platformTheme = "gnome"; + qt.platformTheme = lib.mkMerge [ + (lib.mkIf (lib.versionAtLeast config.home.version.release "24.05") { name = "advaita"; }) + (lib.mkIf (lib.versionOlder config.home.version.release "24.05") "gnome") + ]; qt.style.name = "Colloid-dark"; qt.style.package = pkgs.colloid-kde;