From 8ac9e86f9a46f8f2bc2311d8e69c952ad09c6eaf Mon Sep 17 00:00:00 2001
From: Nilstrieb <48135649+Nilstrieb@users.noreply.github.com>
Date: Sun, 18 Jun 2023 20:30:52 +0200
Subject: [PATCH] update to nixos 23.05

---
 flake.lock              | 34 +++++++++-------------------------
 flake.nix               |  4 ++--
 home-manager/home.nix   | 11 ++++++-----
 nixos/configuration.nix | 11 ++++++-----
 4 files changed, 23 insertions(+), 37 deletions(-)

diff --git a/flake.lock b/flake.lock
index 9445080..2c5d4a9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -4,36 +4,35 @@
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
-        ],
-        "utils": "utils"
+        ]
       },
       "locked": {
-        "lastModified": 1685325875,
-        "narHash": "sha256-tevlLIMPeVNNYPd9UgjHApAUoFAnw9iohqUyj+LPp88=",
+        "lastModified": 1687041925,
+        "narHash": "sha256-Zfn/SphInZ9PEIHWdQk+wGQ0XGlwAgRUp/Qso+8vDOY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b372d7f8d5518aaba8a4058a453957460481afbc",
+        "rev": "a8d549351d4b87ab80665f35e57bee2a04201245",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-22.11",
+        "ref": "release-23.05",
         "repo": "home-manager",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1687019075,
-        "narHash": "sha256-YjB+tp0DPfzct8XmXNW1UAfQp0irIVM7nGcJPiqT61c=",
+        "lastModified": 1686921029,
+        "narHash": "sha256-J1bX9plPCFhTSh6E3TWn9XSxggBh/zDD4xigyaIQBy8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "50d2e0780758fcb41cf5e494a51624cbf6c40b20",
+        "rev": "c7ff1b9b95620ce8728c0d7bd501c458e6da9e04",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-22.11",
+        "ref": "nixos-23.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -59,21 +58,6 @@
         "nixpkgs": "nixpkgs",
         "nur": "nur"
       }
-    },
-    "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 8a30404..b94f08d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,11 +5,11 @@
 
   inputs = {
     # Nixpkgs
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
     nur.url = github:nix-community/NUR;
 
     # Home manager
-    home-manager.url = "github:nix-community/home-manager/release-22.11";
+    home-manager.url = "github:nix-community/home-manager/release-23.05";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
     # TODO: Add any other flake you might need
diff --git a/home-manager/home.nix b/home-manager/home.nix
index b35e3a2..c738103 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -53,7 +53,7 @@
     nixpkgs-fmt
     rnix-lsp
     fzf
-    linuxKernel.packages.linux_5_15.perf
+    linuxKernel.packages.linux_6_1.perf
     cargo-nextest
     git-absorb
     gcc
@@ -85,15 +85,16 @@
 
   programs.firefox = {
     enable = true;
-    extensions = with pkgs.nur.repos.rycee.firefox-addons; [
-      ublock-origin
-      bitwarden
-    ];
     profiles = {
       nils = {
         id = 0;
         name = "nils";
 
+        extensions = with pkgs.nur.repos.rycee.firefox-addons; [
+          ublock-origin
+          bitwarden
+        ];
+
         bookmarks = [
           {
             name = "Nix sites";
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 656408c..d5619a8 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -66,7 +66,6 @@
   boot.loader.efi.canTouchEfiVariables = true;
   boot.loader.efi.efiSysMountPoint = "/boot/efi";
   boot.loader.grub.enable = true;
-  boot.loader.grub.version = 2;
   boot.loader.grub.device = "nodev";
   boot.loader.grub.efiSupport = true;
   boot.loader.grub.useOSProber = true;
@@ -155,9 +154,9 @@
   services.openssh = {
     enable = false;
     # Forbid root login through SSH.
-    permitRootLogin = "no";
+    settings.PermitRootLogin = "no";
     # Use keys only. Remove if you want to SSH using password (not recommended)
-    passwordAuthentication = false;
+    settings.PasswordAuthentication = false;
   };
 
 
@@ -172,8 +171,6 @@
     git
     fish
     (steam.override {
-      withPrimus = true;
-      withJava = true;
       extraPkgs = pkgs: [ bumblebee glxinfo ];
     }).run
     # Wine for 32 and 64 bit applications
@@ -193,6 +190,10 @@
     remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
   };
 
+  programs.fish = {
+    enable = true;
+  };
+
   programs.java.enable = true;
 
   # Open ports in the firewall.