From 1ab061fb908514446c9ad5a30dbcb614c9796d9c Mon Sep 17 00:00:00 2001 From: Aner Zakobar Date: Sat, 27 Dec 2025 00:21:10 +0200 Subject: [PATCH] Major fixes --- README.org | 1 + azos-core | 2 +- flake.lock | 48 +++++++++++++++----------------- flake.nix | 5 ++-- home-manager/home.nix | 2 +- modules/home-manager/default.nix | 1 + modules/home-manager/gimp.nix | 21 ++++++++++++++ modules/home-manager/git.nix | 13 ++++++--- shells/defaultShell.nix | 5 ++-- 9 files changed, 61 insertions(+), 37 deletions(-) create mode 100755 modules/home-manager/gimp.nix diff --git a/README.org b/README.org index 887cdfa..4009685 100755 --- a/README.org +++ b/README.org @@ -103,3 +103,4 @@ nix develop .#shells.x86_64-linux.debugTexShell ** Things to work out *** Notebook tempaltes +https://github.com/NixOS/nix/issues/12281 diff --git a/azos-core b/azos-core index 676669c..e34f6bb 160000 --- a/azos-core +++ b/azos-core @@ -1 +1 @@ -Subproject commit 676669c000c447e7637dfab7267cef04d8591493 +Subproject commit e34f6bb4d3cc37d13a0d1c671b184e87fd23ab43 diff --git a/flake.lock b/flake.lock index a26bb19..8a5a570 100644 --- a/flake.lock +++ b/flake.lock @@ -5,18 +5,14 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1766061171, - "narHash": "sha256-CMppHWhnBnqQE19njs3kj2gn1QeMScynH3h2peUHdm8=", - "ref": "refs/heads/master", - "rev": "924abbc77643efcb323e1d22e40db620fdd96567", - "revCount": 87, - "type": "git", - "url": "file:./azos-core" + "path": "./azos-core", + "type": "path" }, "original": { - "type": "git", - "url": "file:./azos-core" - } + "path": "./azos-core", + "type": "path" + }, + "parent": [] }, "home-manager": { "inputs": { @@ -25,16 +21,16 @@ ] }, "locked": { - "lastModified": 1763992789, - "narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=", + "lastModified": 1766553861, + "narHash": "sha256-ZbnG01yA3O8Yr1vUm3+NQ2qk9iRhS5bloAnuXHHy7+c=", "owner": "nix-community", "repo": "home-manager", - "rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3", + "rev": "0999ed8f965bbbd991437ad9c5ed3434cecbc30e", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } @@ -59,11 +55,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1764440730, - "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", + "lastModified": 1766568855, + "narHash": "sha256-UXVtN77D7pzKmzOotFTStgZBqpOcf8cO95FcupWp4Zo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", + "rev": "c5db9569ac9cc70929c268ac461f4003e3e5ca80", "type": "github" }, "original": { @@ -75,11 +71,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1765934234, - "narHash": "sha256-pJjWUzNnjbIAMIc5gRFUuKCDQ9S1cuh3b2hKgA7Mc4A=", + "lastModified": 1766747458, + "narHash": "sha256-m63jjuo/ygo8ztkCziYh5OOIbTSXUDkKbqw3Vuqu4a4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "af84f9d270d404c17699522fab95bbf928a2d92f", + "rev": "c633f572eded8c4f3c75b8010129854ed404a6ce", "type": "github" }, "original": { @@ -89,11 +85,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1765779637, - "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", + "lastModified": 1766651565, + "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", + "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", "type": "github" }, "original": { @@ -121,11 +117,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1765838191, - "narHash": "sha256-m5KWt1nOm76ILk/JSCxBM4MfK3rYY7Wq9/TZIIeGnT8=", + "lastModified": 1766736597, + "narHash": "sha256-BASnpCLodmgiVn0M1MU2Pqyoz0aHwar/0qLkp7CjvSQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c6f52ebd45e5925c188d1a20119978aa4ffd5ef6", + "rev": "f560ccec6b1116b22e6ed15f4c510997d99d5852", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index cb176e8..f120632 100755 --- a/flake.nix +++ b/flake.nix @@ -2,6 +2,7 @@ description = "Aner's NIX config for his systems!"; inputs = { + self.submodules = true; # Nixpkgs #Temporarily nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; @@ -12,7 +13,7 @@ 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"; }; @@ -22,7 +23,7 @@ musnix = {url = "github:musnix/musnix";}; azos-core = { - url = "git+file:./azos-core"; + url = "./azos-core"; flake = true; }; }; diff --git a/home-manager/home.nix b/home-manager/home.nix index 19c2c36..654def3 100755 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -32,5 +32,5 @@ systemd.user.startServices = "sd-switch"; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "25.05"; + home.stateVersion = "25.11"; } diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index 390c49a..d7a6300 100755 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -15,5 +15,6 @@ ./headphones-whmx4000.nix ./deluge.nix ./lauretta-emacs.nix + ./gimp.nix ]; } diff --git a/modules/home-manager/gimp.nix b/modules/home-manager/gimp.nix new file mode 100755 index 0000000..498a118 --- /dev/null +++ b/modules/home-manager/gimp.nix @@ -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 + ]; + }; +} diff --git a/modules/home-manager/git.nix b/modules/home-manager/git.nix index 6b3a690..481b116 100755 --- a/modules/home-manager/git.nix +++ b/modules/home-manager/git.nix @@ -18,17 +18,22 @@ in { programs.git = { enable = true; - userName = "Aner Zakobar"; - userEmail = "aner@zakobar.com"; signing = { key = "6D17E295C70E2674"; signByDefault = true; }; - extraConfig = { - credential.helper = "!pass-git-helper $@"; + settings = { + extraConfig = { + credential.helper = "!pass-git-helper $@"; + }; + user = { + name = "Aner Zakobar"; + email = "aner@zakobar.com"; + }; }; + }; home.file.".config/pass-git-helper/git-pass-mapping.ini".source = ./pass-git-mapping.ini; diff --git a/shells/defaultShell.nix b/shells/defaultShell.nix index ea9a780..f3a9862 100644 --- a/shells/defaultShell.nix +++ b/shells/defaultShell.nix @@ -3,11 +3,10 @@ buildInputs = with pkgs; [ ( pkgs.writeShellScriptBin "azos-lauretta-update" - "sudo nixos-rebuild switch --flake '.?submodules=1#lauretta'" ) + "sudo nixos-rebuild switch --flake .#lauretta" ) ( pkgs.writeShellScriptBin "azos-update-azos-core" - "nix flake lock --update-input azos-core" ) - + "nix flake update azos-core" ) ( pkgs.writeShellScriptBin "azos-update" "nix flake update" )