olaf/nixos-config_to_rule_them_all
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

25.05->25.11

Browse Source
This commit is contained in:
Olaf Kolkman
2025-12-01 21:39:20 +01:00
parent 5cf2d8397d
commit 635d6cdeca
5 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
flake.nix
View File

@@ -2,7 +2,7 @@
description = "Starter Configuration with secrets (removed) for MacOS and NixOS"; description = "Starter Configuration with secrets (removed) for MacOS and NixOS";
inputs = { inputs = {
nixpkgs = { nixpkgs = {
url = "github:nixos/nixpkgs//nixpkgs-25.05-darwin"; url = "github:nixos/nixpkgs//nixpkgs-25.11-darwin";
}; };
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
@@ -11,7 +11,7 @@
url = "github:nix-community/nixd"; url = "github:nix-community/nixd";
}; };
darwin = { darwin = {
url = "github:nix-darwin/nix-darwin/nix-darwin-25.05"; url = "github:nix-darwin/nix-darwin/nix-darwin-25.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-homebrew = { nix-homebrew = {

2
hosts/nixos/default.nix
View File

@@ -330,7 +330,7 @@ in
jetbrains-mono jetbrains-mono
font-awesome font-awesome
noto-fonts noto-fonts
noto-fonts-emoji noto-fonts-color-emoji
]; ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

9
modules/darwin/casks.nix
View File

@@ -49,29 +49,22 @@ _:
# Productivity Tools # Productivity Tools
"1Password" "1Password"
#"zotero"
"gpg-suite" "gpg-suite"
#"home-assistant"
#"Fantastical"
#"Remarkable"
"mailmate" "mailmate"
"spamsieve" "spamsieve"
"macdown" "macdown"
"calibre" "calibre"
# "superslicer" # Removed in favor of OrcaSlicer
"orcaslicer" "orcaslicer"
"element" "element"
# "mqtt-explorer"
"virtualbox" "virtualbox"
# "autodesk-fusion" #fails to install
"qmk-toolbox" "qmk-toolbox"
"dbeaver-community" "dbeaver-community"
"sqlitestudio" "sqlitestudio"
# "wireshark"
# Browsers # Browsers
"google-chrome" "google-chrome"
"firefox" "firefox"
"tor-browser"
] ]

9
modules/shared/home-manager.nix
View File

@@ -88,12 +88,11 @@ in
git = { git = {
enable = true; enable = true;
ignores = [ "*.swp" ]; ignores = [ "*.swp" ];
userName = name;
userEmail = email;
lfs = { lfs = {
enable = true; enable = true;
}; };
extraConfig = { settings = {
init.defaultBranch = "main"; init.defaultBranch = "main";
core = { core = {
editor = "vim"; editor = "vim";
@@ -102,6 +101,10 @@ in
commit.gpgsign = false; commit.gpgsign = false;
pull.rebase = true; pull.rebase = true;
rebase.autoStash = true; rebase.autoStash = true;
user = {
name = name;
email = email;
};
}; };
}; };

7
modules/shared/packages.nix
View File

@@ -63,16 +63,15 @@ with pkgs;
font-awesome font-awesome
hack-font hack-font
noto-fonts noto-fonts
noto-fonts-emoji noto-fonts-color-emoji
meslo-lgs-nf meslo-lgs-nf
# Node.js development tools # Node.js development tools
nodePackages.npm # globally install npm nodePackages.npm # globally install npm
nodePackages.prettier nodePackages.prettier
nodejs
# Text and terminal utilities # Text and terminal utilities
xquartz
xterm xterm
htop htop
@@ -153,6 +152,7 @@ pidgin
rubyPackages_3_4.kramdown-rfc2629 rubyPackages_3_4.kramdown-rfc2629
zotero zotero
tex-fmt
(texlive.combine { (texlive.combine {
inherit (texlive) inherit (texlive)
@@ -176,6 +176,7 @@ pidgin
footmisc footmisc
geometry geometry
ifmtarg ifmtarg
latexmk
lipsum lipsum
lualatex-math lualatex-math
makecell makecell