From 7c447b4872be05cbf887c1e3d829ebb0d820e328 Mon Sep 17 00:00:00 2001 From: xinyangli Date: Wed, 27 Sep 2023 02:32:27 +0800 Subject: [PATCH] calcite: add microsoft intune service --- flake.lock | 64 ++++++++++++------------------ flake.nix | 20 +++++----- machines/calcite/configuration.nix | 2 + 3 files changed, 38 insertions(+), 48 deletions(-) diff --git a/flake.lock b/flake.lock index 81619de..a242d44 100644 --- a/flake.lock +++ b/flake.lock @@ -74,11 +74,11 @@ ] }, "locked": { - "lastModified": 1695224363, - "narHash": "sha256-+hfjJLUMck5G92RVFDZA7LWkR3kOxs5zQ7RPW9t3eM8=", + "lastModified": 1695738267, + "narHash": "sha256-LTNAbTQ96xSj17xBfsFrFS9i56U2BMLpD0BduhrsVkU=", "owner": "nix-community", "repo": "home-manager", - "rev": "408ba13188ff9ce309fa2bdd2f81287d79773b00", + "rev": "0f4e5b4999fd6a42ece5da8a3a2439a50e48e486", "type": "github" }, "original": { @@ -91,14 +91,16 @@ "inputs": { "flake-compat": "flake-compat", "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1695345913, - "narHash": "sha256-TkCmI8cLQ02HW9jW2HEquQZ1u1ljeOlEFMU+9PS2tLg=", + "lastModified": 1695691129, + "narHash": "sha256-tUbgZOgmR/9vh4yvW3Bw6Xd+1f4DDcEI/EoqbO0SOuI=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "8f30a4bcd475bff9f23097e4450754ec068523b2", + "rev": "bd2d4d8c383ca5236a174742ef2d8d42307de40f", "type": "github" }, "original": { @@ -130,11 +132,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1695109627, - "narHash": "sha256-4rpyoVzmunIG6xWA/EonnSSqC69bDBzciFi6SjBze/0=", + "lastModified": 1695541019, + "narHash": "sha256-rs++zfk41K9ArWkDAlmBDlGlKO8qeRIRzdjo+9SmNFI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cb4dc98f776ddb6af165e6f06b2902efe31ca67a", + "rev": "61283b30d11f27d5b76439d43f20d0c0c8ff5296", "type": "github" }, "original": { @@ -146,15 +148,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1684570954, - "narHash": "sha256-FX5y4Sm87RWwfu9PI71XFvuRpZLowh00FQpIJ1WfXqE=", - "owner": "NixOS", + "lastModified": 1695750249, + "narHash": "sha256-uE7t9hJwa6ngwWvOiQxVpWRX8iOWgiU7+STXbTFttMI=", + "owner": "xinyangli", "repo": "nixpkgs", - "rev": "3005f20ce0aaa58169cdee57c8aa12e5f1b6e1b3", + "rev": "0e6469c77887662764a5e65808641b1ecf6d106c", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "xinyangli", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -162,11 +164,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1695272228, - "narHash": "sha256-4uw2OdJPVyjdB+xcDst9SecrNIpxKXJ2usN3M5HVa7o=", + "lastModified": 1695559356, + "narHash": "sha256-kXZ1pUoImD9OEbPCwpTz4tHsNTr4CIyIfXb3ocuR8sI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "55ac2a9d2024f15c56adf20da505b29659911da8", + "rev": "261abe8a44a7e8392598d038d2e01f7b33cf26d0", "type": "github" }, "original": { @@ -193,22 +195,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1695145219, - "narHash": "sha256-Eoe9IHbvmo5wEDeJXKFOpKUwxYJIOxKUesounVccNYk=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "5ba549eafcf3e33405e5f66decd1a72356632b96", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1694760568, "narHash": "sha256-3G07BiXrp2YQKxdcdms22MUx6spc6A++MSePtatCYuI=", @@ -226,11 +212,11 @@ }, "nur": { "locked": { - "lastModified": 1695395799, - "narHash": "sha256-D/SfJk+w2AknDWfR4KX5lEs/1zYtpq814oQfwEpmXC0=", + "lastModified": 1695750428, + "narHash": "sha256-IAT2N9tmdV6Rp2UYQsF/dv7d6iUsgmW9OtPa8D6TzAQ=", "owner": "nix-community", "repo": "NUR", - "rev": "e256049bbaab62633de72dd14be51a8f592d6631", + "rev": "e0da1a7ac4f93eec44939d6f75eaa5b7242a179f", "type": "github" }, "original": { @@ -246,7 +232,7 @@ "nix-vscode-extensions": "nix-vscode-extensions", "nixos-cn": "nixos-cn", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable", "nur": "nur", "sops-nix": "sops-nix" @@ -254,7 +240,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { diff --git a/flake.nix b/flake.nix index 4ca0638..7153504 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { inputs = { # Pin nixpkgs to a specific commit - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:xinyangli/nixpkgs/nixos-unstable"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.05"; home-manager = { @@ -9,20 +9,22 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + nix-vscode-extensions = { + url = "github:nix-community/nix-vscode-extensions"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + nixos-cn = { + url = "github:nixos-cn/flakes"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nur.url = "github:nix-community/NUR"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - nixos-cn = { - url = "github:nixos-cn/flakes"; - # Use the same nixpkgs - inputs.nixpkgs.follows = "nixpkgs"; - }; - sops-nix.url = "github:Mic92/sops-nix"; - nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions"; - flake-utils.url = "github:numtide/flake-utils"; }; diff --git a/machines/calcite/configuration.nix b/machines/calcite/configuration.nix index b9f6809..4977976 100644 --- a/machines/calcite/configuration.nix +++ b/machines/calcite/configuration.nix @@ -100,6 +100,8 @@ systemd.services."getty@tty1".enable = false; systemd.services."autovt@tty1".enable = false; + services.intune.enable = true; + # Allow unfree packages nixpkgs.config.allowUnfree = true; nixpkgs.config.permittedInsecurePackages = [