feat: remove deprecated fields

Author: DieracDelta

custom_modules/core_services.nix

@@ -84,7 +84,7 @@ in
 
     services.openssh = {
       enable = true;
-      passwordAuthentication = false;
+      settings.PasswordAuthentication = false;
     };
     programs.ssh = {
       forwardX11 = true;
@@ -99,7 +99,7 @@ in
 
     services.locate = {
       enable = true;
-      locate = pkgs.unstable.mlocate;
+      package = pkgs.unstable.mlocate;
       localuser = null; # mlocate does not support this option so it must be null
       interval = "weekly";
       pruneNames = [
@@ -264,12 +264,12 @@ in
     ];
 
     nix = {
-      binaryCaches = [
-        "https://jrestivo.cachix.org"
-      ];
-      binaryCachePublicKeys = [
-        "jrestivo.cachix.org-1:+jSOsXAAOEjs+DLkybZGQEEIbPG7gsKW1hPwseu03OE="
-      ];
+      # binaryCaches = [
+      #   "https://jrestivo.cachix.org"
+      # ];
+      # binaryCachePublicKeys = [
+      #   "jrestivo.cachix.org-1:+jSOsXAAOEjs+DLkybZGQEEIbPG7gsKW1hPwseu03OE="
+      # ];
 
       /*warn-dirty = true;*/
       extraOptions = ''
@@ -286,16 +286,13 @@ in
         "https://cache.nixos.org"
         "https://cuda-maintainers.cachix.org"
           "https://cachix.cachix.org"
-          "https://gytix.cachix.org/"
-          "https://jrestivo.cachix.org"
+          # "https://jrestivo.cachix.org"
           "http://nix-community.cachix.org/"
       ];
       settings.trusted-public-keys = [
         "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
         "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
           "cachix.cachix.org-1:eWNHQldwUO7G2VkjpnjDbWwy4KQ/HNxht7H4SSoMckM="
-          "gytix.cachix.org-1:JXNZBxYslCV/hAkfNvJgyxlWb8jRQRKc+M0h7AaFg7Y="
-          "jrestivo.cachix.org-1:+jSOsXAAOEjs+DLkybZGQEEIbPG7gsKW1hPwseu03OE="
           "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       ];
       gc = {

custom_modules/workstation_services.nix

@@ -85,22 +85,22 @@ in
     };
 
   config = lib.mkIf cfg.enable {
+    services.desktopManager.plasma6.enable = true;
+    services.libinput.enable = true;
+    services.displayManager.sddm.enable = true;
     # weird bug. Need this in order to get xmonad to work in home-manager.
     services.xserver = {
       enable = true;
-      layout = "us";
+      xkb.layout = "us";
       # displayManager = { lightdm.enable = true; };
       windowManager.i3 = {
         enable = true;
         package = pkgs.i3-gaps;
         extraPackages = with pkgs; [ rofi ];
       };
-      displayManager.sddm.enable = true;
-      desktopManager.plasma6.enable = true;
 
       # desktopManager.gnome.enable = true;
       # .gdm.enable = true;
-      libinput.enable = true;
       desktopManager.gnome.enable = true;
       # displayManager.gdm.enable = true;
       # windowManager.bspwm.enable = true;
@@ -116,9 +116,9 @@ in
     virtualisation.docker = {
       enable = true;
       autoPrune.enable = true;
-      enableNvidia = true;
       enableOnBoot = true;
     };
+    hardware.nvidia-container-toolkit.enable = true;
 
     boot.plymouth = {
       /*TODO add in custom boot icons*/
@@ -144,7 +144,7 @@ in
         virtualizationPack
       ];
 
-    fonts.fonts = with pkgs;
+    fonts.packages = with pkgs;
       [
         d2coding
         # iosevka

flake.lock

@@ -56,12 +56,6 @@
       flake = false;
     };
 
-    rust-overlay = {
-      url = "github:oxalica/rust-overlay";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-utils.follows = "flake-utils";
-    };
-
     my-nvim = {
       url = "github:DieracDelta/vimconfig";
     };
@@ -102,7 +96,6 @@
       url = "github:DieracDelta/filehost_rust";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.naersk.follows = "naersk";
-      inputs.rust-overlay.follows = "rust-overlay";
       inputs.utils.follows = "flake-utils";
     };
 
@@ -112,7 +105,6 @@
     inputs@{ self
     , nixpkgs
     # , nyxt_nixpkgs
-    , rust-overlay
     , home-manager
     , emacs-overlay
     , nix-doom-emacs
@@ -305,7 +297,6 @@
           {
             nixpkgs.config.allowUnfree = true;
             nixpkgs.overlays = [
-              inputs.rust-overlay.overlay
               (final: prev: {
                 nvim = my-nvim.defaultPackage.aarch64-darwin;
                 #nixVeryUnstable = inputs.master.legacyPackages.aarch64-darwin.nixUnstable;

flake.nix

@@ -44,7 +44,7 @@
   # environment.systemPackages = with pkgs; [ trezord trezor-udev-rules python310Packages.trezor_agent python310Packages.trezor ];
   services.trezord.enable = true;
   # environment.sessionVariables.AMD_VULKAN_ICD = "RADV";
-  hardware.opengl.extraPackages = with pkgs; [ /* amdvlk */ /* rocmPackages.clr.icd  */];
+  # hardware.opengl.extraPackages = with pkgs; [ /* amdvlk */ /* rocmPackages.clr.icd  */];
 
   environment.variables = { };
 

hosts/hw/desktop.nix

@@ -5,8 +5,8 @@
   hardware.enableRedistributableFirmware = lib.mkDefault true;
 
   # steam shit
-  hardware.opengl.enable = true;
-  hardware.opengl.driSupport32Bit = true;
+  hardware.graphics.enable = true;
+  hardware.graphics.enable32Bit = true;
   hardware.pulseaudio.support32Bit = true;
   # zramSwap.enable = true;