From fba12571c353b2323b97ca3858fec21f4decb7cb Mon Sep 17 00:00:00 2001 From: Paul-Henri Froidmont Date: Wed, 1 Dec 2021 02:13:36 +0100 Subject: [PATCH] Update to NixOS 22.05 --- flake.lock | 20 ++++++++++---------- modules/games.nix | 22 ---------------------- profiles/base.nix | 1 - users/default.nix | 8 +++----- 4 files changed, 13 insertions(+), 38 deletions(-) delete mode 100644 modules/games.nix diff --git a/flake.lock b/flake.lock index e2b0965..2cd8acc 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1635123562, - "narHash": "sha256-kYuwQqHXDYxy5ijpm8SvCoPNx0br1TpoWeTIOEwOYvA=", + "lastModified": 1638311312, + "narHash": "sha256-OMAd3WZ/VtMK0QQwDrrynP6+jOlWLd1yQtnW56+eZtA=", "owner": "nix-community", "repo": "home-manager", - "rev": "da8a78eec9f7adb57f9e961d1da64805efacff37", + "rev": "f23073f1daa769a28a12ac587eea487aa8afb196", "type": "github" }, "original": { @@ -20,10 +20,10 @@ }, "nixpkgs": { "locked": { - "lastModified": 1632660378, - "narHash": "sha256-sjA8eQlnyDjDLyAyq3XlJmN0nqW0ftl/pb7VnMg86L0=", - "path": "/nix/store/mzr7r470gdi10n363c8axn8v5nk1miy4-source", - "rev": "31ffc50c571e6683e9ecc9dbcbd4a8e9914b4497", + "lastModified": 1633080050, + "narHash": "sha256-T9I2WnlUzAIL70dk9V1jqaYk3nypy/cMkWR19S47ZHc=", + "path": "/nix/store/n2yn85z0ymd22iasnzpp4gn88n71947i-source", + "rev": "82155ff501c7622cb2336646bb62f7624261f6d7", "type": "path" }, "original": { @@ -33,11 +33,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1634782485, - "narHash": "sha256-psfh4OQSokGXG0lpq3zKFbhOo3QfoeudRcaUnwMRkQo=", + "lastModified": 1638198142, + "narHash": "sha256-plU9b8r4St6q4U7VHtG9V7oF8k9fIpfXl/KDaZLuY9k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "34ad3ffe08adfca17fcb4e4a47bb5f3b113687be", + "rev": "8a308775674e178495767df90c419425474582a1", "type": "github" }, "original": { diff --git a/modules/games.nix b/modules/games.nix deleted file mode 100644 index cb9efbd..0000000 --- a/modules/games.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ config, lib, pkgs, ... }: -{ - - home-manager.users.froidmpa = { pkgs, config, ... }: { - # nixpkgs.config = { - # allowUnfree = true; - # packageOverrides = super: - # let self = super.pkgs; in - # { - # lutris-unwrapped = super.lutris-unwrapped.overridePythonAttrs (oldAttrs: rec { - # patches = [ - # ./lutris_sort_new_with_model_fix.patch - # ]; - # }); - # }; - # }; - # home.packages = with pkgs; [ - # steam - # dolphinEmu - # ]; - }; -} diff --git a/profiles/base.nix b/profiles/base.nix index 0b47ea7..e7ae432 100644 --- a/profiles/base.nix +++ b/profiles/base.nix @@ -5,7 +5,6 @@ ./../modules/network.nix ./../modules/virtualisation.nix ./../modules/belgian-eid.nix - ./../modules/games.nix ]; time.timeZone = lib.mkDefault "Europe/Amsterdam"; diff --git a/users/default.nix b/users/default.nix index 713b7e8..9538ab0 100644 --- a/users/default.nix +++ b/users/default.nix @@ -54,7 +54,7 @@ }; unclutter.enable = true; pasystray.enable = true; - dunst = import ./froidmpa/dunst.nix {}; + dunst = import ./froidmpa/dunst.nix { }; screen-locker = { enable = true; inactiveInterval = 5; @@ -132,10 +132,8 @@ direnv = { enable = true; enableZshIntegration = true; - nix-direnv = { - enable = true; - enableFlakes = true; - }; + nix-direnv.enable = true; + }; vscode = { enable = true;