Skip to content

Commit

Permalink
πŸŽ‰ Nix Flakes
Browse files Browse the repository at this point in the history
* πŸŽ‰ Nix Flakes Initial

* πŸ”₯ Removed old configs

* ✨ Nix Flakes Home-manager Builds!

* ✨ Add 'pineapple' host!

* πŸ’ Initial 'cherry' host NixOS config

* πŸ’š Initial flake testing

* πŸ’š Flake testing

* πŸ’š Add exec permission

* πŸ’š Ahhhhh why

* πŸ’š Add experimental feature flag

* πŸ’š Fix hash

* πŸ’š Fix hash again

* πŸ’š Fix hash again again

* πŸ’š Build with dry-run

* Updated dconf

* Made some pineapple changes

* πŸ“Œ Update flake.lock

* πŸ“Œ Upgrade to 24.05 (Uakari)
  • Loading branch information
Snuggle authored Sep 1, 2024
1 parent 717219b commit 0ab9bee
Show file tree
Hide file tree
Showing 31 changed files with 891 additions and 900 deletions.
46 changes: 46 additions & 0 deletions .github/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
#!/usr/bin/env bash
# Originally from https://github.com/gvolpe/nix-config

set +x

build_ci_system() {
export NIX_BUILD_VERSION=22.11
echo "$1"
if [[ $1 == "cherry" ]]; then
build_cherry_system
elif [[ $1 == "pineapple" ]]; then
build_pineapple_system
else
echo "Unknown option!"
fi
}

build_cherry_system() {
echo "πŸ”¨ Building cherry"
echo $NIX_PATH
sudo nix-channel --add https://nixos.org/channels/nixos-unstable nixos
sudo nix-channel --add https://github.com/nix-community/home-manager/archive/master.tar.gz home-manager
sudo nix-channel --update

echo "πŸ§ͺ Testing system configuration…"
#NIX_PATH=/home/$USER/.nix-defexpr/channels:nixpkgs=channel:nixos-unstable nix-build '<nixpkgs/nixos>' \
# -I nixos-config=configuration.nix \
# -A system --dry-run
nix build --dry-run --experimental-features 'nix-command flakes' '.#nixosConfigurations.cherry.config.system.build.toplevel'
}

build_pineapple_system() {
echo "πŸ”¨ Building pineapple"
echo $NIX_PATH
sudo nix-channel --add https://nixos.org/channels/nixos-unstable nixos
sudo nix-channel --add https://github.com/nix-community/home-manager/archive/master.tar.gz home-manager
sudo nix-channel --update

echo "πŸ§ͺ Testing system configuration…"
#NIX_PATH=/home/$USER/.nix-defexpr/channels:nixpkgs=channel:nixos-unstable nix-build '<nixpkgs/nixos>' \
# -I nixos-config=configuration.nix \
# -A system --dry-run
nix build --dry-run --experimental-features 'nix-command flakes' '.#nixosConfigurations.pineapple.config.system.build.toplevel'
}

build_ci_system $@
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: NixOS (unstable)
name: "Host: 'πŸ’ cherry'"

on:
pull_request:
Expand Down Expand Up @@ -33,4 +33,4 @@ jobs:
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"

- name: "Build NixOS config ❄️"
run: ./setup/build.sh nixos-unstable
run: chmod +x ./.github/build.sh && ./.github/build.sh cherry
36 changes: 0 additions & 36 deletions .github/workflows/nix-darwin-stable.yml

This file was deleted.

36 changes: 0 additions & 36 deletions .github/workflows/nix-darwin-unstable.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: NixOS
name: "Host: '🍍 pineapple'"

on:
pull_request:
Expand All @@ -23,7 +23,7 @@ jobs:
- name: "Install Nix ❄️"
uses: cachix/install-nix-action@v20
with:
nix_path: nixpkgs=channel:nixos-24.05
nix_path: nixpkgs=channel:nixos-unstable
extra_nix_config: "experimental-features = nix-command"

- name: "Install Cachix ❄️"
Expand All @@ -33,4 +33,4 @@ jobs:
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"

- name: "Build NixOS config ❄️"
run: ./setup/build.sh nixos-stable
run: chmod +x ./.github/build.sh && ./.github/build.sh pineapple
13 changes: 9 additions & 4 deletions config/dconf/dconf.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ with lib.hm.gvariant;
{
dconf.settings = {

"org/gnome/desktop/input-sources" = {
sources = [ (mkTuple [ "xkb" "us" ]) ];
xkb-options = [ "ctrl:swap_lwin_lctl" "ctrl:swap_rwin_rctl" "compose:caps" "caps:none" ];
};
#"org/gnome/desktop/input-sources" = {
# sources = [ (mkTuple [ "xkb" "us" ]) ];
# xkb-options = [ "ctrl:swap_lwin_lctl" "ctrl:swap_rwin_rctl" "compose:caps" "caps:none" ];
#};

"org/gnome/desktop/interface" = {
cursor-theme = "Breeze_Snow";
Expand Down Expand Up @@ -59,6 +59,11 @@ with lib.hm.gvariant;
automatic-timezone = true;
};

"org/gnome/desktop/peripherals/touchpad" = {
tap-to-click = true;
disable-while-typing = false;
};

"org/gnome/desktop/peripherals/mouse" = {
accel-profile = "flat";
natural-scroll = true;
Expand Down
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 0ab9bee

Please sign in to comment.