update sync script to work better

This commit is contained in:
zoe 2022-10-26 10:17:50 +02:00
parent 8854202938
commit bbc467d880
7 changed files with 646 additions and 640 deletions

3
.gitignore vendored
View File

@ -1,4 +1,5 @@
hardware-configuration.nix hardware-configuration.nix
backup backup
/penrose/target /penrose/target
/penrose/cargo.lock /penrose/Cargo.lock
/penrose/result

View File

@ -1,6 +1,12 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
nixpkgs.overlays = [
(self: super: {
penrose = super.callPackage /etc/nixos/penrose { };
})
];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# nix tools # nix tools
## formatter for .nix files ## formatter for .nix files

File diff suppressed because it is too large Load Diff

View File

@ -16,13 +16,13 @@ let
pango-sys = attrs: { pango-sys = attrs: {
buildInputs = [ buildInputs = [
pkg-config pkg-config
pango pango
]; ];
}; };
pangocairo-sys = attrs: { pangocairo-sys = attrs: {
buildInputs = [ buildInputs = [
pkg-config pkg-config
gnome2.pango.dev gnome2.pango.dev
]; ];
}; };

View File

@ -1 +1 @@
/nix/store/q9ziy7c3vkxhiz5d7q3ac27ssbiaxm9k-rust_nixos-0.1.0 /nix/store/fa1f8d3lygg8cgpxajxv8jg1ga8fympn-rust_nixos-0.1.0

3
readme.md Normal file
View File

@ -0,0 +1,3 @@
# install
copy this to .config/nixos
run sync.sh

View File

@ -6,12 +6,16 @@ git pull
# format everything to look nice # format everything to look nice
nixpkgs-fmt *.nix nixpkgs-fmt *.nix
nixpkgs-fmt ./nvim/*.nix nixpkgs-fmt ./nvim/*.nix
nixpkgs-fmt ./penrose/*.nix
# make a backup just in case # make a backup just in case
cp -r /etc/nixos/ ./backup cp -r /etc/nixos/ ./backup
# copy over all the files to /etc/nixos/ # copy over all the files to /etc/nixos/
sudo cp -r ./configuration.nix ./nvim/ ./packages.nix ./home.nix /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 # update and build my new config
sudo nixos-rebuild switch --upgrade sudo nixos-rebuild switch --upgrade