Skip to content

Commit

Permalink
feat: Add helios and split configs
Browse files Browse the repository at this point in the history
  • Loading branch information
DoomHammer committed Dec 14, 2024
1 parent b3b4816 commit 15c6918
Show file tree
Hide file tree
Showing 14 changed files with 208 additions and 118 deletions.
36 changes: 18 additions & 18 deletions .config/nix/flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 9 additions & 3 deletions .config/nix/flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@
description = "My system configuration";

inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
nix-darwin = {
url = "github:LnL7/nix-darwin";
inputs.nixpkgs.follows = "nixpkgs";
};
lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz";
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1.tar.gz";
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager = {
url = "github:nix-community/home-manager/release-24.05";
url = "github:nix-community/home-manager/release-24.11";
inputs.nixpkgs.follows = "nixpkgs";
};
# Prebuilt package index - provides comma package
Expand Down Expand Up @@ -86,11 +86,17 @@
platform = "aarch64-darwin";
desktop = "aqua";
};
"doomhammer@helios" = helper.mkHome {
hostname = "helios";
platform = "aarch64-darwin";
desktop = "aqua";
};
};
#nix run nix-darwin -- switch --flake ~/.config/nix
#nix build .#darwinConfigurations.{hostname}.config.system.build.toplevel
darwinConfigurations = {
"Piotrs-MacBook-Air" = helper.mkDarwin { hostname = "Piotrs-MacBook-Air"; };
"helios" = helper.mkDarwin { hostname = "helios"; };
};
# Custom packages and modifications, exported as overlays
overlays = import ./parts/overlays { inherit inputs; };
Expand Down
8 changes: 5 additions & 3 deletions .config/nix/home-manager/_mixins/features/basics/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ in
"--header"
];
git = true;
icons = true;
icons = "auto";
};
fd.enable = true;
htop.enable = true;
Expand Down Expand Up @@ -80,6 +80,8 @@ in
enableZshIntegration = true;
};
};
xdg.configFile."htop/htoprc".source = config.lib.file.mkOutOfStoreSymlink "${dir}/htop-config/htoprc";
xdg.configFile."btop/themes/solarized_light.theme".source = config.lib.file.mkOutOfStoreSymlink "${dir}/btop-config/btop/themes/solarized_light.theme";
xdg.configFile."htop/htoprc".source =
config.lib.file.mkOutOfStoreSymlink "${dir}/htop-config/htoprc";
xdg.configFile."btop/themes/solarized_light.theme".source =
config.lib.file.mkOutOfStoreSymlink "${dir}/btop-config/btop/themes/solarized_light.theme";
}
8 changes: 7 additions & 1 deletion .config/nix/systems/darwin/Piotrs-MacBook-Air/default.nix
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
_: { }
{ }:
{
imports = [
../_mixins/desktop-minimal
../_mixins/desktop
];
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
_: { imports = [ ./web-browsers ]; }
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
_: {
homebrew = {
casks = [ "google-chrome" ];
};
}
34 changes: 34 additions & 0 deletions .config/nix/systems/darwin/_mixins/desktop-minimal/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{ pkgs, ... }:
{
imports = [
./apps
./features
];

environment.systemPackages = with pkgs; [ ];

homebrew = {
# taps = builtins.attrNames config.nix-homebrew.taps;
taps = [ "netbirdio/tap" ];
casks = [
"backblaze"
"beeper"
"font-chivo-mono"
"font-iosevka"
"font-iosevka-nerd-font"
"font-monofett"
"netbird-ui"
"notion-calendar"
"obsidian"
# Possible alternative: https://github.com/ther0n/UnnaturalScrollWheels
"scroll-reverser"
"signal"
"tailscale"
"the-unarchiver"
# See also: https://github.com/nix-community/nix-vscode-extensions/blob/master/flake.nix
"visual-studio-code"
"vlc"
"wezterm"
];
};
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
_: { imports = [ ./fonts ]; }
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{ pkgs, ... }:
{
fonts = {
packages = with pkgs; [
(nerdfonts.override {
fonts = [
"FiraCode"
"Inconsolata"
"Iosevka"
"IosevkaTerm"
"NerdFontsSymbolsOnly"
];
})
inconsolata
inconsolata-nerdfont
iosevka
font-awesome
noto-fonts-emoji
noto-fonts-monochrome-emoji
ubuntu_font_family
];
};
}
100 changes: 99 additions & 1 deletion .config/nix/systems/darwin/_mixins/desktop/apps/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,104 @@ _: {
imports = [
./obs-studio
./utilities
./web-browsers
];

environment = {
systemPackages = with pkgs; [
mas
alacritty
android-file-transfer
audacity
fritzing
gcc-arm-embedded-13
gimp
grandperspective
inkscape
kitty
openscad
pngpaste
prusa-slicer
jetbrains.pycharm-community
utm
];
};

homebrew = {
enable = true;
onActivation = {
autoUpdate = true;
# upgrade = true;
cleanup = "zap";
};

caskArgs.no_quarantine = true;

# taps = builtins.attrNames config.nix-homebrew.taps;
taps = [ "netbirdio/tap" ];
brews = [
"conan"
"conan@1"
];
casks = [
"ableton-live-standard"
"arduino-ide"
"autodesk-fusion"
"backblaze"
"backblaze-downloader"
"balenaetcher"
"beeper"
# TODO: Add Camtasia
"creality-print"
# TODO: Add Cricut
# TODO: Add DaVinci Resolve
"firefox"
"focusrite-control"
"font-chivo-mono"
"font-iosevka"
"font-iosevka-nerd-font"
"font-monofett"
"google-chrome"
# "logi-options-plus"
"logitech-unifying"
"kicad"
"microsoft-office"
"mqtt-explorer"
"mu-editor"
"musicbrainz-picard"
"netbird-ui"
"notion-calendar"
"obs"
"obsidian"
"plex"
"raspberry-pi-imager"
"sequential"
# Possible alternative: https://github.com/ther0n/UnnaturalScrollWheels
"scroll-reverser"
"signal"
"syncthing"
"squirreldisk"
"tailscale"
"the-unarchiver"
"thonny"
"unetbootin"
# See also: https://github.com/nix-community/nix-vscode-extensions/blob/master/flake.nix
"visual-studio-code"
"vlc"
"wezterm"
];
masApps = {
"Brother P-touch Editor" = 1453365242;
"Keynote" = 409183694;
"Linn Kazoo" = 848937349;
# TODO: Add Konfig somoehow
"Numbers" = 409203825;
"Pages" = 409201541;
"Xcode" = 497799835;
"Zeroconf Browser" = 1355001318;
};
};

services = {
tailscale.enable = true;
};
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
_: {
homebrew = {
casks = [ "google-chrome" ];
casks = [ "firefox" ];
};
}
4 changes: 1 addition & 3 deletions .config/nix/systems/darwin/_mixins/desktop/default.nix
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
{ pkgs, ... }:
{ ... }:
{
imports = [
./apps
./features
];

environment.systemPackages = with pkgs; [ ];
}
Loading

0 comments on commit 15c6918

Please sign in to comment.