pin vscode rustanalyzer
This commit is contained in:
parent
f386acd94d
commit
95310bbcee
3 changed files with 198 additions and 183 deletions
17
flake.lock
17
flake.lock
|
|
@ -366,6 +366,22 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-rust-analyzer": {
|
||||
"locked": {
|
||||
"lastModified": 1675198550,
|
||||
"narHash": "sha256-LWUqaWNDvHvfsruLk27u8uMo0lT4w7Gzl/zFOIr27HE=",
|
||||
"owner": "cyplo",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "85b5540187b50ef99a14a39a5437fd0abb9f3e4b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "cyplo",
|
||||
"ref": "85b5540187b50ef99a14a39a5437fd0abb9f3e4b",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1674407282,
|
||||
|
|
@ -410,6 +426,7 @@
|
|||
"nixos-hardware": "nixos-hardware",
|
||||
"nixpkgs-master": "nixpkgs-master",
|
||||
"nixpkgs-nixos-unstable": "nixpkgs-nixos-unstable",
|
||||
"nixpkgs-rust-analyzer": "nixpkgs-rust-analyzer",
|
||||
"nixpkgs-stable": "nixpkgs-stable",
|
||||
"nur": "nur",
|
||||
"sops": "sops"
|
||||
|
|
|
|||
360
flake.nix
360
flake.nix
|
|
@ -1,204 +1,195 @@
|
|||
{
|
||||
description = "NixOS configuration with flakes";
|
||||
outputs = {
|
||||
self,
|
||||
flake-utils,
|
||||
flake-compat,
|
||||
home-manager,
|
||||
nixpkgs-nixos-unstable,
|
||||
nixpkgs-master,
|
||||
nixpkgs-stable,
|
||||
darwin,
|
||||
nixos-hardware,
|
||||
nur,
|
||||
sops,
|
||||
nil,
|
||||
helix,
|
||||
alejandra,
|
||||
} @ inputs: let
|
||||
mkServer = pkgs: system: hostname:
|
||||
pkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
modules = [
|
||||
(./. + "/nixos/boxes/${hostname}")
|
||||
(import ./nixos/server-common.nix)
|
||||
sops.nixosModules.sops
|
||||
];
|
||||
specialArgs = {inherit inputs system;};
|
||||
};
|
||||
mkRaspi = pkgs: hostname:
|
||||
pkgs.lib.nixosSystem {
|
||||
system = "aarch64-linux";
|
||||
modules = [(./. + "/nixos/boxes/${hostname}")];
|
||||
specialArgs = {inherit inputs;};
|
||||
};
|
||||
mkKiosk = pkgs: system: hostname:
|
||||
pkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
modules = [
|
||||
(./. + "/nixos/boxes/${hostname}")
|
||||
(import ./nixos/common.nix)
|
||||
sops.nixosModules.sops
|
||||
outputs = { self, flake-utils, flake-compat, home-manager
|
||||
, nixpkgs-nixos-unstable, nixpkgs-master, nixpkgs-stable, darwin
|
||||
, nixos-hardware, nur, sops, nil, helix, alejandra, nixpkgs-rust-analyzer
|
||||
}@inputs:
|
||||
let
|
||||
mkServer = pkgs: system: hostname:
|
||||
pkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
modules = [
|
||||
(./. + "/nixos/boxes/${hostname}")
|
||||
(import ./nixos/server-common.nix)
|
||||
sops.nixosModules.sops
|
||||
];
|
||||
specialArgs = { inherit inputs system; };
|
||||
};
|
||||
mkRaspi = pkgs: hostname:
|
||||
pkgs.lib.nixosSystem {
|
||||
system = "aarch64-linux";
|
||||
modules = [ (./. + "/nixos/boxes/${hostname}") ];
|
||||
specialArgs = { inherit inputs; };
|
||||
};
|
||||
mkKiosk = pkgs: system: hostname:
|
||||
pkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
modules = [
|
||||
(./. + "/nixos/boxes/${hostname}")
|
||||
(import ./nixos/common.nix)
|
||||
sops.nixosModules.sops
|
||||
|
||||
home-manager.nixosModules.home-manager
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.users.cyryl = {
|
||||
imports = [./nixos/home-manager ./nixos/home-manager/linux.nix];
|
||||
_module.args.inputs = inputs;
|
||||
_module.args.system = system;
|
||||
home-manager.nixosModules.home-manager
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.users.cyryl = {
|
||||
imports =
|
||||
[ ./nixos/home-manager ./nixos/home-manager/linux.nix ];
|
||||
_module.args.inputs = inputs;
|
||||
_module.args.system = system;
|
||||
};
|
||||
}
|
||||
];
|
||||
specialArgs = {
|
||||
inherit inputs system;
|
||||
nixpkgs-nixos-stable-and-unfree = import nixpkgs-stable {
|
||||
inherit system;
|
||||
config = { allowUnfree = true; };
|
||||
};
|
||||
nixpkgs-nixos-unstable-and-unfree = import nixpkgs-nixos-unstable {
|
||||
inherit system;
|
||||
config = { allowUnfree = true; };
|
||||
};
|
||||
}
|
||||
];
|
||||
specialArgs = {
|
||||
inherit inputs system;
|
||||
nixpkgs-nixos-stable-and-unfree = import nixpkgs-stable {
|
||||
inherit system;
|
||||
config = {allowUnfree = true;};
|
||||
};
|
||||
nixpkgs-nixos-unstable-and-unfree = import nixpkgs-nixos-unstable {
|
||||
inherit system;
|
||||
config = {allowUnfree = true;};
|
||||
};
|
||||
};
|
||||
};
|
||||
mkWorkstation = pkgs: system: hostname:
|
||||
pkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
modules = [
|
||||
(./. + "/nixos/boxes/${hostname}")
|
||||
(import ./nixos/email-accounts.nix)
|
||||
(import ./nixos/common.nix)
|
||||
sops.nixosModules.sops
|
||||
mkWorkstation = pkgs: system: hostname:
|
||||
pkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
modules = [
|
||||
(./. + "/nixos/boxes/${hostname}")
|
||||
(import ./nixos/email-accounts.nix)
|
||||
(import ./nixos/common.nix)
|
||||
sops.nixosModules.sops
|
||||
|
||||
home-manager.nixosModules.home-manager
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.users.cyryl = {
|
||||
imports = [./nixos/home-manager ./nixos/home-manager/linux.nix];
|
||||
_module.args.inputs = inputs;
|
||||
_module.args.system = system;
|
||||
home-manager.nixosModules.home-manager
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.users.cyryl = {
|
||||
imports =
|
||||
[ ./nixos/home-manager ./nixos/home-manager/linux.nix ];
|
||||
_module.args.inputs = inputs;
|
||||
_module.args.system = system;
|
||||
};
|
||||
}
|
||||
];
|
||||
specialArgs = {
|
||||
inherit inputs system;
|
||||
nixpkgs-nixos-stable-and-unfree = import nixpkgs-stable {
|
||||
inherit system;
|
||||
config = { allowUnfree = true; };
|
||||
};
|
||||
nixpkgs-nixos-unstable-and-unfree = import nixpkgs-nixos-unstable {
|
||||
inherit system;
|
||||
config = { allowUnfree = true; };
|
||||
};
|
||||
}
|
||||
];
|
||||
specialArgs = {
|
||||
inherit inputs system;
|
||||
nixpkgs-nixos-stable-and-unfree = import nixpkgs-stable {
|
||||
inherit system;
|
||||
config = {allowUnfree = true;};
|
||||
};
|
||||
nixpkgs-nixos-unstable-and-unfree = import nixpkgs-nixos-unstable {
|
||||
inherit system;
|
||||
config = {allowUnfree = true;};
|
||||
};
|
||||
};
|
||||
mkShell = packageSet: system:
|
||||
let pkgs = packageSet.legacyPackages.${system};
|
||||
in pkgs.mkShell {
|
||||
packages = with pkgs; [
|
||||
cacert
|
||||
git
|
||||
git-lfs
|
||||
nixpkgs-fmt
|
||||
openssh
|
||||
openssl
|
||||
pkg-config
|
||||
statix
|
||||
];
|
||||
};
|
||||
in {
|
||||
devShells = {
|
||||
"x86_64-darwin".default = mkShell nixpkgs-stable "x86_64-darwin";
|
||||
"x86_64-linux".default = mkShell nixpkgs-stable "x86_64-linux";
|
||||
};
|
||||
mkShell = packageSet: system: let
|
||||
pkgs = packageSet.legacyPackages.${system};
|
||||
in
|
||||
pkgs.mkShell {
|
||||
packages = with pkgs; [
|
||||
cacert
|
||||
git
|
||||
git-lfs
|
||||
nixpkgs-fmt
|
||||
openssh
|
||||
openssl
|
||||
pkg-config
|
||||
statix
|
||||
];
|
||||
};
|
||||
in {
|
||||
devShells = {
|
||||
"x86_64-darwin".default = mkShell nixpkgs-stable "x86_64-darwin";
|
||||
"x86_64-linux".default = mkShell nixpkgs-stable "x86_64-linux";
|
||||
};
|
||||
darwinConfigurations = {
|
||||
"FORM3-CYRYLPLOTN" = darwin.lib.darwinSystem rec {
|
||||
system = "x86_64-darwin";
|
||||
modules = [
|
||||
(./. + "/nixos/boxes/form3")
|
||||
home-manager.darwinModules.home-manager
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.users.cyryl = {
|
||||
imports = [./nixos/home-manager];
|
||||
_module.args.inputs = inputs;
|
||||
_module.args.system = system;
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
nixosConfigurations = {
|
||||
foureighty = mkWorkstation nixpkgs-stable "x86_64-linux" "foureighty";
|
||||
skinnyv = mkWorkstation nixpkgs-stable "x86_64-linux" "skinnyv";
|
||||
thinky = mkWorkstation nixpkgs-stable "x86_64-linux" "thinky";
|
||||
bolty = mkServer nixpkgs-stable "x86_64-linux" "bolty";
|
||||
vpsfree1 = mkServer nixpkgs-stable "x86_64-linux" "vpsfree1";
|
||||
yoga = mkKiosk nixpkgs-stable "x86_64-linux" "yoga";
|
||||
homescreen = mkRaspi nixpkgs-stable "homescreen";
|
||||
|
||||
bootstrap = nixpkgs-stable.lib.nixosSystem rec {
|
||||
system = "x86_64-linux";
|
||||
modules = [(./. + "/nixos/boxes/bootstrap") sops.nixosModules.sops];
|
||||
specialArgs = {
|
||||
inherit inputs system;
|
||||
nixpkgs-nixos-unstable-and-unfree = import nixpkgs-nixos-unstable {
|
||||
inherit system;
|
||||
config = {allowUnfree = true;};
|
||||
};
|
||||
darwinConfigurations = {
|
||||
"FORM3-CYRYLPLOTN" = darwin.lib.darwinSystem rec {
|
||||
system = "x86_64-darwin";
|
||||
modules = [
|
||||
(./. + "/nixos/boxes/form3")
|
||||
home-manager.darwinModules.home-manager
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.users.cyryl = {
|
||||
imports = [ ./nixos/home-manager ];
|
||||
_module.args.inputs = inputs;
|
||||
_module.args.system = system;
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
# nix build .#nixosConfigurations.raspiimage.config.system.build.sdImage
|
||||
# sudo dd if=result/sd-image/nixos-sd-image-21.11.20211201.a640d83-aarch64-linux.img of=/dev/sda bs=4M conv=fsync status=progress
|
||||
# make sure to update eeprom https://nixos.wiki/wiki/NixOS_on_ARM/Raspberry_Pi_4#Board-specific_installation_notes
|
||||
raspiimage = nixpkgs-stable.lib.nixosSystem {
|
||||
system = "aarch64-linux";
|
||||
modules = [
|
||||
(import
|
||||
"${inputs.nixpkgs-nixos-unstable}/nixos/modules/installer/sd-card/sd-image-aarch64-installer.nix")
|
||||
{
|
||||
environment.systemPackages = with nixpkgs-nixos-unstable.legacyPackages."aarch64-linux"; [
|
||||
neovim
|
||||
htop
|
||||
btop
|
||||
atop
|
||||
];
|
||||
|
||||
networking.networkmanager.enable = false;
|
||||
hardware.enableRedistributableFirmware = true;
|
||||
networking.wireless.enable = true;
|
||||
nixosConfigurations = {
|
||||
foureighty = mkWorkstation nixpkgs-stable "x86_64-linux" "foureighty";
|
||||
skinnyv = mkWorkstation nixpkgs-stable "x86_64-linux" "skinnyv";
|
||||
thinky = mkWorkstation nixpkgs-stable "x86_64-linux" "thinky";
|
||||
bolty = mkServer nixpkgs-stable "x86_64-linux" "bolty";
|
||||
vpsfree1 = mkServer nixpkgs-stable "x86_64-linux" "vpsfree1";
|
||||
yoga = mkKiosk nixpkgs-stable "x86_64-linux" "yoga";
|
||||
homescreen = mkRaspi nixpkgs-stable "homescreen";
|
||||
|
||||
services.openssh = {
|
||||
enable = true;
|
||||
permitRootLogin =
|
||||
nixpkgs-stable.lib.mkForce "prohibit-password";
|
||||
passwordAuthentication = false;
|
||||
bootstrap = nixpkgs-stable.lib.nixosSystem rec {
|
||||
system = "x86_64-linux";
|
||||
modules = [ (./. + "/nixos/boxes/bootstrap") sops.nixosModules.sops ];
|
||||
specialArgs = {
|
||||
inherit inputs system;
|
||||
nixpkgs-nixos-unstable-and-unfree = import nixpkgs-nixos-unstable {
|
||||
inherit system;
|
||||
config = { allowUnfree = true; };
|
||||
};
|
||||
};
|
||||
};
|
||||
# nix build .#nixosConfigurations.raspiimage.config.system.build.sdImage
|
||||
# sudo dd if=result/sd-image/nixos-sd-image-21.11.20211201.a640d83-aarch64-linux.img of=/dev/sda bs=4M conv=fsync status=progress
|
||||
# make sure to update eeprom https://nixos.wiki/wiki/NixOS_on_ARM/Raspberry_Pi_4#Board-specific_installation_notes
|
||||
raspiimage = nixpkgs-stable.lib.nixosSystem {
|
||||
system = "aarch64-linux";
|
||||
modules = [
|
||||
(import
|
||||
"${inputs.nixpkgs-nixos-unstable}/nixos/modules/installer/sd-card/sd-image-aarch64-installer.nix")
|
||||
{
|
||||
environment.systemPackages =
|
||||
with nixpkgs-nixos-unstable.legacyPackages."aarch64-linux"; [
|
||||
neovim
|
||||
htop
|
||||
btop
|
||||
atop
|
||||
];
|
||||
|
||||
services.xserver = {
|
||||
enable = true;
|
||||
displayManager.lightdm.enable = true;
|
||||
desktopManager.gnome.enable = true;
|
||||
libinput.enable = true;
|
||||
};
|
||||
networking.networkmanager.enable = false;
|
||||
hardware.enableRedistributableFirmware = true;
|
||||
networking.wireless.enable = true;
|
||||
|
||||
users.extraUsers.root.openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEo4R+6J3h6Ix3xWpOMdU7Es1/YxFchHw0c+kcCOJxFb cyryl@foureighty"
|
||||
];
|
||||
sdImage.compressImage = false;
|
||||
console.earlySetup = true;
|
||||
}
|
||||
];
|
||||
specialArgs = {inherit inputs;};
|
||||
services.openssh = {
|
||||
enable = true;
|
||||
permitRootLogin =
|
||||
nixpkgs-stable.lib.mkForce "prohibit-password";
|
||||
passwordAuthentication = false;
|
||||
};
|
||||
|
||||
services.xserver = {
|
||||
enable = true;
|
||||
displayManager.lightdm.enable = true;
|
||||
desktopManager.gnome.enable = true;
|
||||
libinput.enable = true;
|
||||
};
|
||||
|
||||
users.extraUsers.root.openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEo4R+6J3h6Ix3xWpOMdU7Es1/YxFchHw0c+kcCOJxFb cyryl@foureighty"
|
||||
];
|
||||
sdImage.compressImage = false;
|
||||
console.earlySetup = true;
|
||||
}
|
||||
];
|
||||
specialArgs = { inherit inputs; };
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
inputs = {
|
||||
nixpkgs-master = {
|
||||
type = "github";
|
||||
|
|
@ -221,6 +212,13 @@
|
|||
ref = "nixos-22.11";
|
||||
};
|
||||
|
||||
nixpkgs-rust-analyzer = {
|
||||
type = "github";
|
||||
owner = "cyplo";
|
||||
repo = "nixpkgs";
|
||||
ref = "85b5540187b50ef99a14a39a5437fd0abb9f3e4b";
|
||||
};
|
||||
|
||||
nixos-hardware = {
|
||||
type = "github";
|
||||
owner = "NixOS";
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ config, pkgs, ... }: {
|
||||
{ config, pkgs, inputs, ... }: {
|
||||
home.packages = with pkgs;
|
||||
[
|
||||
(vscode-with-extensions.override {
|
||||
vscodeExtensions = with vscode-extensions;
|
||||
[
|
||||
ms-python.python
|
||||
rust-lang.rust-analyzer
|
||||
inputs.nixpkgs-rust-analyzer.legacyPackages.x86_64-linux.vscode-extensions.rust-lang.rust-analyzer
|
||||
(vscode-utils.buildVscodeExtension {
|
||||
vscodeExtUniqueId = "vadimcn.vscode-lldb";
|
||||
name = "vadimcn.vscode-lldb-1.6.10";
|
||||
|
|
|
|||
Loading…
Reference in a new issue