From f5991e19f2df44c318060119c9bae2831544c285 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Mon, 4 Nov 2024 22:11:23 +0530 Subject: [PATCH] pkgs: use _64gram nix package, cleanup --- flake.lock | 86 ++++++++++++++++++------------------ modules-overlays/default.nix | 9 +++- pkgs/flatpak-packages.nix | 1 - pkgs/user-packages.nix | 2 + system/services/default.nix | 2 +- system/users.nix | 2 +- 6 files changed, 55 insertions(+), 47 deletions(-) diff --git a/flake.lock b/flake.lock index db97607d..a1480f0a 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1730555728, - "narHash": "sha256-jBr4WUPat+R/79DBdk85hKyqDfoJII4Z+V+GoevYNDY=", + "lastModified": 1730674629, + "narHash": "sha256-bT4l/nrUvGK5wvUCkq2I5oWphjg3kZXthYcqG7K0uBs=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "e734744bc2e9ca9aa577555bf028c5ea51eb5f77", + "rev": "09f0dcfa6a8932850f2291717a271598d3098aad", "type": "github" }, "original": { @@ -222,11 +222,11 @@ ] }, "locked": { - "lastModified": 1730016908, - "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=", + "lastModified": 1730633670, + "narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=", "owner": "nix-community", "repo": "home-manager", - "rev": "e83414058edd339148dc142a8437edb9450574c8", + "rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1730490306, - "narHash": "sha256-AvCVDswOUM9D368HxYD25RsSKp+5o0L0/JHADjLoD38=", + "lastModified": 1730633670, + "narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=", "owner": "nix-community", "repo": "home-manager", - "rev": "1743615b61c7285976f85b303a36cdf88a556503", + "rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661", "type": "github" }, "original": { @@ -299,11 +299,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1730499652, - "narHash": "sha256-De3YRKpowtm15xN7hK0PdBpu96wwSyQE+qFoq9Gi6lM=", + "lastModified": 1730652188, + "narHash": "sha256-3L+Jh3J3JvJPsGTqSOIKjwZy/AysR0WOLgGKNkXFqxs=", "ref": "refs/heads/main", - "rev": "32b18179dd789cde948c97eb3c2ebbdd6af36bf7", - "revCount": 5402, + "rev": "cd0d0491261728260de3d1aff150e1b6c05f9e86", + "revCount": 5407, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -449,11 +449,11 @@ ] }, "locked": { - "lastModified": 1730248099, - "narHash": "sha256-Fl7BSdpLk0uTXF6ol/MR0q1EB4XQ8tn0ftig0pyYh5Y=", + "lastModified": 1730625581, + "narHash": "sha256-vFxtzNCxtUIrmv8tluquZHjNTwMkCGtT0NCoVuwlqd4=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "c11bab124fc55a37cbd854ed28ea121ed609231f", + "rev": "e6195c6bfc037617e20d6d7d4d6c9cdeee6aba6d", "type": "github" }, "original": { @@ -537,11 +537,11 @@ ] }, "locked": { - "lastModified": 1730512048, - "narHash": "sha256-u0vI+4AZCX31lbGSC9ZtM/VE8fikgjlZaAIJZSRpt1s=", + "lastModified": 1730685024, + "narHash": "sha256-w0cQSTjLBaUSziPGwyI0nbWVD64+N3ByoSxC0CEZmeI=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "a6d4683cb3b0b3b846015196c8938cdeb5ffc2d9", + "rev": "16ca007ec37c29a8b97e4899f33c013defbdb2f9", "type": "github" }, "original": { @@ -552,11 +552,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730200266, - "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", + "lastModified": 1730531603, + "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", + "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", "type": "github" }, "original": { @@ -568,11 +568,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1730449684, - "narHash": "sha256-Hlv3rTPxnO+DpKRXw9yjzERLdk05h7+fEbZxWM2taCw=", + "lastModified": 1730642263, + "narHash": "sha256-UXqvGZOHUDeAo8Sv5A5oObiQgBPELVgHQi130TU0jMU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ab464abbeb3a2833288c6e907488c49c2e599f88", + "rev": "650fe87347086b30a6dbcc32b55987ce5a23c6ae", "type": "github" }, "original": { @@ -583,11 +583,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1730560389, - "narHash": "sha256-us4KgyXveAENBhzMZKeojUNkyisVXtlUQW+xrsAyBt8=", + "lastModified": 1730692470, + "narHash": "sha256-cC8pZDmkw9gAsB4qu3OGSCvPTk/3Y/pzO6yIK/2NNc0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aa00c218d4cbb0e90b02be4d5dc6b3402fa6b535", + "rev": "8a759c910ebf0bc0aab26ae0807ad34b42211b23", "type": "github" }, "original": { @@ -598,11 +598,11 @@ }, "nixpkgs-scx-test": { "locked": { - "lastModified": 1730559089, - "narHash": "sha256-E5XJndzx+l7PXsNPI3QBQPEP5a85Zysocn5WqICBzMg=", + "lastModified": 1730676279, + "narHash": "sha256-wW9dJHiK3ZY/lYqiZtWm+8E0GgQc2hgCyF2h8jcieh8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d60e20b9fd5e285c03d631e2d81b2852a82b8704", + "rev": "645f7124df1b7deed3f9b9530637dc049c3b1197", "type": "github" }, "original": { @@ -646,11 +646,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1729413321, - "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", + "lastModified": 1730531603, + "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", + "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", "type": "github" }, "original": { @@ -662,11 +662,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1730200266, - "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", + "lastModified": 1730531603, + "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", + "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", "type": "github" }, "original": { @@ -693,11 +693,11 @@ }, "nur": { "locked": { - "lastModified": 1730552901, - "narHash": "sha256-K1v1CSzAnfL85MHY07S0BhVKae/ysZqowWdEapFcFJc=", + "lastModified": 1730693489, + "narHash": "sha256-RVCS/FBpNhKFtHQywm0dj+7hlruBUO3fa64Gr7/6/XQ=", "owner": "nix-community", "repo": "NUR", - "rev": "c7dd9f07d3e3c2abf03aac70ebd21d658037f0c4", + "rev": "c09c972084cb9367f3b61fd4968b14f329c7b7bf", "type": "github" }, "original": { @@ -942,11 +942,11 @@ ] }, "locked": { - "lastModified": 1728166987, - "narHash": "sha256-w6dVTguAn9zJ+7aPOhBQgDz8bn6YZ7b56cY8Kg5HJRI=", + "lastModified": 1730187742, + "narHash": "sha256-M0umGIIvVFqCwA0fQ5edivMTbRYA0r/5tXK8sr+M7EA=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "fb9c8d665af0588bb087f97d0f673ddf0d501787", + "rev": "998f646762b94fbac61b0271ce66d3e617262858", "type": "github" }, "original": { diff --git a/modules-overlays/default.nix b/modules-overlays/default.nix index b840e3e3..abf5c264 100644 --- a/modules-overlays/default.nix +++ b/modules-overlays/default.nix @@ -1,7 +1,7 @@ { lib, pkgs, - pkgs-edge, + pkgs-master, inputs, ... }: { @@ -9,4 +9,11 @@ #./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 index 083987a3..e1e9a298 100644 --- 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 index 55d1d21c..68b68005 100644 --- 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 index ae2e0ae8..2fcf45b2 100644 --- 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 index cc8cb402..8dc5379a 100644 --- 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; }; }