From 7791a8d7033d356e6fa8078362c70cfd12685c8a Mon Sep 17 00:00:00 2001
From: Valentin Brandl <mail+github@vbrandl.net>
Date: Mon, 13 Jun 2022 19:22:06 +0200
Subject: [PATCH] Update to nixos 22.05 and fix deprecations

---
 flake.nix            | 2 +-
 machines/common.nix  | 3 +--
 machines/dev.nix     | 2 +-
 machines/w1n5t0n.nix | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/flake.nix b/flake.nix
index 654f405..93c52ea 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,7 +5,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nixpkgs = {
-      url = "github:nixos/nixpkgs/nixos-21.11";
+      url = "github:nixos/nixpkgs/nixos-22.05";
     };
     flake-utils = {
       url = "github:numtide/flake-utils";
diff --git a/machines/common.nix b/machines/common.nix
index 050a835..9568a80 100644
--- a/machines/common.nix
+++ b/machines/common.nix
@@ -97,7 +97,7 @@ inputs:
   };
 
   systemd.tmpfiles.rules = [
-    "L+ /lib64/ld-linux-x86-64.so.2 - - - - ${pkgs.stdenv.glibc}/lib64/ld-linux-x86-64.so.2"
+    "L+ /lib64/ld-linux-x86-64.so.2 - - - - ${pkgs.glibc}/lib64/ld-linux-x86-64.so.2"
   ];
 
   environment.systemPackages = with pkgs; [
@@ -156,7 +156,6 @@ inputs:
     enableDefaultFonts = true;
     fonts = with pkgs; [
       font-awesome
-      font-awesome-ttf
       nerdfonts
       noto-fonts
       noto-fonts-cjk
diff --git a/machines/dev.nix b/machines/dev.nix
index 2cb819b..f45d9a3 100644
--- a/machines/dev.nix
+++ b/machines/dev.nix
@@ -27,7 +27,7 @@ inputs:
     direnv
 
     #idea.idea-community
-    idea.idea-ultimate
+    jetbrains.idea-ultimate
 
     dbeaver
   ];
diff --git a/machines/w1n5t0n.nix b/machines/w1n5t0n.nix
index 26eb522..a76b2c9 100644
--- a/machines/w1n5t0n.nix
+++ b/machines/w1n5t0n.nix
@@ -6,7 +6,7 @@ in
 inputs.nixpkgs.lib.nixosSystem {
   inherit system;
   modules = [
-    { system.stateVersion = "21.11"; }
+    { system.stateVersion = "22.05"; }
     (import ./common.nix inputs)
     (import ./dev.nix inputs)
     (import ./entertainment.nix inputs)