From fda4c936352aaab0a9e299be8abcc28f9de0ce98 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Fri, 7 Jul 2023 09:27:10 +0200
Subject: [PATCH] feat(nixos): upgrade package sources to version 23.05

---
 configuration.nix                        |  7 +++--
 flake.lock                               | 40 +++++++-----------------
 flake.nix                                |  4 +--
 machines/p330/hardware-configuration.nix |  3 --
 4 files changed, 19 insertions(+), 35 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 1174448..c05e23e 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -38,7 +38,10 @@
 
   networking.networkmanager.enable = true;
 
-  programs.appgate-sdp.enable = true;
+  programs = {
+    appgate-sdp.enable = true;
+    zsh.enable = true;
+  };
 
   services.xserver = {
     enable = true;
@@ -97,7 +100,7 @@
 
   services.openssh = {
     enable = true;
-    forwardX11 = true;
+    settings.X11Forwarding = true;
   };
 
   services.printing = {
diff --git a/flake.lock b/flake.lock
index 5d7aa98..a7c406b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -4,47 +4,46 @@
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
-        ],
-        "utils": "utils"
+        ]
       },
       "locked": {
-        "lastModified": 1685325875,
-        "narHash": "sha256-tevlLIMPeVNNYPd9UgjHApAUoFAnw9iohqUyj+LPp88=",
+        "lastModified": 1687871164,
+        "narHash": "sha256-bBFlPthuYX322xOlpJvkjUBz0C+MOBjZdDOOJJ+G2jU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b372d7f8d5518aaba8a4058a453957460481afbc",
+        "rev": "07c347bb50994691d7b0095f45ebd8838cf6bc38",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-22.11",
+        "ref": "release-23.05",
         "repo": "home-manager",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1686476475,
-        "narHash": "sha256-W9yUePvCSDghn+YUXewuodyPxt+kJl/a7zdY4Q6r4MU=",
+        "lastModified": 1688594934,
+        "narHash": "sha256-3dUo20PsmUd57jVZRx5vgKyIN1tv+v/JQweZsve5q/A=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "eef86b8a942913a828b9ef13722835f359deef29",
+        "rev": "e11142026e2cef35ea52c9205703823df225c947",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-22.11",
+        "ref": "nixos-23.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1686501370,
-        "narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=",
+        "lastModified": 1688590700,
+        "narHash": "sha256-ZF055rIUP89cVwiLpG5xkJzx00gEuuGFF60Bs/LM3wc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "75a5ebf473cd60148ba9aec0d219f72e5cf52519",
+        "rev": "f292b4964cb71f9dfbbd30dc9f511d6165cd109b",
         "type": "github"
       },
       "original": {
@@ -60,21 +59,6 @@
         "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable"
       }
-    },
-    "utils": {
-      "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 76485de..c3d8eec 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,10 +1,10 @@
 {
   inputs = {
-    nixpkgs.url = github:NixOS/nixpkgs/nixos-22.11;
+    nixpkgs.url = github:NixOS/nixpkgs/nixos-23.05;
     nixpkgs-unstable.url = github:NixOS/nixpkgs/nixos-unstable;
 
     home-manager = {
-      url = github:nix-community/home-manager/release-22.11;
+      url = github:nix-community/home-manager/release-23.05;
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
diff --git a/machines/p330/hardware-configuration.nix b/machines/p330/hardware-configuration.nix
index cf03a95..48edd98 100644
--- a/machines/p330/hardware-configuration.nix
+++ b/machines/p330/hardware-configuration.nix
@@ -63,7 +63,4 @@
       libvdpau-va-gl
     ];
   };
-
-  # high-resolution display
-  hardware.video.hidpi.enable = lib.mkDefault true;
 }