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

fixes for darwin for latest flake update

Browse Source
This commit is contained in:
rogueking
2026-01-26 09:38:46 -08:00
parent 9f48316c21
commit 64322ed50f
6 changed files with 39 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
flake.lock generated
View File

@@ -40,11 +40,11 @@
]
},
"locked": {
"lastModified": 1765835352,
"narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
"lastModified": 1768135262,
"narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "a34fae9c08a15ad73f295041fec82323541400a9",
"rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac",
"type": "github"
},
"original": {
@@ -60,11 +60,11 @@
]
},
"locked": {
"lastModified": 1767780135,
"narHash": "sha256-5SbmsLMgxzPd9YMbFR4IHfOXv6bjWs+dfl6IbSq3r7s=",
"lastModified": 1768949235,
"narHash": "sha256-TtjKgXyg1lMfh374w5uxutd6Vx2P/hU81aEhTxrO2cg=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "c08430923ed417abc653884328a39e98496cfd0f",
"rev": "75ed713570ca17427119e7e204ab3590cc3bf2a5",
"type": "github"
},
"original": {
@@ -81,11 +81,11 @@
]
},
"locked": {
"lastModified": 1767738364,
"narHash": "sha256-rmAerMcKMYusVs5B88RAKAYUiENrO+d4bjvpQkkaaks=",
"lastModified": 1769442288,
"narHash": "sha256-p+Xqr+P22TYW2RqbwccSd4UlUDEwl7PnoW3qiH8wVoE=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "4e8b7bef66c60735982369f3151b93e62fe37da7",
"rev": "384786dc70c4992643f916c7e57f378714fec4f1",
"type": "github"
},
"original": {
@@ -101,11 +101,11 @@
]
},
"locked": {
"lastModified": 1767718503,
"narHash": "sha256-V+VkFs0aSG0ca8p/N3gib7FAf4cq9jyr5Gm+ZBrHQpo=",
"lastModified": 1768764703,
"narHash": "sha256-5ulSDyOG1U+1sJhkJHYsUOWEsmtLl97O0NTVMvgIVyc=",
"owner": "nix-darwin",
"repo": "nix-darwin",
"rev": "9f48ffaca1f44b3e590976b4da8666a9e86e6eb1",
"rev": "0fc4e7ac670a0ed874abacf73c4b072a6a58064b",
"type": "github"
},
"original": {
@@ -137,11 +137,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1767185284,
"narHash": "sha256-ljDBUDpD1Cg5n3mJI81Hz5qeZAwCGxon4kQW3Ho3+6Q=",
"lastModified": 1769302137,
"narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "40b1a28dce561bea34858287fbb23052c3ee63fe",
"rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8",
"type": "github"
},
"original": {
@@ -183,11 +183,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1767640445,
"narHash": "sha256-UWYqmD7JFBEDBHWYcqE6s6c77pWdcU/i+bwD6XxMb8A=",
"lastModified": 1769170682,
"narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "9f0c42f8bc7151b8e7e5840fb3bd454ad850d8c5",
"rev": "c5296fdd05cfa2c187990dd909864da9658df755",
"type": "github"
},
"original": {
@@ -199,11 +199,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1767634882,
"narHash": "sha256-2GffSfQxe3sedHzK+sTKlYo/NTIAGzbFCIsNMUPAAnk=",
"lastModified": 1769318308,
"narHash": "sha256-Mjx6p96Pkefks3+aA+72lu1xVehb6mv2yTUUqmSet6Q=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "3c9db02515ef1d9b6b709fc60ba9a540957f661c",
"rev": "1cd347bf3355fce6c64ab37d3967b4a2cb4b878c",
"type": "github"
},
"original": {
@@ -222,11 +222,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1767608728,
"narHash": "sha256-kmSJCTgrx+BxgqQOTPHAOkohvO+lbRsPWqu+PSPcz3I=",
"lastModified": 1769418848,
"narHash": "sha256-jLSg9IkglcIw64kU1utXxsxXhiVdD45dkh9ZJKaFQ7U=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "851399eebd0fb383d2fd76269d859f16021dc7a8",
"rev": "c19a0517ddeed4c1548611e42e187048fc2e5dcf",
"type": "github"
},
"original": {

4
flake.nix
View File

@@ -7,7 +7,7 @@
nix-darwin.url = "github:nix-darwin/nix-darwin/master";
nix-darwin.inputs.nixpkgs.follows = "nixpkgs-unstable";
nix-snapd.url = "github:nix-community/nix-snapd";
nix-snapd.inputs.pkgs-unstable.follows = "nixpkgs";
#nix-snapd.inputs.pkgs-unstable.follows = "nixpkgs";
home-manager = {
url = "github:nix-community/home-manager/release-25.11";
@@ -26,7 +26,7 @@
nixos-hardware = {
url = "github:NixOS/nixos-hardware/master";
inputs.nixpkgs.follows = "nixpkgs";
#inputs.nixpkgs.follows = "nixpkgs";
};
};

14
home-manager/commands/commands.nix
View File

@@ -10,11 +10,11 @@
{
imports = [
./direnv.nix
./custom/custom.nix
# ./custom/custom.nix
./eza.nix
./fastfetch/fastfetch.nix
./git.nix
./newsboat.nix
# ./newsboat.nix
./nixvim/default.nix
./starship.nix
./tmux.nix
@@ -29,11 +29,13 @@
agedu
b3sum
bat
basalt
btop
curl
dig
dust
fd
fosrl-olm
fzf
git-filter-repo
graphviz
@@ -41,6 +43,8 @@
kitty
lazygit
lazyjournal
manga-tui
# netscanner
nix-du
nmap
openssl
@@ -61,9 +65,9 @@
++ lib.optionals (!(hostTypes.isServer hostname)) (with pkgs; [
claude-code
ocamlPackages.utop
opencode
# opencode
openconnect
termusic
# termusic
yubikey-manager
])
# Server-specific packages
@@ -155,4 +159,6 @@
enableZshIntegration = true;
};
};
# fonts.fontconfig.enable = lib.mkIf (hostname != "eva-02") true;
}

2
home-manager/commands/nixvim/plugins/default.nix
View File

@@ -29,7 +29,7 @@
direnv.enable = true;
gitblame.enable = true;
gitsigns.enable = true;
# hardtime.enable = true;
# hardtime.enable = true;
intellitab.enable = true;
lastplace.enable = true;
lsp-format.enable = true;

1
hosts/eva-01/configuration.nix
View File

@@ -247,7 +247,6 @@
#apps
#cider-2
fprintd
guacamole-client
#sddm-astronaut
#cli tools

2
hosts/eva-02/configuration.nix
View File

@@ -9,6 +9,7 @@
inputs,
configPath,
hostname,
hostTypes,
lib,
...
}:
@@ -164,6 +165,7 @@
inputs
pkgs-unstable
hostname
hostTypes
;
};
users = {