1

Compare commits

..

5 Commits

5 changed files with 102 additions and 5 deletions

BIN
Darwin.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 MiB

View File

@ -3,6 +3,7 @@
Modular NixOS configuration, using [Niri](https://github.com/niri-wm/niri) and [Waybar](https://github.com/Alexays/Waybar) for a light desktop. Modular NixOS configuration, using [Niri](https://github.com/niri-wm/niri) and [Waybar](https://github.com/Alexays/Waybar) for a light desktop.
![](FastFetch.png) ![](FastFetch.png)
![](Darwin.png)
To install, run `nixos-rebuild` with the `--flake` parameter from the `NixFlake` directory: `nixos-rebuild switch --flake .#nixinator`. To install, run `nixos-rebuild` with the `--flake` parameter from the `NixFlake` directory: `nixos-rebuild switch --flake .#nixinator`.
Alternatively, use `nh os switch` or `nh os boot`. Alternatively, use `nh os switch` or `nh os boot`.

View File

@ -55,6 +55,13 @@
homeDirectory = "/Users/${config.home.username}"; homeDirectory = "/Users/${config.home.username}";
enableNixpkgsReleaseCheck = true; enableNixpkgsReleaseCheck = true;
sessionVariables = {
LANG = "en_US.UTF-8";
EDITOR = "nvim";
MANPAGER = "nvim +Man!";
TERMINAL = "kitty";
};
packages = with pkgs; [ packages = with pkgs; [
(ripgrep.override {withPCRE2 = true;}) (ripgrep.override {withPCRE2 = true;})
gdu gdu

View File

@ -45,6 +45,18 @@ in {
programs.fish = lib.mkMerge [ programs.fish = lib.mkMerge [
# Darwin exclusive config # Darwin exclusive config
(lib.mkIf pkgs.stdenv.isDarwin { (lib.mkIf pkgs.stdenv.isDarwin {
shellInit = ''
set fish_greeting
yes | fish_config theme save "system-theme"
set --global --export HOMEBREW_PREFIX "/opt/homebrew"
set --global --export HOMEBREW_CELLAR "/opt/homebrew/Cellar"
set --global --export HOMEBREW_REPOSITORY "/opt/homebrew"
fish_add_path --global --move --path "/opt/homebrew/bin" "/opt/homebrew/sbin"
if test -n "$MANPATH[1]"; set --global --export MANPATH ''' $MANPATH; end;
if not contains "/opt/homebrew/share/info" $INFOPATH; set --global --export INFOPATH "/opt/homebrew/share/info" $INFOPATH; end;
'';
shellAbbrs = let shellAbbrs = let
# These can be used for my config.homemodules and for HM config.programs, # These can be used for my config.homemodules and for HM config.programs,
# as both of these add the package to home.packages # as both of these add the package to home.packages
@ -66,6 +78,11 @@ in {
(lib.mkIf pkgs.stdenv.isLinux { (lib.mkIf pkgs.stdenv.isLinux {
generateCompletions = nixosConfig.programs.fish.generateCompletions; generateCompletions = nixosConfig.programs.fish.generateCompletions;
shellInit = ''
set fish_greeting
yes | fish_config theme save "system-theme"
'';
functions = lib.mergeAttrsList [ functions = lib.mergeAttrsList [
(lib.optionalAttrs config.homemodules.nnn.enable { (lib.optionalAttrs config.homemodules.nnn.enable {
nnncd = { nnncd = {
@ -228,11 +245,6 @@ in {
]; ];
plugins = []; plugins = [];
shellInit = ''
set fish_greeting
yes | fish_config theme save "system-theme"
'';
} }
]; ];

View File

@ -7,9 +7,12 @@
config, config,
inputs, inputs,
publicKeys, publicKeys,
hostname,
... ...
}: { }: {
nix = { nix = {
enable = true;
package = pkgs.nixVersions.stable; package = pkgs.nixVersions.stable;
extraOptions = '' extraOptions = ''
experimental-features = nix-command flakes pipe-operators experimental-features = nix-command flakes pipe-operators
@ -30,6 +33,67 @@
]; ];
}; };
networking = {
hostName = "${hostname}";
localHostName = "${hostname}";
computerName = "${hostname}";
applicationFirewall = {
enable = true;
enableStealthMode = false;
allowSigned = true;
allowSignedApp = true;
blockAllIncoming = false;
};
knownNetworkServices = [
"Wi-Fi"
"Thunderbold Bridge"
];
dns = [
"192.168.86.26"
"8.8.8.8"
"8.8.4.4"
];
# wg-quick = {};
};
power = {
# restartAfterFreeze = false;
# restartAfterPowerFailure = false;
sleep = {
computer = 10; # 10 minutes until sleep
display = 5;
harddisk = 5;
};
};
system = {
primaryUser = "${username}";
# TODO:
defaults = {
# dock = {};
trackpad = {
ActuateDetents = true; # Haptic feedback
ActuationStrength = 1;
Clicking = true; # Tap to click
Dragging = true; # Double tap to drag
TrackpadRightClick = true;
};
};
keyboard = {
enableKeyMapping = true;
swapLeftCtrlAndFn = true;
swapLeftCommandAndLeftAlt = true;
};
};
users.users.${username} = { users.users.${username} = {
isHidden = false; isHidden = false;
description = "Christoph"; description = "Christoph";
@ -46,6 +110,8 @@
# packages = with pkgs; []; # packages = with pkgs; [];
}; };
environment.shells = with pkgs; [pkgs.fish];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
alejandra alejandra
neovim neovim
@ -61,6 +127,17 @@
fish.enable = true; fish.enable = true;
}; };
services = {
# aerospace = {};
};
# NOTE: Not installed automatically
homebrew = {
enable = true;
enableFishIntegration = true;
# brews = [];
};
# Set Git commit hash for darwin-version. # Set Git commit hash for darwin-version.
# system.configurationRevision = self.rev or self.dirtyRev or null; # system.configurationRevision = self.rev or self.dirtyRev or null;