Compare commits
No commits in common. "8b28196951b43c26f32e83390172bf0f632607c2" and "5e09533ca18c15d154679d5f2c42dd98c90ab4ee" have entirely different histories.
8b28196951
...
5e09533ca1
12
flake.lock
12
flake.lock
@ -343,11 +343,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1735745492,
|
"lastModified": 1735735907,
|
||||||
"narHash": "sha256-Vs2IkQx4uDv2YehZ1sCw9K+kuMrBa3opnkGJJhMPNPo=",
|
"narHash": "sha256-/AOGn9qJMjrZQyWYbObHTKmWDUP0q9+0TAXOJnq6ik0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "9a9fef316ad191b3086edda465e850af282de4e0",
|
"rev": "59a4c43e9ba6db24698c112720a58a334117de83",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -474,11 +474,11 @@
|
|||||||
"xdph": "xdph"
|
"xdph": "xdph"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1735748884,
|
"lastModified": 1735735636,
|
||||||
"narHash": "sha256-+0Fl1mesL6RJ9Z8jjQtRgdW6R0C4Ptmm89yZJCOyMgM=",
|
"narHash": "sha256-zSsYco2SV4zDvYDqADNEW2KFfty9maO993kRKBrigcg=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "Hyprland",
|
"repo": "Hyprland",
|
||||||
"rev": "7f177fa1cf3d8ede2841cdbbbdb7acaf27e40d57",
|
"rev": "aff34089c4d66b951d25a0dc1867f7fb93d61a7d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
34
flake.nix
34
flake.nix
@ -111,18 +111,7 @@
|
|||||||
allowUnfree = true;
|
allowUnfree = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# Systems that can run tests:
|
|
||||||
supportedSystems = ["aarch64-linux" "i686-linux" "x86_64-linux"];
|
|
||||||
|
|
||||||
# Function to generate a set based on supported systems:
|
|
||||||
forAllSystems = inputs.nixpkgs.lib.genAttrs supportedSystems;
|
|
||||||
|
|
||||||
# Attribute set of nixpkgs for each system:
|
|
||||||
nixpkgsFor =
|
|
||||||
forAllSystems (system: import inputs.nixpkgs {inherit system;});
|
|
||||||
in {
|
in {
|
||||||
# NixOS Configurations
|
|
||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
kogami = nixpkgs.lib.nixosSystem {
|
kogami = nixpkgs.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
@ -152,7 +141,6 @@
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
# Phone Configurations
|
|
||||||
nixOnDroidConfigurations = {
|
nixOnDroidConfigurations = {
|
||||||
tsunemori = inputs.nix-on-droid.lib.nixOnDroidConfiguration {
|
tsunemori = inputs.nix-on-droid.lib.nixOnDroidConfiguration {
|
||||||
pkgs = import inputs.nixpkgs-droid {system = "aarch64-linux";};
|
pkgs = import inputs.nixpkgs-droid {system = "aarch64-linux";};
|
||||||
@ -165,27 +153,5 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# Install script
|
|
||||||
packages = forAllSystems (system: let
|
|
||||||
pkgs = nixpkgsFor.${system};
|
|
||||||
in {
|
|
||||||
default = self.packages.${system}.install;
|
|
||||||
|
|
||||||
install = pkgs.writeShellApplication {
|
|
||||||
name = "install";
|
|
||||||
runtimeInputs = with pkgs; [git busybox gum ];
|
|
||||||
text = ''${./install.sh} "$@"'';
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
apps = forAllSystems (system: {
|
|
||||||
default = self.apps.${system}.install;
|
|
||||||
|
|
||||||
install = {
|
|
||||||
type = "app";
|
|
||||||
program = "${self.packages.${system}.install}/bin/install";
|
|
||||||
};
|
|
||||||
});
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -26,7 +26,7 @@
|
|||||||
boot.loader.systemd-boot.enable = true;
|
boot.loader.systemd-boot.enable = true;
|
||||||
sys = {
|
sys = {
|
||||||
audio.enable = true;
|
audio.enable = true;
|
||||||
#bootloader.systemd-boot.enable = true;
|
bootloader.systemd-boot.enable = true;
|
||||||
desktop = {
|
desktop = {
|
||||||
plasma.enable = false;
|
plasma.enable = false;
|
||||||
gnome.enable = true;
|
gnome.enable = true;
|
||||||
|
|||||||
24
install.sh
24
install.sh
@ -1,24 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
if [ $# -gt 0 ]; then
|
|
||||||
SCRIPT_DIR=$1
|
|
||||||
else
|
|
||||||
SCRIPT_DIR=~/.dotfiles
|
|
||||||
fi
|
|
||||||
|
|
||||||
nix-shell -p git --command "git clone https://git.foglar.tech/foglar/dotfiles.git $SCRIPT_DIR"
|
|
||||||
sudo nixos-generate-config --show-hardware-config >$SCRIPT_DIR/kogami/hardware-configuration.nix
|
|
||||||
sudo nixos-generate-config --show-hardware-config >$SCRIPT_DIR/ginoza/hardware-configuration.nix
|
|
||||||
|
|
||||||
sed -i "0,/shinya/s//$(whoami)/" $SCRIPT_DIR/flake.nix
|
|
||||||
|
|
||||||
if [ -z $EDITOR ]; then
|
|
||||||
EDITOR=nano
|
|
||||||
fi
|
|
||||||
$EDITOR $SCRIPT_DIR/flake.nix
|
|
||||||
|
|
||||||
profile=$(gum choose kogami ginoza)
|
|
||||||
sudo nixos-rebuild build --flake $SCRIPT_DIR#"${profile}" --update
|
|
||||||
|
|
||||||
gum confirm "Do you want to switch to the new configuration?" && sudo nixos-rebuild switch --flake $SCRIPT_DIR#"${profile}"
|
|
||||||
gum confirm "Do you want to reboot now?" && sudo reboot
|
|
||||||
Loading…
Reference in New Issue
Block a user