Merge pull request 'Remove nix-dram as default nix binary' (#114) from fix/set-nix-dram-default into main

Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/114
Reviewed-by: Benjamin Bädorf <hello@benjaminbaedorf.eu>
This commit is contained in:
teutat3s 2022-08-14 14:24:54 +00:00
commit b149ae0136
7 changed files with 30 additions and 60 deletions

View file

@ -314,21 +314,6 @@
} }
}, },
"flake-utils_4": { "flake-utils_4": {
"locked": {
"lastModified": 1656928814,
"narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_5": {
"locked": { "locked": {
"lastModified": 1649676176, "lastModified": 1649676176,
"narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
@ -416,27 +401,6 @@
"type": "github" "type": "github"
} }
}, },
"nix-dram": {
"inputs": {
"flake-utils": "flake-utils_4",
"nixpkgs": [
"latest"
]
},
"locked": {
"lastModified": 1660180791,
"narHash": "sha256-oPO+keK4S9daL9ubU51hZ+QOWVSMbZ56F20iFI9Px3s=",
"owner": "dramforever",
"repo": "nix-dram",
"rev": "ae7f0b7c5d39eec5941fe21e9f202106bdea9ac2",
"type": "github"
},
"original": {
"owner": "dramforever",
"repo": "nix-dram",
"type": "github"
}
},
"nixlib": { "nixlib": {
"locked": { "locked": {
"lastModified": 1636849918, "lastModified": 1636849918,
@ -489,11 +453,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1660291411, "lastModified": 1660407119,
"narHash": "sha256-9UfJMJeCl+T/DrOJMd1vLCoV8U3V7f9Qrv/QyH0Nn28=", "narHash": "sha256-04lWO0pDbhAXFdL4v2VzzwgxrZ5IefKn+TmZPiPeKxg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "78f56d8ec2c67a1f80f2de649ca9aadc284f65b6", "rev": "12620020f76b1b5d2b0e6fbbda831ed4f5fe56e1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -565,7 +529,7 @@
"nvfetcher": { "nvfetcher": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_4",
"nixpkgs": [ "nixpkgs": [
"nixos" "nixos"
] ]
@ -621,7 +585,6 @@
"home": "home", "home": "home",
"latest": "latest_2", "latest": "latest_2",
"naersk": "naersk", "naersk": "naersk",
"nix-dram": "nix-dram",
"nixos": "nixos", "nixos": "nixos",
"nixos-generators": "nixos-generators", "nixos-generators": "nixos-generators",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",

View file

@ -42,10 +42,6 @@
nixos-hardware.url = "github:nixos/nixos-hardware"; nixos-hardware.url = "github:nixos/nixos-hardware";
nixos-generators.url = "github:nix-community/nixos-generators"; nixos-generators.url = "github:nix-community/nixos-generators";
# PubSolarOS additions
nix-dram.url = "github:dramforever/nix-dram";
nix-dram.inputs.nixpkgs.follows = "latest";
}; };
outputs = outputs =
@ -59,7 +55,6 @@
, agenix , agenix
, nvfetcher , nvfetcher
, deploy , deploy
, nix-dram
, ... , ...
} @ inputs: } @ inputs:
digga.lib.mkFlake digga.lib.mkFlake
@ -75,11 +70,7 @@
channels = { channels = {
nixos = { nixos = {
imports = [ (digga.lib.importOverlays ./overlays) ]; imports = [ (digga.lib.importOverlays ./overlays) ];
overlays = [ overlays = [ ];
nur.overlay
agenix.overlay
./pkgs/default.nix
];
}; };
latest = { }; latest = { };
}; };
@ -93,6 +84,10 @@
our = self.lib; our = self.lib;
}); });
}) })
nur.overlay
agenix.overlay
(import ./pkgs)
]; ];
nixos = { nixos = {
@ -122,7 +117,7 @@
suites = with profiles; rec { suites = with profiles; rec {
base = [ users.pub-solar users.root ]; base = [ users.pub-solar users.root ];
iso = base ++ [ base-user graphical pub-solar-iso ]; iso = base ++ [ base-user graphical pub-solar-iso ];
pubsolaros = [ dram full-install base-user users.root ]; pubsolaros = [ full-install base-user users.root ];
anonymous = [ pubsolaros users.pub-solar ]; anonymous = [ pubsolaros users.pub-solar ];
}; };
}; };

View file

@ -18,8 +18,6 @@
keep-outputs = true keep-outputs = true
keep-derivations = true keep-derivations = true
fallback = true fallback = true
# used by nix-dram
default-flake = flake:nixpkgs
''; '';
}; };
} }

View file

@ -13,6 +13,7 @@ channels: final: prev: {
signal-desktop signal-desktop
starship starship
deploy-rs deploy-rs
nix
tdesktop tdesktop
arduino arduino

18
overlays/rnix-lsp.nix Normal file
View file

@ -0,0 +1,18 @@
final: prev: {
rnix-lsp = prev.rnix-lsp.overrideAttrs (oldAttrs: rec {
version = "unstable-2022-07-28";
src = prev.fetchFromGitHub {
owner = "nix-community";
repo = "rnix-lsp";
rev = "ff18e04551a39ccdab0ff9c83926db3807b23478";
sha256 = "sha256-4OIpATLdPQvryyhRQPELeqNYC0n6PCyjD6LCPdwOztc=";
};
cargoDeps = oldAttrs.cargoDeps.overrideAttrs (prev.lib.const {
name = "rnix-lsp-vendor.tar.gz";
inherit src;
outputHash = "sha256-SroynaHaFpvKlMSEagoGQhZcY7A0tE4xTbUXYFcneo8=";
});
});
}

View file

@ -1,5 +0,0 @@
{ self, config, lib, pkgs, inputs, ... }:
{
nix.package = inputs.nix-dram.packages.${pkgs.system}.nix-dram;
}

View file

@ -34,7 +34,7 @@ in
''); '');
commands = with pkgs; [ commands = with pkgs; [
(devos nixUnstable) (devos nix)
(devos agenix) (devos agenix)
{ {
category = "devos"; category = "devos";