From 1bb964cd158f94ec1662a0ca6173f0097a44038a Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 30 Jan 2022 15:22:26 +0100 Subject: [PATCH] update nixos --- 157175.patch | 22 ++++++++++++++++++++++ common-gui.nix | 10 +++++----- common-headless.nix | 8 +++++--- common-sw.nix | 1 + decoysnail.nix | 2 +- flake.lock | 20 ++++++++++---------- flake.nix | 4 ++-- i3.nix | 16 ++++++++-------- petalius.nix | 2 +- sway.nix | 10 +++++----- 10 files changed, 60 insertions(+), 35 deletions(-) create mode 100644 157175.patch diff --git a/157175.patch b/157175.patch new file mode 100644 index 0000000..9e55f18 --- /dev/null +++ b/157175.patch @@ -0,0 +1,22 @@ +From c362bf9fda1878e18dd65797ac2078a6e0fee04e Mon Sep 17 00:00:00 2001 +From: Jonathan Ringer +Date: Fri, 28 Jan 2022 09:42:47 -0800 +Subject: [PATCH] python3Packages.sentry-sdk: disable web test + +--- + pkgs/development/python-modules/sentry-sdk/default.nix | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix +index a59ec10be0378..26ccb1aacc51c 100644 +--- a/pkgs/development/python-modules/sentry-sdk/default.nix ++++ b/pkgs/development/python-modules/sentry-sdk/default.nix +@@ -109,6 +109,8 @@ buildPythonPackage rec { + "test_circular_references" + # Failing wsgi test + "test_session_mode_defaults_to_request_mode_in_wsgi_handler" ++ # Network requests to public web ++ "test_crumb_capture" + ]; + + disabledTestPaths = [ diff --git a/common-gui.nix b/common-gui.nix index 7129f3f..f252279 100644 --- a/common-gui.nix +++ b/common-gui.nix @@ -71,7 +71,7 @@ hardware.uinput.enable = true; users.extraUsers.gebner.extraGroups = [ "input" "tty" "audio" "video" "uinput" ]; - services.dbus.packages = with pkgs; [ gnome3.gcr ]; + services.dbus.packages = with pkgs; [ gcr ]; services.udev.packages = [ pkgs.gnome3.gnome-settings-daemon ]; # copied from gnome3 module @@ -79,12 +79,12 @@ services.udisks2.enable = true; services.accounts-daemon.enable = true; services.geoclue2.enable = true; - services.gnome3.at-spi2-core.enable = true; - services.gnome3.gnome-keyring.enable = true; + services.gnome.at-spi2-core.enable = true; + services.gnome.gnome-keyring.enable = true; services.gvfs.enable = true; programs.seahorse.enable = true; - services.gnome3.sushi.enable = true; - services.gnome3.gnome-settings-daemon.enable = true; + services.gnome.sushi.enable = true; + services.gnome.gnome-settings-daemon.enable = true; services.telepathy.enable = true; networking.networkmanager.enable = true; services.upower.enable = config.powerManagement.enable; diff --git a/common-headless.nix b/common-headless.nix index a40634c..6d3152a 100644 --- a/common-headless.nix +++ b/common-headless.nix @@ -9,9 +9,11 @@ boot.kernelPackages = pkgs.linuxPackages_latest; - nix.useSandbox = true; - nix.binaryCaches = [ https://cache.nixos.org ]; - nix.trustedBinaryCaches = [ https://cache.nixos.org ]; + nix.settings = { + sandbox = true; + substituters = [ "https://cache.nixos.org" ]; + trusted-substituters = [ "https://cache.nixos.org" ]; + }; nix.extraOptions = '' auto-optimise-store = true binary-caches-parallel-connections = 10 diff --git a/common-sw.nix b/common-sw.nix index 05078f4..fddb640 100644 --- a/common-sw.nix +++ b/common-sw.nix @@ -82,6 +82,7 @@ glucose prover9 eprover + vampire metis-prover spass z3 diff --git a/decoysnail.nix b/decoysnail.nix index 5c01c42..93ab737 100644 --- a/decoysnail.nix +++ b/decoysnail.nix @@ -34,7 +34,7 @@ # { device = "/dev/disk/by-uuid/b7274abd-58a5-4acc-8481-30e105e94eec"; } #]; - nix.maxJobs = pkgs.lib.mkDefault 6; + nix.settings.max-jobs = pkgs.lib.mkDefault 6; powerManagement.cpuFreqGovernor = pkgs.lib.mkDefault "powersave"; environment.etc."lvm/lvm.conf".text = '' diff --git a/flake.lock b/flake.lock index eeb25ac..d0c6152 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "flake-utils": { "locked": { - "lastModified": 1629481132, - "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", + "lastModified": 1638122382, + "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", "owner": "numtide", "repo": "flake-utils", - "rev": "997f7efcb746a9c140ce1f13c72263189225f482", + "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", "type": "github" }, "original": { @@ -17,11 +17,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1642104392, - "narHash": "sha256-m71b7MgMh9FDv4MnI5sg9MiBVW6DhE1zq+d/KlLWSC8=", + "lastModified": 1643347846, + "narHash": "sha256-O0tyXF//ppRpe9yT1Uu5n34yI2MWDyY6ZiJ4Qn5zIkE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5aaed40d22f0d9376330b6fa413223435ad6fee5", + "rev": "5bb20f9dc70e9ee16e21cc404b6508654931ce41", "type": "github" }, "original": { @@ -42,16 +42,16 @@ "flake-utils": "flake-utils" }, "locked": { - "lastModified": 1632420560, - "narHash": "sha256-8Tsa4Hp/CHCA6J8/E7EODhp75z5N1NBhFiOb3lBv/tI=", + "lastModified": 1638172912, + "narHash": "sha256-jxhQGNEsZTdop/Br3JPS+xmBf6t9cIWRzVZFxbT76Rw=", "owner": "gytis-ivaskevicius", "repo": "flake-utils-plus", - "rev": "4b1bcafcfcd78bd36ceabfe3872822ba5c7fcbe8", + "rev": "166d6ebd9f0de03afc98060ac92cba9c71cfe550", "type": "github" }, "original": { "owner": "gytis-ivaskevicius", - "ref": "v1.3.0", + "ref": "v1.3.1", "repo": "flake-utils-plus", "type": "github" } diff --git a/flake.nix b/flake.nix index 1c64e0d..6660784 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - utils.url = "github:gytis-ivaskevicius/flake-utils-plus/v1.3.0"; + utils.url = "github:gytis-ivaskevicius/flake-utils-plus/v1.3.1"; # neovim-overlay = { # url = "github:nix-community/neovim-nightly-overlay"; @@ -15,7 +15,7 @@ channels.nixpkgs.input = nixpkgs; - channels.nixpkgs.patches = [ ]; + channels.nixpkgs.patches = [ ./157175.patch ]; nix.generateRegistryFromInputs = true; diff --git a/i3.nix b/i3.nix index 543641c..ccaa2f5 100644 --- a/i3.nix +++ b/i3.nix @@ -5,15 +5,15 @@ ./common-gui.nix ]; - environment.systemPackages = with pkgs; with gnome3; [ + environment.systemPackages = with pkgs; [ i3 i3status rofi rofi-pass feh - gnome_keyring + gnome3.gnome-keyring networkmanagerapplet - nautilus # in closure of gnome-terminal anyhow + gnome3.nautilus # in closure of gnome-terminal anyhow pcmanfm # colord evince @@ -23,7 +23,7 @@ scrot pavucontrol pasystray - dconf-editor + gnome3.dconf-editor unclutter-xfixes dunst @@ -33,8 +33,8 @@ desktop_file_utils shared_mime_info glib gtk3 glib_networking gvfs dconf - gnome_settings_daemon - gnome_themes_standard defaultIconTheme + gnome3.gnome-settings-daemon + gnome_themes_standard gnome3.adwaita-icon-theme hicolor_icon_theme ]; @@ -60,7 +60,7 @@ name = "i3wm"; start = '' export XDG_DATA_DIRS=/run/current-system/sw/share/''${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS - export $(${pkgs.gnome3.gnome_keyring}/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh) + export $(${pkgs.gnome3.gnome-keyring}/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh) export XDG_CURRENT_DESKTOP=X-Generic i3 & waitPID=$! @@ -75,7 +75,7 @@ xkbOptions = "caps:ctrl_modifier"; }; - services.dbus.socketActivated = true; + # services.dbus.socketActivated = true; services.dbus.packages = with pkgs; [ dunst ]; systemd.packages = [ pkgs.dunst ]; diff --git a/petalius.nix b/petalius.nix index 0a0af70..24b258f 100644 --- a/petalius.nix +++ b/petalius.nix @@ -37,7 +37,7 @@ swapDevices = [ ]; - nix.maxJobs = 4; + nix.settings.max-jobs = 4; environment.etc."lvm/lvm.conf".text = '' devices { diff --git a/sway.nix b/sway.nix index 1f1c744..11421e3 100644 --- a/sway.nix +++ b/sway.nix @@ -5,14 +5,14 @@ ./common-gui.nix ]; - environment.systemPackages = with pkgs; with gnome3; [ + environment.systemPackages = with pkgs; [ i3status (waybar.override { pulseSupport = true; }) wofi ydotool wl-clipboard feh - gnome_keyring + gnome3.gnome-keyring networkmanagerapplet pcmanfm evince @@ -20,7 +20,7 @@ mako pavucontrol paprefs - dconf-editor + gnome3.dconf-editor xdg_utils # for xdg-open @@ -41,7 +41,7 @@ firefox = firefox-wayland; }; - services.dbus.socketActivated = true; + # services.dbus.socketActivated = true; programs.sway = { enable = true; @@ -62,7 +62,7 @@ export WINIT_UNIX_BACKEND=x11 export XDG_DATA_DIRS=/run/current-system/sw/share/''${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS - export $(${pkgs.gnome3.gnome_keyring}/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh,gpg) + export $(${pkgs.gnome3.gnome-keyring}/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh,gpg) export XDG_CURRENT_DESKTOP=sway ''; };