diff --git a/flake.lock b/flake.lock index 98985c6a..529e5a28 100644 --- a/flake.lock +++ b/flake.lock @@ -19,11 +19,11 @@ ] }, "locked": { - "lastModified": 1676296232, - "narHash": "sha256-ss/wLM7F/fOjU9KkJ8Dh5vbRLClvR9ycZsysFoAAn6o=", + "lastModified": 1676383006, + "narHash": "sha256-x59eB43KIDE8BHHexzbCxIPnnMspPliSMdBCekMXDaU=", "owner": "accentor", "repo": "flake", - "rev": "af3a279ecf7a4e71155f5289a5aacfdab50652b5", + "rev": "45cebd3a2eb83875b9f18246c993133b143c988a", "type": "github" }, "original": { @@ -176,11 +176,11 @@ ] }, "locked": { - "lastModified": 1676344740, - "narHash": "sha256-L5Sv/lluCTpaUpPWErUICesRNbMX431+4EL5gFQG3lU=", + "lastModified": 1676366521, + "narHash": "sha256-i4UAY8t9Au9SJtsgYppa3NHSVf1YkV6yqnNIQd+Km4g=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "e24f948ba5bcd5d8f4e6485a6e0102f2171541c7", + "rev": "c16be6de78ea878aedd0292aa5d4a1ee0a5da501", "type": "github" }, "original": { @@ -271,11 +271,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1676202775, - "narHash": "sha256-gV/RnfVZkGLHn+5rmX2GSh5aquVHpWOJw1cnpEV03tQ=", + "lastModified": 1676300157, + "narHash": "sha256-1HjRzfp6LOLfcj/HJHdVKWAkX9QRAouoh6AjzJiIerU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d917136f550a8c36efb1724390c7245105f79023", + "rev": "545c7a31e5dedea4a6d372712a18e00ce097d462", "type": "github" }, "original": { @@ -300,13 +300,29 @@ "type": "indirect" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1676253841, + "narHash": "sha256-jhuI8Mmky8VCD45OoJEuF6HdPLFBwNrHA0ljjZ/zkfw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "a45a8916243a7d27acc358f4fc18c4491f3eeca8", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-22.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nur": { "locked": { - "lastModified": 1676360078, - "narHash": "sha256-p08jYnaYZKNcmRz4g8d2g7Xjx/jGDc8e97AAoMQuiK4=", + "lastModified": 1676382524, + "narHash": "sha256-evSZlVDvd0gMnXyae3nTyQx5RAxuSYaZkPjh61o0Nxs=", "owner": "nix-community", "repo": "NUR", - "rev": "72677d48bca8c0c736f6bfad66cc2cab0b77b249", + "rev": "bd125ebba4a8278656545ab79444979e3a4a41f2", "type": "github" }, "original": { @@ -327,6 +343,7 @@ "home-manager": "home-manager", "nixos-mailserver": "nixos-mailserver", "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable", "nur": "nur", "tetris": "tetris", "utils": "utils", diff --git a/flake.nix b/flake.nix index cc2c8c66..ec4038d1 100644 --- a/flake.nix +++ b/flake.nix @@ -62,6 +62,7 @@ }; }; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-22.11"; nur.url = "github:nix-community/NUR"; tetris = { url = "github:chvp/tetris"; @@ -87,7 +88,7 @@ }; }; - outputs = inputs@{ self, nixpkgs, accentor, accentor-api, accentor-web, agenix, devshell, emacs-overlay, flake-utils, home-manager, nixos-mailserver, nur, tetris, utils, www-chvp-be }: + outputs = inputs@{ self, nixpkgs, nixpkgs-stable, accentor, accentor-api, accentor-web, agenix, devshell, emacs-overlay, flake-utils, home-manager, nixos-mailserver, nur, tetris, utils, www-chvp-be }: utils.lib.mkFlake { inherit self inputs; channels.nixpkgs = { @@ -100,6 +101,7 @@ (self: super: { tetris = tetris.packages.${self.system}.default; matrix-hookshot = self.callPackage ./packages/matrix-hookshot { }; + wezterm = nixpkgs-stable.legacyPackages.${self.system}.wezterm; }) nur.overlay www-chvp-be.overlay diff --git a/modules/work/teams/default.nix b/modules/work/teams/default.nix index 2d28d1d8..f673e291 100644 --- a/modules/work/teams/default.nix +++ b/modules/work/teams/default.nix @@ -8,14 +8,13 @@ config = lib.mkIf config.chvp.work.teams.enable { chvp.base = { - nix.unfreePackages = [ "teams" ]; zfs.homeLinks = [ - { path = ".config/Microsoft"; type = "data"; } + { path = ".config/teams-for-linux"; type = "cache"; } ]; }; home-manager.users.charlotte = { pkgs, ... }: { - home.packages = with pkgs; [ teams ]; + home.packages = with pkgs; [ teams-for-linux ]; }; }; }