pkgs: use _64gram nix package, cleanup

JohnRTitor · Nov 4, 2024 · f5991e1 · f5991e1
1 parent 11a1fff
commit f5991e1
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 47 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/modules-overlays/default.nix b/modules-overlays/default.nix
@@ -1,12 +1,19 @@
 {
   lib,
   pkgs,
-  pkgs-edge,
+  pkgs-master,
   inputs,
   ...
 }: {
   imports = [
     #./amdgpu.nix # import modules here to test
     "${inputs.nixpkgs-scx-test}/nixos/modules/services/scheduling/scx.nix"
   ];
+
+  nixpkgs.overlays = [
+    (final: prev: {
+      _7zz = pkgs-master._7zz;
+      pyprland = pkgs-master.pyprland;
+    })
+  ];
 }
diff --git a/pkgs/flatpak-packages.nix b/pkgs/flatpak-packages.nix
@@ -7,7 +7,6 @@
 
   userPackages = [
     # Flatpak packages to be installed on a per user basis
-    "io.github.tdesktop_x64.TDesktop" # 64Gram
     "im.riot.Riot" # Element Matrix Client
     "dev.vencord.Vesktop" # Vesktop
   ];

diff --git a/pkgs/user-packages.nix b/pkgs/user-packages.nix
@@ -98,6 +98,8 @@
       mission-center # Taskmanager clone
       warp # file transfer, also install android app
       clapper
+
+      _64gram
     ])
     ++ (with pkgs-edge; [
       # list of latest packages from nixpkgs master

diff --git a/system/services/default.nix b/system/services/default.nix
@@ -28,7 +28,7 @@
 
   # Enable scx extra schedulers, only available for linux-cachyos
   services.scx.enable = true;
-  services.scx.package = pkgs-master.scx.full;
+  services.scx.package = pkgs.scx.full;
   # rustland is better and causes less lag in high load, even better than bpfland
   services.scx.scheduler = "scx_rustland";
   services.scx.extraArgs = [

diff --git a/system/users.nix b/system/users.nix
@@ -23,6 +23,6 @@
     shell =
       if (userSettings.shell == "zsh")
       then pkgs.zsh
-      else pkgs.bash;
+      else pkgs.bashInteractive;
   };
 }