update sync script to work better
This commit is contained in:
parent
8854202938
commit
bbc467d880
|
|
@ -1,4 +1,5 @@
|
|||
hardware-configuration.nix
|
||||
backup
|
||||
/penrose/target
|
||||
/penrose/cargo.lock
|
||||
/penrose/Cargo.lock
|
||||
/penrose/result
|
||||
|
|
|
|||
|
|
@ -1,6 +1,12 @@
|
|||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
nixpkgs.overlays = [
|
||||
(self: super: {
|
||||
penrose = super.callPackage /etc/nixos/penrose { };
|
||||
})
|
||||
];
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
# nix tools
|
||||
## formatter for .nix files
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
|
||||
# This file was @generated by crate2nix 0.10.0 with the command:
|
||||
# "generate" "-f" "Cargo.toml"
|
||||
# See https://github.com/kolloch/crate2nix for more info.
|
||||
|
||||
{ nixpkgs ? <nixpkgs>
|
||||
, pkgs ? import nixpkgs { config = {}; }
|
||||
, pkgs ? import nixpkgs { config = { }; }
|
||||
, lib ? pkgs.lib
|
||||
, stdenv ? pkgs.stdenv
|
||||
, buildRustCrateForPkgs ? if buildRustCrate != null
|
||||
|
|
@ -19,14 +18,13 @@
|
|||
# If true, throw errors instead of issueing deprecation warnings.
|
||||
, strictDeprecation ? false
|
||||
# Used for conditional compilation based on CPU feature detection.
|
||||
, targetFeatures ? []
|
||||
, targetFeatures ? [ ]
|
||||
# Whether to perform release builds: longer compile times, faster binaries.
|
||||
, release ? true
|
||||
# Additional crate2nix configuration if it exists.
|
||||
, crateConfig
|
||||
? if builtins.pathExists ./crate-config.nix
|
||||
then pkgs.callPackage ./crate-config.nix {}
|
||||
else {}
|
||||
, crateConfig ? if builtins.pathExists ./crate-config.nix
|
||||
then pkgs.callPackage ./crate-config.nix { }
|
||||
else { }
|
||||
}:
|
||||
|
||||
rec {
|
||||
|
|
@ -234,7 +232,7 @@ rec {
|
|||
crateName = "cc";
|
||||
version = "1.0.73";
|
||||
edition = "2018";
|
||||
crateBin = [];
|
||||
crateBin = [ ];
|
||||
sha256 = "04ccylrjq94jssh8f7d7hxv64gs9f1m1jrsxb7wqgfxk4xljmzrg";
|
||||
authors = [
|
||||
"Alex Crichton <alex@alexcrichton.com>"
|
||||
|
|
@ -710,7 +708,7 @@ rec {
|
|||
{
|
||||
name = "cc";
|
||||
packageId = "cc";
|
||||
target = {target, features}: (target."os" == "dragonfly");
|
||||
target = { target, features }: (target."os" == "dragonfly");
|
||||
}
|
||||
];
|
||||
|
||||
|
|
@ -923,8 +921,7 @@ rec {
|
|||
packageId = "system-deps";
|
||||
}
|
||||
];
|
||||
features = {
|
||||
};
|
||||
features = { };
|
||||
};
|
||||
"penrose" = rec {
|
||||
crateName = "penrose";
|
||||
|
|
@ -1341,8 +1338,7 @@ rec {
|
|||
features = [ "parsing" "extra-traits" ];
|
||||
}
|
||||
];
|
||||
features = {
|
||||
};
|
||||
features = { };
|
||||
};
|
||||
"strum_macros 0.20.1" = rec {
|
||||
crateName = "strum_macros";
|
||||
|
|
@ -1372,8 +1368,7 @@ rec {
|
|||
features = [ "parsing" "extra-traits" ];
|
||||
}
|
||||
];
|
||||
features = {
|
||||
};
|
||||
features = { };
|
||||
};
|
||||
"syn" = rec {
|
||||
crateName = "syn";
|
||||
|
|
@ -1590,8 +1585,7 @@ rec {
|
|||
features = [ "full" "parsing" "printing" "visit" "visit-mut" "clone-impls" "extra-traits" "proc-macro" ];
|
||||
}
|
||||
];
|
||||
features = {
|
||||
};
|
||||
features = { };
|
||||
};
|
||||
"tracing-core" = rec {
|
||||
crateName = "tracing-core";
|
||||
|
|
@ -1635,8 +1629,7 @@ rec {
|
|||
"kwantam <kwantam@gmail.com>"
|
||||
"Manish Goregaokar <manishsmail@gmail.com>"
|
||||
];
|
||||
features = {
|
||||
};
|
||||
features = { };
|
||||
};
|
||||
"version-compare" = rec {
|
||||
crateName = "version-compare";
|
||||
|
|
@ -1646,8 +1639,7 @@ rec {
|
|||
authors = [
|
||||
"timvisee <timvisee@gmail.com>"
|
||||
];
|
||||
features = {
|
||||
};
|
||||
features = { };
|
||||
resolvedDefaultFeatures = [ "default" ];
|
||||
};
|
||||
"version_check" = rec {
|
||||
|
|
@ -1702,8 +1694,8 @@ rec {
|
|||
};
|
||||
|
||||
#
|
||||
# crate2nix/default.nix (excerpt start)
|
||||
#
|
||||
# crate2nix/default.nix (excerpt start)
|
||||
#
|
||||
|
||||
/* Target (platform) data for conditional dependencies.
|
||||
This corresponds roughly to what buildRustCrate is setting.
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
/nix/store/q9ziy7c3vkxhiz5d7q3ac27ssbiaxm9k-rust_nixos-0.1.0
|
||||
/nix/store/fa1f8d3lygg8cgpxajxv8jg1ga8fympn-rust_nixos-0.1.0
|
||||
4
sync.sh
4
sync.sh
|
|
@ -6,12 +6,16 @@ git pull
|
|||
# format everything to look nice
|
||||
nixpkgs-fmt *.nix
|
||||
nixpkgs-fmt ./nvim/*.nix
|
||||
nixpkgs-fmt ./penrose/*.nix
|
||||
|
||||
# make a backup just in case
|
||||
cp -r /etc/nixos/ ./backup
|
||||
|
||||
# copy over all the files to /etc/nixos/
|
||||
sudo cp -r ./configuration.nix ./nvim/ ./packages.nix ./home.nix /etc/nixos/
|
||||
## copy penrose stuff
|
||||
sudo mkdir /etc/nixos/penrose
|
||||
sudo cp -r ./penrose/Cargo.nix ./penrose/src ./penrose/default.nix ./penrose/rust-toolchain /etc/nixos/penrose
|
||||
|
||||
# update and build my new config
|
||||
sudo nixos-rebuild switch --upgrade
|
||||
|
|
|
|||
Loading…
Reference in New Issue