test
This commit is contained in:
+10
-10
@@ -8,6 +8,7 @@
|
|||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
# Shared Nix configuration
|
# Shared Nix configuration
|
||||||
|
# Note: On Darwin with Determinate Nix, set nix.enable = false in darwin/configuration.nix
|
||||||
nix = let
|
nix = let
|
||||||
flakeInputs = lib.filterAttrs (_: lib.isType "flake") inputs;
|
flakeInputs = lib.filterAttrs (_: lib.isType "flake") inputs;
|
||||||
in {
|
in {
|
||||||
@@ -25,18 +26,17 @@
|
|||||||
nix-path = config.nix.nixPath;
|
nix-path = config.nix.nixPath;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Deduplicate and optimize nix store
|
|
||||||
optimise.automatic = true;
|
|
||||||
|
|
||||||
# Garbage collection
|
|
||||||
gc = {
|
|
||||||
automatic = true;
|
|
||||||
options = "--delete-older-than 7d";
|
|
||||||
};
|
|
||||||
|
|
||||||
# Opinionated: make flake registry and nix path match flake inputs
|
# Opinionated: make flake registry and nix path match flake inputs
|
||||||
registry = lib.mapAttrs (_: flake: {inherit flake;}) flakeInputs;
|
registry = lib.mapAttrs (_: flake: {inherit flake;}) flakeInputs;
|
||||||
nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs;
|
nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs;
|
||||||
|
|
||||||
|
# Platform-specific: These require nix.enable = true (conflicts with Determinate Nix on Darwin)
|
||||||
|
# Only enable on Linux where we manage Nix ourselves
|
||||||
|
optimise.automatic = lib.mkIf pkgs.stdenv.isLinux true;
|
||||||
|
gc = lib.mkIf pkgs.stdenv.isLinux {
|
||||||
|
automatic = true;
|
||||||
|
options = "--delete-older-than 7d";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# Shared nixpkgs configuration
|
# Shared nixpkgs configuration
|
||||||
@@ -60,7 +60,7 @@
|
|||||||
# Shared environment packages
|
# Shared environment packages
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
vim
|
vim
|
||||||
git
|
# git is managed by home-manager (programs.git)
|
||||||
curl
|
curl
|
||||||
wget
|
wget
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -23,8 +23,9 @@
|
|||||||
# macOS-specific Nix settings (common.nix has the shared ones)
|
# macOS-specific Nix settings (common.nix has the shared ones)
|
||||||
# Any darwin-specific nix configuration can go here
|
# Any darwin-specific nix configuration can go here
|
||||||
|
|
||||||
# Necessary for using flakes on this system
|
# Using Determinate Nix - disable nix-darwin's Nix daemon management
|
||||||
nix.package = pkgs.nix;
|
# Determinate manages its own daemon and conflicts with nix-darwin
|
||||||
|
nix.enable = false;
|
||||||
|
|
||||||
# TODO: Set your hostname
|
# TODO: Set your hostname
|
||||||
networking.hostName = "m2n1";
|
networking.hostName = "m2n1";
|
||||||
|
|||||||
@@ -7,33 +7,8 @@
|
|||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
# Alacritty terminal emulator configuration
|
# Alacritty terminal emulator configuration
|
||||||
programs.alacritty = {
|
programs.kitty = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
|
||||||
window = {
|
|
||||||
padding = {
|
|
||||||
x = 10;
|
|
||||||
y = 10;
|
|
||||||
};
|
|
||||||
decorations = "full";
|
|
||||||
opacity = 0.95;
|
|
||||||
};
|
|
||||||
|
|
||||||
font = {
|
|
||||||
size = 13.0;
|
|
||||||
normal = {
|
|
||||||
family = "JetBrainsMono Nerd Font";
|
|
||||||
style = "Regular";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
colors = {
|
|
||||||
primary = {
|
|
||||||
background = "0x1e1e1e";
|
|
||||||
foreground = "0xd4d4d4";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ with pkgs; let
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
exec ${p}/bin/${a} $@
|
exec ${p}/bin/${a} $@
|
||||||
'';
|
'';
|
||||||
pythonPackages = pkgs.python311.withPackages (p:
|
pythonPackages = pkgs.python312.withPackages (p:
|
||||||
with p; [
|
with p; [
|
||||||
python-lsp-server
|
python-lsp-server
|
||||||
pyls-flake8
|
pyls-flake8
|
||||||
@@ -33,8 +33,7 @@ with pkgs; let
|
|||||||
]);
|
]);
|
||||||
in {
|
in {
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
gitAndTools.gitFull
|
# git is managed by programs.git in git.nix
|
||||||
neovim
|
|
||||||
vim
|
vim
|
||||||
ripgrep
|
ripgrep
|
||||||
openvpn
|
openvpn
|
||||||
|
|||||||
Reference in New Issue
Block a user