motiejus/config
1
Fork 0
Code Packages Releases Activity

remove nixpkgs-unstable

Browse Source
This commit is contained in:
Motiejus Jakštys 2024-05-31 09:31:54 +03:00
parent beb747d508
commit 7f8623c866
5 changed files with 19 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
flake.lock
View File

@ -246,29 +246,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": {
"locked": {
"lastModified": 1716948383,
"narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ad57eef4ef0659193044870c731987a6df5cf56b",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1717128264, "lastModified": 1717137004,
"narHash": "sha256-G1v5wsi6TAyKWUZcfU8yvbhRrXXL2jVsX3OP3o3PIfQ=", "narHash": "sha256-bTPVuz7H9Rpa5hyUvFqL8VBZTnh9u6FEd/ZSrJNHqcM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "5087d4ff41071cbc7d2f376df89d81bde2e00745", "rev": "83d68f7515cf4915933e6c9a431baf81110433f9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -319,7 +303,6 @@
"nixgl": "nixgl", "nixgl": "nixgl",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable",
"nur": "nur", "nur": "nur",
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
} }

6
flake.nix
View File

@ -3,7 +3,6 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
flake-compat.url = "github:nix-community/flake-compat"; flake-compat.url = "github:nix-community/flake-compat";
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
@ -76,7 +75,6 @@
outputs = { outputs = {
self, self,
nixpkgs, nixpkgs,
nixpkgs-unstable,
agenix, agenix,
deploy-rs, deploy-rs,
flake-utils, flake-utils,
@ -115,10 +113,6 @@
# TODO: copied from 24.05 # TODO: copied from 24.05
turbo = super.callPackage ./pkgs/turbo.nix {}; turbo = super.callPackage ./pkgs/turbo.nix {};
pkgs-unstable = import nixpkgs-unstable {
inherit (super) system;
};
crossArm64 = import nixpkgs { crossArm64 = import nixpkgs {
system = "x86_64-linux"; system = "x86_64-linux";
hostPlatform.config = "aarch64-linux"; hostPlatform.config = "aarch64-linux";

2
modules/profiles/desktop/default.nix
View File

@ -248,7 +248,7 @@ in {
winetricks winetricks
wineWowPackages.full wineWowPackages.full
]) ])
[pkgs.pkgs-unstable.undocker] [pkgs.undocker]
]; ];
# https://discourse.nixos.org/t/nixos-rebuild-switch-upgrade-networkmanager-wait-online-service-failure/30746 # https://discourse.nixos.org/t/nixos-rebuild-switch-upgrade-networkmanager-wait-online-service-failure/30746

6
shared/home/default.nix
View File

@ -70,9 +70,9 @@ in {
[extract_url] [extract_url]
(lib.mkIf devTools [ (lib.mkIf devTools [
pkgs-unstable.go_1_22 go_1_22
pkgs-unstable.go-tools go-tools
pkgs-unstable.zig_0_12 zig_0_12
]) ])
(lib.mkIf hmOnly [ (lib.mkIf hmOnly [

8
shared/work/default.nix
View File

@ -6,8 +6,7 @@
mj.base.users.email = null; mj.base.users.email = null;
mj.base.users.user.extraGroups = ["docker"]; mj.base.users.user.extraGroups = ["docker"];
environment.systemPackages = environment.systemPackages = with pkgs; [
(with pkgs; [
#swc #swc
#nodejs #nodejs
#typescript #typescript
@ -18,10 +17,7 @@
kubectl-node-shell kubectl-node-shell
kubectx kubectx
google-cloud-sdk google-cloud-sdk
]) ];
++ (with pkgs.pkgs-unstable; [
#turbo
]);
services.clamav = { services.clamav = {
updater.enable = true; updater.enable = true;