aner/azos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Major fixes

Browse Source
This commit is contained in:
Aner Zakobar
2025-12-27 00:21:10 +02:00
parent a83db33c39
commit 1ab061fb90
9 changed files with 61 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.org
+1
View File
@@ -103,3 +103,4 @@ nix develop .#shells.x86_64-linux.debugTexShell
** Things to work out ** Things to work out
*** Notebook tempaltes *** Notebook tempaltes
https://github.com/NixOS/nix/issues/12281
azos-core
+1 -1
Submodule azos-core updated: 676669c000...e34f6bb4d3
flake.lock
Generated
+22 -26
View File
@@ -5,18 +5,14 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1766061171, "path": "./azos-core",
"narHash": "sha256-CMppHWhnBnqQE19njs3kj2gn1QeMScynH3h2peUHdm8=", "type": "path"
"ref": "refs/heads/master",
"rev": "924abbc77643efcb323e1d22e40db620fdd96567",
"revCount": 87,
"type": "git",
"url": "file:./azos-core"
}, },
"original": { "original": {
"type": "git", "path": "./azos-core",
"url": "file:./azos-core" "type": "path"
} },
"parent": []
}, },
"home-manager": { "home-manager": {
"inputs": { "inputs": {
@@ -25,16 +21,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1763992789, "lastModified": 1766553861,
"narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=", "narHash": "sha256-ZbnG01yA3O8Yr1vUm3+NQ2qk9iRhS5bloAnuXHHy7+c=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3", "rev": "0999ed8f965bbbd991437ad9c5ed3434cecbc30e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-25.05", "ref": "release-25.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@@ -59,11 +55,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1764440730, "lastModified": 1766568855,
"narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", "narHash": "sha256-UXVtN77D7pzKmzOotFTStgZBqpOcf8cO95FcupWp4Zo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", "rev": "c5db9569ac9cc70929c268ac461f4003e3e5ca80",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -75,11 +71,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1765934234, "lastModified": 1766747458,
"narHash": "sha256-pJjWUzNnjbIAMIc5gRFUuKCDQ9S1cuh3b2hKgA7Mc4A=", "narHash": "sha256-m63jjuo/ygo8ztkCziYh5OOIbTSXUDkKbqw3Vuqu4a4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "af84f9d270d404c17699522fab95bbf928a2d92f", "rev": "c633f572eded8c4f3c75b8010129854ed404a6ce",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -89,11 +85,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1765779637, "lastModified": 1766651565,
"narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -121,11 +117,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1765838191, "lastModified": 1766736597,
"narHash": "sha256-m5KWt1nOm76ILk/JSCxBM4MfK3rYY7Wq9/TZIIeGnT8=", "narHash": "sha256-BASnpCLodmgiVn0M1MU2Pqyoz0aHwar/0qLkp7CjvSQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c6f52ebd45e5925c188d1a20119978aa4ffd5ef6", "rev": "f560ccec6b1116b22e6ed15f4c510997d99d5852",
"type": "github" "type": "github"
}, },
"original": { "original": {
flake.nix
+3 -2
View File
@@ -2,6 +2,7 @@
description = "Aner's NIX config for his systems!"; description = "Aner's NIX config for his systems!";
inputs = { inputs = {
self.submodules = true;
# Nixpkgs # Nixpkgs
#Temporarily #Temporarily
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
@@ -12,7 +13,7 @@
home-manager = { home-manager = {
# Follow corresponding `release` branch from Home Manager # Follow corresponding `release` branch from Home Manager
url = "github:nix-community/home-manager/release-25.05"; url = "github:nix-community/home-manager/release-25.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@@ -22,7 +23,7 @@
musnix = {url = "github:musnix/musnix";}; musnix = {url = "github:musnix/musnix";};
azos-core = { azos-core = {
url = "git+file:./azos-core"; url = "./azos-core";
flake = true; flake = true;
}; };
}; };
home-manager/home.nix
+1 -1
View File
@@ -32,5 +32,5 @@
systemd.user.startServices = "sd-switch"; systemd.user.startServices = "sd-switch";
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
home.stateVersion = "25.05"; home.stateVersion = "25.11";
} }
modules/home-manager/default.nix
+1
View File
@@ -15,5 +15,6 @@
./headphones-whmx4000.nix ./headphones-whmx4000.nix
./deluge.nix ./deluge.nix
./lauretta-emacs.nix ./lauretta-emacs.nix
./gimp.nix
]; ];
} }
modules/home-manager/gimp.nix
Executable
+21
View File
@@ -0,0 +1,21 @@
{
lib,
config,
pkgs,
...
}: let
isEnabled =
config.azos.gimp.enable;
in {
options.azos.gimp.enable = lib.mkOption {
default = true;
example = true;
type = lib.types.bool;
};
config = lib.mkIf isEnabled {
home.packages = with pkgs; [
gimp3
];
};
}
modules/home-manager/git.nix
+7 -2
View File
@@ -18,17 +18,22 @@ in {
programs.git = { programs.git = {
enable = true; enable = true;
userName = "Aner Zakobar";
userEmail = "aner@zakobar.com";
signing = { signing = {
key = "6D17E295C70E2674"; key = "6D17E295C70E2674";
signByDefault = true; signByDefault = true;
}; };
settings = {
extraConfig = { extraConfig = {
credential.helper = "!pass-git-helper $@"; credential.helper = "!pass-git-helper $@";
}; };
user = {
name = "Aner Zakobar";
email = "aner@zakobar.com";
};
};
}; };
home.file.".config/pass-git-helper/git-pass-mapping.ini".source = home.file.".config/pass-git-helper/git-pass-mapping.ini".source =
./pass-git-mapping.ini; ./pass-git-mapping.ini;
shells/defaultShell.nix
+2 -3
View File
@@ -3,11 +3,10 @@
buildInputs = with pkgs; [ buildInputs = with pkgs; [
( pkgs.writeShellScriptBin ( pkgs.writeShellScriptBin
"azos-lauretta-update" "azos-lauretta-update"
"sudo nixos-rebuild switch --flake '.?submodules=1#lauretta'" ) "sudo nixos-rebuild switch --flake .#lauretta" )
( pkgs.writeShellScriptBin ( pkgs.writeShellScriptBin
"azos-update-azos-core" "azos-update-azos-core"
"nix flake lock --update-input azos-core" ) "nix flake update azos-core" )
( pkgs.writeShellScriptBin ( pkgs.writeShellScriptBin
"azos-update" "azos-update"
"nix flake update" ) "nix flake update" )