diff options
50 files changed, 692 insertions, 269 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b8df8e1616b5..82916749f9a4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6638,6 +6638,12 @@ github = "jayeshbhoot"; githubId = 1915507; }; + jayman2000 = { + email = "jason@jasonyundt.email"; + github = "Jayman2000"; + githubId = 5579359; + name = "Jason Yundt"; + }; jb55 = { email = "jb55@jb55.com"; github = "jb55"; @@ -7015,6 +7021,12 @@ githubId = 2308444; name = "Joshua Gilman"; }; + jnsgruk = { + email = "jon@sgrs.uk"; + github = "jnsgruk"; + githubId = 668505; + name = "Jon Seager"; + }; jo1gi = { email = "joakimholm@protonmail.com"; github = "jo1gi"; diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml index 1ae5fede272b..2fd0d01abefa 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml @@ -860,6 +860,12 @@ </listitem> <listitem> <para> + <literal>tvbrowser-bin</literal> was removed, and now + <literal>tvbrowser</literal> is built from source. + </para> + </listitem> + <listitem> + <para> <literal>nixos-version</literal> now accepts <literal>--configuration-revision</literal> to display more information about the current generation revision diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 2977a9e6a1c7..01e2ff01f290 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -213,6 +213,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [Xastir](https://xastir.org/index.php/Main_Page) can now access AX.25 interfaces via the `libax25` package. +- `tvbrowser-bin` was removed, and now `tvbrowser` is built from source. + - `nixos-version` now accepts `--configuration-revision` to display more information about the current generation revision - The option `services.nomad.extraSettingsPlugins` has been fixed to allow more than one plugin in the path. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 2757a196555e..111eee47480f 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1365,6 +1365,7 @@ ./virtualisation/lxc.nix ./virtualisation/lxcfs.nix ./virtualisation/lxd.nix + ./virtualisation/multipass.nix ./virtualisation/nixos-containers.nix ./virtualisation/oci-containers.nix ./virtualisation/openstack-options.nix diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 65b94f61c4ae..eb0373c686c5 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -28,52 +28,11 @@ let libsForQt5 = pkgs.plasma5Packages; inherit (libsForQt5) kdeGear kdeFrameworks plasma5; - inherit (pkgs) writeText; inherit (lib) getBin optionalString literalExpression mkRemovedOptionModule mkRenamedOptionModule mkDefault mkIf mkMerge mkOption mkPackageOptionMD types; - ini = pkgs.formats.ini { }; - - gtkrc2 = writeText "gtkrc-2.0" '' - # Default GTK+ 2 config for NixOS Plasma 5 - include "/run/current-system/sw/share/themes/Breeze/gtk-2.0/gtkrc" - style "user-font" - { - font_name="Sans Serif Regular" - } - widget_class "*" style "user-font" - gtk-font-name="Sans Serif Regular 10" - gtk-theme-name="Breeze" - gtk-icon-theme-name="breeze" - gtk-fallback-icon-theme="hicolor" - gtk-cursor-theme-name="breeze_cursors" - gtk-toolbar-style=GTK_TOOLBAR_ICONS - gtk-menu-images=1 - gtk-button-images=1 - ''; - - gtk3_settings = ini.generate "settings.ini" { - Settings = { - gtk-font-name = "Sans Serif Regular 10"; - gtk-theme-name = "Breeze"; - gtk-icon-theme-name = "breeze"; - gtk-fallback-icon-theme = "hicolor"; - gtk-cursor-theme-name = "breeze_cursors"; - gtk-toolbar-style = "GTK_TOOLBAR_ICONS"; - gtk-menu-images = 1; - gtk-button-images = 1; - }; - }; - - kcminputrc = ini.generate "kcminputrc" { - Mouse = { - cursorTheme = "breeze_cursors"; - cursorSize = 0; - }; - }; - activationScript = '' ${set_XDG_CONFIG_HOME} @@ -119,37 +78,6 @@ let XDG_CONFIG_HOME=''${XDG_CONFIG_HOME:-$HOME/.config} ''; - startplasma = '' - ${set_XDG_CONFIG_HOME} - mkdir -p "''${XDG_CONFIG_HOME}" - '' + optionalString config.hardware.pulseaudio.enable '' - # Load PulseAudio module for routing support. - # See also: http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/ - ${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1" - '' + '' - ${activationScript} - - # Create default configurations if Plasma has never been started. - kdeglobals="''${XDG_CONFIG_HOME}/kdeglobals" - if ! [ -f "$kdeglobals" ]; then - kcminputrc="''${XDG_CONFIG_HOME}/kcminputrc" - if ! [ -f "$kcminputrc" ]; then - cat ${kcminputrc} >"$kcminputrc" - fi - - gtkrc2="$HOME/.gtkrc-2.0" - if ! [ -f "$gtkrc2" ]; then - cat ${gtkrc2} >"$gtkrc2" - fi - - gtk3_settings="''${XDG_CONFIG_HOME}/gtk-3.0/settings.ini" - if ! [ -f "$gtk3_settings" ]; then - mkdir -p "$(dirname "$gtk3_settings")" - cat ${gtk3_settings} >"$gtk3_settings" - fi - fi - ''; - in { @@ -474,7 +402,6 @@ in # Update the start menu for each user that is currently logged in system.userActivationScripts.plasmaSetup = activationScript; - services.xserver.displayManager.setupCommands = startplasma; nixpkgs.config.firefox.enablePlasmaBrowserIntegration = true; }) diff --git a/nixos/modules/virtualisation/multipass.nix b/nixos/modules/virtualisation/multipass.nix new file mode 100644 index 000000000000..d066932b6120 --- /dev/null +++ b/nixos/modules/virtualisation/multipass.nix @@ -0,0 +1,61 @@ +{ config +, lib +, pkgs +, ... +}: + +let + cfg = config.virtualisation.multipass; +in +{ + options = { + virtualisation.multipass = { + enable = lib.mkEnableOption (lib.mdDoc '' + Multipass, a simple manager for virtualised Ubuntu instances. + ''); + + logLevel = lib.mkOption { + type = lib.types.enum [ "error" "warning" "info" "debug" "trace" ]; + default = "debug"; + description = lib.mdDoc '' + The logging verbosity of the multipassd binary. + ''; + }; + + package = lib.mkPackageOptionMD pkgs "multipass" { }; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + + systemd.services.multipass = { + description = "Multipass orchestrates virtual Ubuntu instances."; + + wantedBy = [ "multi-user.target" ]; + wants = [ "network.target" ]; + after = [ "network.target" ]; + + environment = { + "XDG_DATA_HOME" = "/var/lib/multipass/data"; + "XDG_CACHE_HOME" = "/var/lib/multipass/cache"; + "XDG_CONFIG_HOME" = "/var/lib/multipass/config"; + }; + + serviceConfig = { + ExecStart = "${cfg.package}/bin/multipassd --logger platform --verbosity ${cfg.logLevel}"; + SyslogIdentifer = "multipassd"; + Restart = "on-failure"; + TimeoutStopSec = 300; + Type = "simple"; + + WorkingDirectory = "/var/lib/multipass"; + + StateDirectory = "multipass"; + StateDirectoryMode = "0750"; + CacheDirectory = "multipass"; + CacheDirectoryMode = "0750"; + }; + }; + }; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 1fc8bb777db0..a23a0413160e 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -412,6 +412,7 @@ in { mpd = handleTest ./mpd.nix {}; mpv = handleTest ./mpv.nix {}; mtp = handleTest ./mtp.nix {}; + multipass = handleTest ./multipass.nix {}; mumble = handleTest ./mumble.nix {}; musescore = handleTest ./musescore.nix {}; munin = handleTest ./munin.nix {}; diff --git a/nixos/tests/multipass.nix b/nixos/tests/multipass.nix new file mode 100644 index 000000000000..0980e9195f5a --- /dev/null +++ b/nixos/tests/multipass.nix @@ -0,0 +1,37 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: + +let + multipass-image = import ../release.nix { + configuration = { + # Building documentation makes the test unnecessarily take a longer time: + documentation.enable = lib.mkForce false; + }; + }; + +in +{ + name = "multipass"; + + meta.maintainers = [ lib.maintainers.jnsgruk ]; + + nodes.machine = { lib, ... }: { + virtualisation = { + cores = 1; + memorySize = 1024; + diskSize = 4096; + + multipass.enable = true; + }; + }; + + testScript = '' + machine.wait_for_unit("sockets.target") + machine.wait_for_unit("multipass.service") + machine.wait_for_file("/var/lib/multipass/data/multipassd/network/multipass_subnet") + + # Wait for Multipass to settle + machine.sleep(1) + + machine.succeed("multipass list") + ''; +}) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 71af02bee7dd..2ce41e70f789 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -293,12 +293,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2023-02-03"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "bb952ae19d2b227b549133a3b0ed69a3436d208e"; - sha256 = "0lg5ibn3q1kw951k7j11f7c24qmf4sy9y3y2pqlpvk9bvc095jyl"; + rev = "5c5723bd464fd048f5d62fcf20c41495d3386a33"; + sha256 = "1vpay869faixkxpvxlwpk44pidjgnrhkchnchfsbd6c2brhgzz11"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -727,12 +727,12 @@ final: prev: aurora = buildVimPluginFrom2Nix { pname = "aurora"; - version = "2023-02-02"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "ef44f07a563d59b23c3f17792f4ff3b5fb4280a1"; - sha256 = "14w830fnr19rnjqwg5yqns4xf27nhvc169qrmkjn8y054i6yjsg2"; + rev = "f7b2df980aa0518a1a208974dfcbc51ff91b531e"; + sha256 = "1d0p7d7kicqy4bbh3kaxn9as71afjljp38lhcc595l2b8nlaf2hc"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -1759,12 +1759,12 @@ final: prev: coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2023-02-01"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "80858aa01d57ed2f93c6bc388bad373810d41a21"; - sha256 = "0rcikmjdhcw39kngx93snpnn0sh780drqnn342gg9ifnysbva3d9"; + rev = "9f702344b9550800e9ca928cd21fd6dcc8dffaef"; + sha256 = "10s0nqhybry6m6p13gvmchmc6in7zn7pgi1930svy7czqblcg6rw"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -2155,12 +2155,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2023-02-03"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "67b7623184406dda85ae0ea678cb82a6f2a509d0"; - sha256 = "0gzna1qyialp6b4iap9jnfhf3w7anp7xlg6hdal2r0i60h9f0igm"; + rev = "d11f4eb12d73c5dcf5d6691378b18447446ec919"; + sha256 = "08kkp57k4138cb4jgv3q3x3h2qx7f29kr914lzqzrb7q4ybzm6b8"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2299,12 +2299,12 @@ final: prev: dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2023-02-03"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "glepnir"; repo = "dashboard-nvim"; - rev = "5d7b14dfa88a32040647649b1e714051235bfd32"; - sha256 = "1iknwbwiq2rykf36vr3agdzlyb54mkppjywh4qdgqgach71016l3"; + rev = "d69d20170e12a20fa305e90870d6016e636cc328"; + sha256 = "18i9rjjv7g5hr1gyb98w3mh50m1iwk643rb93z1n7f38ln55xzw8"; }; meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; }; @@ -3884,6 +3884,18 @@ final: prev: meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; + indent-o-matic = buildVimPluginFrom2Nix { + pname = "indent-o-matic"; + version = "2023-01-24"; + src = fetchFromGitHub { + owner = "Darazaki"; + repo = "indent-o-matic"; + rev = "3103dde7a47f2855097558ab52162bbbdbe8dc40"; + sha256 = "1nfwzqki00x5vv75iawyky122v68qcajihfcdqxixlqln3srrmi4"; + }; + meta.homepage = "https://github.com/Darazaki/indent-o-matic/"; + }; + indentLine = buildVimPluginFrom2Nix { pname = "indentLine"; version = "2022-09-07"; @@ -5207,12 +5219,12 @@ final: prev: neoconf-nvim = buildVimPluginFrom2Nix { pname = "neoconf.nvim"; - version = "2023-02-03"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "a16d133b426fe5ddfd97d30e3658772d403847f3"; - sha256 = "03dbdllmvp68cfzf8m3sz8v9795h4mp28gd27bcvxyfjiif7r5lj"; + rev = "de8dbd4ba6583619ed02323dbde737d586ba572f"; + sha256 = "1ms7chmmilq8slf659m8d45i39pllgng7a95fc20ykwbakhi8m9b"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -5231,12 +5243,12 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2023-02-03"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "d9a8d651501cd2f287742472af4b3103d991cd68"; - sha256 = "1pi2b2j647cwc58cp5iwgrrfls7lfwh7573r092k3c42i2x9k8cd"; + rev = "70cab52c9d19e982f306716534e90c37a254b046"; + sha256 = "13xrc45s5fx8y2dl1ds155r5w0yrivq2b1aqvqjk7ywgyyq2wr5l"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -5555,12 +5567,12 @@ final: prev: nlsp-settings-nvim = buildVimPluginFrom2Nix { pname = "nlsp-settings.nvim"; - version = "2023-02-03"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "dcd316d381c5768cd6a11d53a3331e92c3943f3b"; - sha256 = "06cd6hyckmp2jvrh8k2sp465yarkznk6adwh0lmd95i6wrb1zhky"; + rev = "9e3f9160360117276c6c1b795426b7be897cbb24"; + sha256 = "1rw742ck7d8h6akqcskqxpxw41wakwg0nagb82fgq4blisjppgid"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -6251,12 +6263,12 @@ final: prev: nvim-nonicons = buildVimPluginFrom2Nix { pname = "nvim-nonicons"; - version = "2022-12-22"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "yamatsum"; repo = "nvim-nonicons"; - rev = "68ecb6476f1b96d03c702dce6cf3ef1e5171c9a8"; - sha256 = "1vmzl5b3a07kh8b4wqqxd05sygvlyxq9vkrsshn2lrxmpbdg6227"; + rev = "ceda07dc7339f35444b5f4c4016f76a9eb42ac16"; + sha256 = "0kcagkzgvib0jg9aywfvrk4bx7pdyk7zj5b5i4wzacdcyx5yb7mx"; }; meta.homepage = "https://github.com/yamatsum/nvim-nonicons/"; }; @@ -6395,12 +6407,12 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2023-01-31"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "215b29bfad74518442621b9d0483a621483b066b"; - sha256 = "00rvb70s9wg9vqnsm6a63vakpjyznvpc4yplbmqjqa4dnfwp9kl2"; + rev = "7eb33d2a6d5d574a43159da90e0eac2445367393"; + sha256 = "0x6lji8s86vgih7fv9yvvjkyh9bqlzrsmn04im1zif087wa1dcw1"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; @@ -6503,23 +6515,23 @@ final: prev: nvim-ts-rainbow2 = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow2"; - version = "2023-02-03"; + version = "2023-02-04"; src = fetchgit { url = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; - rev = "b915c4d4926f723c0a424e1a639384018e7d9efc"; - sha256 = "0sllv769q0v73alcxs1r8dpij8kp9f771sq93z9c413c35wwmcnz"; + rev = "7d33fb4402676723b0d7ca4d95717f5e020cd123"; + sha256 = "0h4kfmh75p6c00f1xa6609y7zq9nm3p0r8yj17bwy30hpi51vnqv"; }; meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; }; nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2023-01-28"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "a421d183ef37dfa13f51a5805bed2381aebf9080"; - sha256 = "0754m29aizcav7ynqflpbv3kzz2n7mw2xx8aliay3slzq18kix8d"; + rev = "2b96193abe4372e18e4f4533895a42a466d53c17"; + sha256 = "18vh5xpyzlmfwdz2n30fi7a6v7w5mnami857cczqy2bk5bc1xdvd"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -8753,6 +8765,18 @@ final: prev: meta.homepage = "https://github.com/chrisbra/unicode.vim/"; }; + unison = buildVimPluginFrom2Nix { + pname = "unison"; + version = "2023-02-03"; + src = fetchFromGitHub { + owner = "unisonweb"; + repo = "unison"; + rev = "59acc0cbe429492a99bfebf2b783fc2fa3967f75"; + sha256 = "1nrpxprq1f2pp269nrx18avv7ghngqlr7rjahib91rgkvhw6k1x7"; + }; + meta.homepage = "https://github.com/unisonweb/unison/"; + }; + unite-vim = buildVimPluginFrom2Nix { pname = "unite.vim"; version = "2021-02-06"; @@ -10507,12 +10531,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2023-02-03"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "7bf2074f340447c10b3af4ace96cc61e5f325693"; - sha256 = "0ry67a7g0dpgaiwfcr79pgpw54x5v8dmfg4pypyd039ini0l0w46"; + rev = "eec8223171cca6e662dfca22ddde93c3a81f66d0"; + sha256 = "1fm1l1am2hf7j95cf51q9i5l1sr5zh2y4r0xp78cm3bcwjyhnf7a"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -13993,12 +14017 |