bwc9876.dev
Flake for my NixOS devices
Switch to Fenix instead of rust-overlay
+38
-19
flake.lock
+38
-19
flake.lock
···
97
97
"type": "github"
98
98
}
99
99
},
100
+
"fenix": {
101
+
"inputs": {
102
+
"nixpkgs": [
103
+
"nixpkgs"
104
+
],
105
+
"rust-analyzer-src": "rust-analyzer-src"
106
+
},
107
+
"locked": {
108
+
"lastModified": 1759301100,
109
+
"narHash": "sha256-hmiTEoVAqLnn80UkreCNunnRKPucKvcg5T4/CELEtbw=",
110
+
"owner": "nix-community",
111
+
"repo": "fenix",
112
+
"rev": "0956bc5d1df2ea800010172c6bc4470d9a22cb81",
113
+
"type": "github"
114
+
},
115
+
"original": {
116
+
"owner": "nix-community",
117
+
"ref": "monthly",
118
+
"repo": "fenix",
119
+
"type": "github"
120
+
}
121
+
},
100
122
"flake-compat": {
101
123
"flake": false,
102
124
"locked": {
···
645
667
"inputs": {
646
668
"bingus": "bingus",
647
669
"catppuccin": "catppuccin",
670
+
"fenix": "fenix",
648
671
"flakelight": "flakelight_2",
649
672
"gh-grader-preview": "gh-grader-preview",
650
673
"hm": "hm",
···
655
678
"nixpkgs": "nixpkgs",
656
679
"nixvim": "nixvim",
657
680
"nu_plugin_dbus": "nu_plugin_dbus",
658
-
"rust-overlay": "rust-overlay_2",
659
681
"spoon": "spoon",
660
682
"wayland-mpris-idle-inhibit": "wayland-mpris-idle-inhibit"
661
683
}
662
684
},
663
-
"rust-overlay": {
664
-
"inputs": {
665
-
"nixpkgs": [
666
-
"lanzaboote",
667
-
"nixpkgs"
668
-
]
669
-
},
685
+
"rust-analyzer-src": {
686
+
"flake": false,
670
687
"locked": {
671
-
"lastModified": 1754189623,
672
-
"narHash": "sha256-fstu5eb30UYwsxow0aQqkzxNxGn80UZjyehQVNVHuBk=",
673
-
"owner": "oxalica",
674
-
"repo": "rust-overlay",
675
-
"rev": "c582ff7f0d8a7ea689ae836dfb1773f1814f472a",
688
+
"lastModified": 1759245522,
689
+
"narHash": "sha256-H4Hx/EuMJ9qi1WzPV4UG2bbZiDCdREtrtDvYcHr0kmk=",
690
+
"owner": "rust-lang",
691
+
"repo": "rust-analyzer",
692
+
"rev": "a6bc4a4bbe6a65b71cbf76a0cf528c47a8d9f97f",
676
693
"type": "github"
677
694
},
678
695
"original": {
679
-
"owner": "oxalica",
680
-
"repo": "rust-overlay",
696
+
"owner": "rust-lang",
697
+
"ref": "nightly",
698
+
"repo": "rust-analyzer",
681
699
"type": "github"
682
700
}
683
701
},
684
-
"rust-overlay_2": {
702
+
"rust-overlay": {
685
703
"inputs": {
686
704
"nixpkgs": [
705
+
"lanzaboote",
687
706
"nixpkgs"
688
707
]
689
708
},
690
709
"locked": {
691
-
"lastModified": 1759544920,
692
-
"narHash": "sha256-yQwP0JOHi3Icq09GG5ufGuGrq2zIijglVFj3kkF2MHA=",
710
+
"lastModified": 1754189623,
711
+
"narHash": "sha256-fstu5eb30UYwsxow0aQqkzxNxGn80UZjyehQVNVHuBk=",
693
712
"owner": "oxalica",
694
713
"repo": "rust-overlay",
695
-
"rev": "bd3a63bbff2c4cb3cd48e9d49f54c2ccad457f70",
714
+
"rev": "c582ff7f0d8a7ea689ae836dfb1773f1814f472a",
696
715
"type": "github"
697
716
},
698
717
"original": {
+3
-3
flake.nix
+3
-3
flake.nix
···
14
14
lanzaboote.inputs.nixpkgs.follows = "nixpkgs";
15
15
wayland-mpris-idle-inhibit.url = "github:Bwc9876/wayland-mpris-idle-inhibit";
16
16
wayland-mpris-idle-inhibit.inputs.nixpkgs.follows = "nixpkgs";
17
-
rust-overlay.url = "github:oxalica/rust-overlay";
18
-
rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
17
+
fenix.url = "github:nix-community/fenix/monthly";
18
+
fenix.inputs.nixpkgs.follows = "nixpkgs";
19
19
catppuccin.url = "github:catppuccin/nix";
20
20
catppuccin.inputs.nixpkgs.follows = "nixpkgs";
21
21
nixvim.url = "github:nix-community/nixvim";
···
46
46
nixos-hardware,
47
47
lanzaboote,
48
48
wayland-mpris-idle-inhibit,
49
-
rust-overlay,
49
+
fenix,
50
50
catppuccin,
51
51
nixvim,
52
52
imperm,
+1
-1
nixosModules/dev+graphics/misc.nix
+1
-1
nixosModules/dev+graphics/misc.nix
+5
-1
nixosModules/dev/nvim.nix
+5
-1
nixosModules/dev/nvim.nix
···
890
890
nushell.enable = true;
891
891
taplo.enable = true;
892
892
typos_lsp.enable = true;
893
-
rust_analyzer.enable = true;
893
+
rust_analyzer = {
894
+
enable = true;
895
+
package = pkgs.rust-analyzer-nightly;
896
+
packageFallback = true;
897
+
};
894
898
lemminx.enable = true;
895
899
eslint.enable = true;
896
900
tinymist.enable = true;
+9
-5
nixosModules/dev/rust.nix
+9
-5
nixosModules/dev/rust.nix
···
4
4
...
5
5
}: {
6
6
nixpkgs.overlays = [
7
-
inputs.rust-overlay.overlays.default
7
+
inputs.fenix.overlays.default
8
8
];
9
9
10
10
environment.systemPackages = with pkgs; [
11
-
(rust-bin.selectLatestNightlyWith (toolchain:
12
-
toolchain.default.override {
13
-
targets = ["wasm32-unknown-unknown"];
14
-
}))
11
+
(pkgs.fenix.complete.withComponents [
12
+
"cargo"
13
+
"clippy"
14
+
"rust-src"
15
+
"rustc"
16
+
"rustfmt"
17
+
])
18
+
rust-analyzer-nightly
15
19
cargo-tauri
16
20
mprocs
17
21
evcxr