fix some deprecated

flake.nix

@@ -2,12 +2,6 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
 
-    spicetify-nix = {
-      url = "github:the-argus/spicetify-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-utils.follows = "flake-utils";
-    };
-
     flake-utils.url = "github:numtide/flake-utils";
 
     home-manager = {

home-manager/common.nix

@@ -6,7 +6,6 @@ inputs: all: {
 }: {
   imports = [
     all
-    inputs.spicetify-nix.homeManagerModule
   ];
 
   programs.direnv = {

home-manager/modules/ezpcusr.nix

@@ -527,7 +527,7 @@ in {
     };
 
     home.pointerCursor = {
-      package = lib.mkDefault pkgs.gnome.adwaita-icon-theme;
+      package = lib.mkDefault pkgs.adwaita-icon-theme;
       name = lib.mkDefault "Adwaita";
       size = lib.mkDefault 24;
       x11.enable = lib.mkDefault true;
@@ -602,12 +602,14 @@ in {
 
     services.flameshot = {
       enable = true;
+      package = pkgs.flameshot.override { enableWlrSupport = true; };
       settings.General = {
         filenamePattern = "%F_%T";
         savePath = "Media/Screenshots";
         saveAfterCopy = true;
         uiColor = "#${config.ezcolors.base16.base04}";
         contrastUiColor = "#${config.ezcolors.base16.base05}";
+        disabledGrimWarning = true;
       };
     };
 

home-manager/users/notgne2.nix

@@ -9,18 +9,9 @@ inputs: {
     url = "https://raw.githubusercontent.com/eprints/eprints3.4/master/lib/mime.types";
     sha256 = "0cdhq71wk5h3zcfrz8dyqc3vrjyikwjqsla855v036r54lch0kn2";
   };
-
-  spicePkgs = inputs.spicetify-nix.packages.${pkgs.system}.default;
 in {
   programs.home-manager.enable = true;
 
-  programs.spicetify = {
-    # theme = spicePkgs.themes.catppuccin-macchiato;
-    enabledExtensions = with spicePkgs.extensions; [
-      # fixEnhance
-    ];
-  };
-
   home.packages = with pkgs; [
     bat
     fzf
@@ -32,7 +23,6 @@ in {
     package = pkgs.vscodium;
     userSettings = {
       "[nix]" = {
-        "editor.defaultFormatter" = "kamadorueda.alejandra";
         "editor.formatOnPaste" = true;
         "editor.formatOnSave" = true;
         "editor.formatOnType" = false;
@@ -70,8 +60,9 @@ in {
         }
       ];
 
-      "nix.formatterPath" = "${pkgs.alejandra}/bin/alejandra";
+      "nix.formatterPath" = "${pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt";
       "nix.enableLanguageServer" = true;
+      "nix.serverPath" = "${pkgs.nil}/bin/nil";
 
       "editor.formatOnSave" = true;
 
@@ -105,12 +96,6 @@ in {
         })
       ]
       ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
-        {
-          name = "vscode-autohide";
-          publisher = "sirmspencer";
-          version = "1.0.7";
-          sha256 = "sha256-VaG/eTE2BGbHAYgFdS31c47rgLZVjHGK+/U8MSYKDt8=";
-        }
         {
           name = "ide-purescript";
           publisher = "nwolverson";

modules/ezpc.nix

@@ -16,17 +16,16 @@ in {
         enable = lib.mkDefault true;
         settings = {
           screencast = {
-            max_fps = lib.mkDefault 30;
+            max_fps = lib.mkDefault 55;
             chooser_type = lib.mkDefault "simple";
             chooser_cmd = lib.mkDefault "${pkgs.slurp}/bin/slurp -f %o -or";
           };
         };
       };
-      extraPortals = with pkgs; [
+      config = {
-        # used for xdg-open and whatnot
+        wlroots.default = ["wlr" "gtk"];
-        xdg-desktop-portal-gtk
+        common.default = ["gtk"];
-        xdg-desktop-portal-kde
+      };
-      ];
     };
 
     environment.sessionVariables = {
@@ -50,7 +49,8 @@ in {
     };
 
     i18n.inputMethod = {
-      enabled = lib.mkDefault "ibus";
+      type = lib.mkDefault "ibus";
+      enable = lib.mkDefault true;
       ibus.engines = with pkgs.ibus-engines; [typing-booster uniemoji];
     };
   };

modules/ezpw.nix

@@ -47,7 +47,6 @@ in {
   in
     mkIf cfg.enable {
       hardware.pulseaudio.enable = lib.mkDefault false;
-      sound.enable = lib.mkDefault false;
 
       services.pipewire = {
         enable = lib.mkDefault true;

modules/workstation.nix

@@ -118,11 +118,10 @@ in {
     };
 
     # Video support
-    hardware.opengl = {
+    hardware.graphics = {
       enable = lib.mkDefault true;
-      driSupport = lib.mkDefault true;
       # Fix steam
-      driSupport32Bit = lib.mkDefault true;
+      enable32Bit = lib.mkDefault true;
     };
 
     # Support for steam hardware
@@ -225,14 +224,14 @@ in {
     fonts.enableDefaultPackages = lib.mkDefault true;
     # Important for steam
     fonts.fontconfig.cache32Bit = lib.mkDefault true;
+    services.libinput = {
+      enable = lib.mkDefault true;
+      mouse.accelProfile = lib.mkDefault "flat";
+      touchpad.accelProfile = lib.mkDefault "flat";
+    };
     services.xserver = {
-      libinput = {
-        enable = lib.mkDefault true;
-        mouse.accelProfile = lib.mkDefault "flat";
-        touchpad.accelProfile = lib.mkDefault "flat";
-      };
       dpi = lib.mkDefault 96;
-      layout = lib.mkDefault "us";
+      xkb.layout = lib.mkDefault "us";
     };
 
     networking.networkmanager.wifi.macAddress = lib.mkDefault "random";