From 41343a05c03547fc3850ddf41267d1adad4f1cbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christopher=20M=C3=BChl?= Date: Wed, 24 Dec 2025 01:21:23 +0100 Subject: [PATCH] Enable git-global-log --- flake.lock | 149 ++++++++++-------- flake.nix | 2 + .../christopher@cobalt/config/git.nix | 11 +- .../christopher@cobalt/default.nix | 15 ++ .../christopher@cobalt/misc/browser.nix | 9 +- .../christopher@cobalt/misc/recording.nix | 4 +- systems/x86_64-linux/cobalt/default.nix | 2 +- 7 files changed, 117 insertions(+), 75 deletions(-) diff --git a/flake.lock b/flake.lock index 033a0a3..e5d0598 100644 --- a/flake.lock +++ b/flake.lock @@ -396,24 +396,6 @@ } }, "flake-parts_3": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" - }, - "locked": { - "lastModified": 1765835352, - "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "a34fae9c08a15ad73f295041fec82323541400a9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "nur", @@ -434,7 +416,7 @@ "type": "github" } }, - "flake-parts_5": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -475,7 +457,7 @@ }, "flake-utils-plus": { "inputs": { - "flake-utils": "flake-utils_2" + "flake-utils": "flake-utils_3" }, "locked": { "lastModified": 1715533576, @@ -496,6 +478,24 @@ "inputs": { "systems": "systems_3" }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "inputs": { + "systems": "systems_4" + }, "locked": { "lastModified": 1694529238, "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", @@ -526,6 +526,25 @@ "type": "github" } }, + "git-global-log": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1766486364, + "narHash": "sha256-9qDcOoJyzTA0+oMHC2S/zSKuemL/hkOEVlQsqGfyV9w=", + "owner": "tophcodes", + "repo": "git-global-log", + "rev": "2000a8abc6ee21c0246fd5ef9f41e89ca68086d3", + "type": "github" + }, + "original": { + "owner": "tophcodes", + "repo": "git-global-log", + "type": "github" + } + }, "git-hooks": { "inputs": { "flake-compat": "flake-compat_2", @@ -652,7 +671,7 @@ }, "musnix": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1756852730, @@ -672,7 +691,7 @@ "inputs": { "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "nixpkgs-stable": "nixpkgs-stable", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" @@ -725,21 +744,6 @@ "type": "github" } }, - "nixos-unified": { - "locked": { - "lastModified": 1764076447, - "narHash": "sha256-dpkdOPPCWaFtDoxVAtVaprtPX6jGl8o30EBc1gWBOnQ=", - "owner": "srid", - "repo": "nixos-unified", - "rev": "90171c6936a8332ede17e09e337a0e71f4e659b1", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "nixos-unified", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1759070547, @@ -771,21 +775,6 @@ "type": "github" } }, - "nixpkgs-lib_2": { - "locked": { - "lastModified": 1765674936, - "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1764831616, @@ -867,6 +856,22 @@ } }, "nixpkgs_5": { + "locked": { + "lastModified": 1766309749, + "narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1756542300, "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", @@ -882,7 +887,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1764667669, "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", @@ -898,7 +903,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1764983851, "narHash": "sha256-y7RPKl/jJ/KAP/VKLMghMgXTlvNIJMHKskl8/Uuar7o=", @@ -916,7 +921,7 @@ }, "nur": { "inputs": { - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_3", "nixpkgs": [ "nixpkgs" ] @@ -978,17 +983,17 @@ }, "ovos": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1766165400, - "narHash": "sha256-T86no1MvUHVpC6xyrOJGB9VY4taj2fhJtcBEN+uhV60=", + "lastModified": 1766507159, + "narHash": "sha256-hrIi3T99HKRMzmMJdCD4u8Ttv0iEcfAPEt27Tg5evjU=", "ref": "refs/heads/main", - "rev": "0344ae6de17572639359fe7ca35b3b2e703d3852", - "revCount": 5, + "rev": "6bc136d983fb0995b19cc63f6304120cf4d33355", + "revCount": 31, "type": "git", "url": "file:///home/christopher/workspaces/ovos-flake" }, @@ -1055,12 +1060,11 @@ "awww": "awww", "darwin": "darwin_2", "disko": "disko", - "flake-parts": "flake-parts_3", + "git-global-log": "git-global-log", "home-manager": "home-manager_2", "musnix": "musnix", "niri": "niri", - "nixos-unified": "nixos-unified", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "nur": "nur", "ovos": "ovos", "quadlet": "quadlet", @@ -1119,13 +1123,13 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_5", + "flake-parts": "flake-parts_4", "gnome-shell": "gnome-shell", "nixpkgs": [ "nixpkgs" ], "nur": "nur_2", - "systems": "systems_4", + "systems": "systems_5", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1206,6 +1210,21 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tinted-foot": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index a389de4..085c8e7 100644 --- a/flake.nix +++ b/flake.nix @@ -51,6 +51,7 @@ musnix.url = "github:musnix/musnix"; niri.url = "github:sodiboo/niri-flake/9e59ee8"; awww.url = "git+https://codeberg.org/LGFae/awww"; + git-global-log.url = "github:tophcodes/git-global-log"; nur = { url = "github:nix-community/NUR"; inputs.nixpkgs.follows = "nixpkgs"; @@ -119,6 +120,7 @@ overlays = with inputs; [ niri.overlays.niri nur.overlays.default + ovos.overlays.default ]; outputs-builder = channels: { diff --git a/homes/x86_64-linux/christopher@cobalt/config/git.nix b/homes/x86_64-linux/christopher@cobalt/config/git.nix index 5bf6675..41011f9 100644 --- a/homes/x86_64-linux/christopher@cobalt/config/git.nix +++ b/homes/x86_64-linux/christopher@cobalt/config/git.nix @@ -1,4 +1,12 @@ -{pkgs, ...}: { +{ + pkgs, + inputs, + ... +}: { + imports = [ + inputs.git-global-log.homeManagerModules.default + ]; + home.packages = with pkgs; [ # Dev tools git @@ -10,6 +18,7 @@ pkgs._elements.git-delete-stale ]; + programs.git-global-log.enable = true; programs.git = { enable = true; diff --git a/homes/x86_64-linux/christopher@cobalt/default.nix b/homes/x86_64-linux/christopher@cobalt/default.nix index 840e83a..a8db0b1 100644 --- a/homes/x86_64-linux/christopher@cobalt/default.nix +++ b/homes/x86_64-linux/christopher@cobalt/default.nix @@ -1,6 +1,7 @@ { pkgs, config, + # inputs, ... } @ all: { imports = @@ -17,6 +18,7 @@ ./misc/recording.nix ./misc/everything.nix # TODO: Determine if we really always want all these programs or they should be composable ./global/current-packages.nix + # inputs.ovos.homeManagerModules.default ] ++ (import ./config.nix all); @@ -35,6 +37,19 @@ elements.kitty.enable = true; + # services.ovos = { + # language = "de-de"; + + # audio = { + # enable = true; + # voice = "de_DE-thorsten-medium"; + # logLevel = "DEBUG"; + # }; + + # listener.enable = true; # STT input (requires microphone) + # skills.enable = true; # Intent processing + # }; + home = { extraOutputsToInstall = ["doc" "devdoc"]; diff --git a/homes/x86_64-linux/christopher@cobalt/misc/browser.nix b/homes/x86_64-linux/christopher@cobalt/misc/browser.nix index ee63237..796737e 100644 --- a/homes/x86_64-linux/christopher@cobalt/misc/browser.nix +++ b/homes/x86_64-linux/christopher@cobalt/misc/browser.nix @@ -2,12 +2,9 @@ programs.firefox = { enable = true; - profiles."default" = { - id = 0; - }; - profiles."work" = { - id = 1; - }; + profiles."default".id = 0; + profiles."work".id = 1; + profiles."prune".id = 3; }; home.packages = [pkgs._elements.open-url]; diff --git a/homes/x86_64-linux/christopher@cobalt/misc/recording.nix b/homes/x86_64-linux/christopher@cobalt/misc/recording.nix index 6e264da..f1dfc46 100644 --- a/homes/x86_64-linux/christopher@cobalt/misc/recording.nix +++ b/homes/x86_64-linux/christopher@cobalt/misc/recording.nix @@ -6,7 +6,7 @@ home.packages = with pkgs; [ droidcam davinci-resolve - ffmpeg + # ffmpeg ]; services.easyeffects.enable = true; @@ -14,7 +14,7 @@ programs.firefox.profiles."streaming" = { id = 2; settings = {}; - extensions = with pkgs.nur.repos.rycee.firefox-addons; [ + extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [ kagi-search kagi-privacy-pass ublock-origin diff --git a/systems/x86_64-linux/cobalt/default.nix b/systems/x86_64-linux/cobalt/default.nix index 0259f92..5ee4587 100644 --- a/systems/x86_64-linux/cobalt/default.nix +++ b/systems/x86_64-linux/cobalt/default.nix @@ -83,7 +83,7 @@ with lib._elements; { }; services = { - # elements.ovos.enable = true; + # ovos.enable = true; # message-bus only. remainder in hm openssh.enable = true; openssh.settings.PasswordAuthentication = false;