From cb4949cc104e5e992d471e82045466fac0b818fb Mon Sep 17 00:00:00 2001 From: Vivian Date: Wed, 3 Jan 2024 16:23:42 +0100 Subject: [PATCH] update --- flake.lock | 72 +++++++++++++------------- nixos/common/default.nix | 2 +- nixos/common/modules/gnome/default.nix | 2 +- nixos/hosts/olympus/default.nix | 3 +- 4 files changed, 40 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index 27801f6a..5c198777 100644 --- a/flake.lock +++ b/flake.lock @@ -50,11 +50,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1702969472, - "narHash": "sha256-IJP9sC+/gLUdWhm6TsnWpw6A1zQWUfn53ym63KeLXvU=", + "lastModified": 1704159259, + "narHash": "sha256-OOEFibN9JQBepVeqxSNSBr6JUmdoZiH263ogms2jk0k=", "owner": "zhaofengli", "repo": "attic", - "rev": "bdafd64910bb2b861cf90fa15f1fc93318b6fbf6", + "rev": "e6bedf1869f382cfc51b69848d6e09d51585ead6", "type": "github" }, "original": { @@ -254,11 +254,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1704204809, - "narHash": "sha256-O76nB41RyfedpCfcO4GU5i2Ng7ZUMbZnF+Ceq0e8LIs=", + "lastModified": 1704207610, + "narHash": "sha256-goAc0arC/A0Pthz+bNsXzJcaqsNY7s5LcTp2WAtduCo=", "owner": "jdonszelmann", "repo": "essentials", - "rev": "8209683dc3c5edd747efccd187f512771d8f3a0c", + "rev": "229d7c8793968a319b6968c6fa06b20c393d1d12", "type": "github" }, "original": { @@ -783,11 +783,11 @@ ] }, "locked": { - "lastModified": 1703838268, - "narHash": "sha256-SRg5nXcdPnrsQR2MTAp7en0NyJnQ2wB1ivmsgEbvN+o=", + "lastModified": 1704100519, + "narHash": "sha256-SgZC3cxquvwTN07vrYYT9ZkfvuhS5Y1k1F4+AMsuflc=", "owner": "nix-community", "repo": "home-manager", - "rev": "2aff324cf65f5f98f89d878c056b779466b17db8", + "rev": "6e91c5df192395753d8e6d55a0352109cb559790", "type": "github" }, "original": { @@ -809,11 +809,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1703712542, - "narHash": "sha256-317EoHaQ5OwRLEjwjQUY57FpLDl75kEBbrohH7zbfRQ=", + "lastModified": 1704230057, + "narHash": "sha256-YTkPHIM/RF1WtWqRAxlaE2lqvzEBa58SZzQZB2sx4PY=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "7229dd85f98341520b02fd46662f38d0af511d6d", + "rev": "81f7a56f0ee6bb454284feeeb192df56e39d98d1", "type": "github" }, "original": { @@ -885,11 +885,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1703769051, - "narHash": "sha256-izOj8XRoHUXkWHpxznOaYHpj30J8/f3ynr7H6oYcNho=", + "lastModified": 1704120350, + "narHash": "sha256-s5BOPAnVc4e/4WvGDeeF3VSLAWzBUB+YW6fJb3pFbRw=", "owner": "astro", "repo": "microvm.nix", - "rev": "c39a472523d3c99ddfa88df62223a21b19793490", + "rev": "d5553b1388f2947915c4cec6249b89474046573a", "type": "github" }, "original": { @@ -1014,11 +1014,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1703879120, - "narHash": "sha256-oMJ5xtDswlBWxs0DT/aYKEUIhjEpGZJ9GbIxOclYP8I=", + "lastModified": 1704266875, + "narHash": "sha256-luA5SGmeIRZlgLfSLUuR3eacS63q2bJ0Yywqak5lj3E=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "22ae59fec26591ef72ce4ccb5538c42c5f090fe3", + "rev": "8e34f33464d77bea2d5cf7dc1066647b1ad2b324", "type": "github" }, "original": { @@ -1332,11 +1332,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1703637592, - "narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=", + "lastModified": 1703961334, + "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8", + "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", "type": "github" }, "original": { @@ -1347,11 +1347,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1703013332, - "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", + "lastModified": 1703637592, + "narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", + "rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8", "type": "github" }, "original": { @@ -1363,11 +1363,11 @@ }, "nixpkgs_stable": { "locked": { - "lastModified": 1703351344, - "narHash": "sha256-9FEelzftkE9UaJ5nqxidaJJPEhe9TPhbypLHmc2Mysc=", + "lastModified": 1704018918, + "narHash": "sha256-erjg/HrpC9liEfm7oLqb8GXCqsxaFwIIPqCsknW5aFY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7790e078f8979a9fcd543f9a47427eeaba38f268", + "rev": "2c9c58e98243930f8cb70387934daa4bc8b00373", "type": "github" }, "original": { @@ -1383,11 +1383,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1703859882, - "narHash": "sha256-wRXgap0eEuswF9xXUKDiWBh0tKuJ9vtmlJZ4iAX3K/E=", + "lastModified": 1704263922, + "narHash": "sha256-/H3ZUsqTP+mh7G4fL8fYIP/WZfXH6ohVid8OfZ15RuQ=", "owner": "pta2002", "repo": "nixvim", - "rev": "1d8e7906c9606c956c6b40d8d088c8d2110dc0c0", + "rev": "78276e91bb4861564f2241c842cf1fce1a06e563", "type": "github" }, "original": { @@ -1398,11 +1398,11 @@ }, "nur": { "locked": { - "lastModified": 1703938048, - "narHash": "sha256-df8Lwe4k6QiyucOyZV0s6eoy6y7m2g4+/dOpEyYrZGU=", + "lastModified": 1704271485, + "narHash": "sha256-9Q3w5RFr8svla9Bt9mdjJzvpp4RoaJpob6z+1rhJB6k=", "owner": "nix-community", "repo": "NUR", - "rev": "ae6fb319f88d5a995cb8dc4502c2d81c5fc1e578", + "rev": "cf62528497fa3e11c7daafd05821dac5d2fe448d", "type": "github" }, "original": { @@ -1440,11 +1440,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1702456155, - "narHash": "sha256-I2XhXGAecdGlqi6hPWYT83AQtMgL+aa3ulA85RAEgOk=", + "lastModified": 1703426812, + "narHash": "sha256-aODSOH8Og8ne4JylPJn+hZ6lyv6K7vE5jFo4KAGIebM=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "007a45d064c1c32d04e1b8a0de5ef00984c419bc", + "rev": "7f35ec30d16b38fe0eed8005933f418d1a4693ee", "type": "github" }, "original": { diff --git a/nixos/common/default.nix b/nixos/common/default.nix index 50e28ef5..3e6171a4 100644 --- a/nixos/common/default.nix +++ b/nixos/common/default.nix @@ -33,7 +33,7 @@ # https://src.fedoraproject.org/rpms/systemd/tree/acb90c49c42276b06375a66c73673ac3510255 systemd.oomd = { enableRootSlice = true; - enableUserServices = true; + enableUserSlices = true; }; # security.polkit.enable = lib.mkDefault true; diff --git a/nixos/common/modules/gnome/default.nix b/nixos/common/modules/gnome/default.nix index 39fb375f..97cb8b17 100644 --- a/nixos/common/modules/gnome/default.nix +++ b/nixos/common/modules/gnome/default.nix @@ -58,7 +58,7 @@ in { atomix # puzzle game epiphany # web browser geary # email reader - gedit # text editor + pkgs.gedit # text editor gnome-calendar gnome-clocks gnome-contacts diff --git a/nixos/hosts/olympus/default.nix b/nixos/hosts/olympus/default.nix index d8f7cb90..1f0a7ac5 100644 --- a/nixos/hosts/olympus/default.nix +++ b/nixos/hosts/olympus/default.nix @@ -19,7 +19,8 @@ ip = "10.42.42.4"; ip6 = "2001:41f0:9639:1:80f0:7cff:fecb:bd6d"; mac = "82:F0:7C:CB:BD:6D"; - type = "vm"; + # type = "vm"; + nix = false; # Now managed in the `new` branch }; "vault" = { ip = "10.42.42.6";