From 373751f8d97cdd7889175809e807dab821ff33f9 Mon Sep 17 00:00:00 2001 From: macronova Date: Sun, 22 Jun 2025 23:35:23 -0500 Subject: [PATCH] Try jj --- common/users.nix | 18 +++++++++++++++ flake.lock | 54 ++++++++++++++++++++++---------------------- linux/quasar/gui.nix | 1 + 3 files changed, 46 insertions(+), 27 deletions(-) diff --git a/common/users.nix b/common/users.nix index 4ad674b..68cc9c9 100644 --- a/common/users.nix +++ b/common/users.nix @@ -120,6 +120,24 @@ in { }; themeFile = "tokyo_night_moon"; }; + jujutsu = { + enable = true; + settings = { + git.sign-on-ush = true; + signing = { + behaviour = "own"; + backend = "gpg"; + }; + ui = { + editor = "hx"; + pager = "bat"; + }; + user = { + email = postMaster; + name = userName; + }; + }; + }; plasma = { enable = osConfig.services.desktopManager.plasma6.enable; configFile = { diff --git a/flake.lock b/flake.lock index bc826e2..5ebbdac 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1749436314, - "narHash": "sha256-CqmqU5FRg5AadtIkxwu8ulDSOSoIisUMZRLlcED3Q5w=", + "lastModified": 1750040002, + "narHash": "sha256-KrC9iOVYIn6ukpVlHbqSA4hYCZ6oDyJKrcLqv4c5v84=", "owner": "nix-community", "repo": "disko", - "rev": "dfa4d1b9c39c0342ef133795127a3af14598017a", + "rev": "7f1857b31522062a6a00f88cbccf86b43acceed1", "type": "github" }, "original": { @@ -189,11 +189,11 @@ }, "hardware": { "locked": { - "lastModified": 1749832440, - "narHash": "sha256-lfxhuxAaHlYFGr8yOrAXZqdMt8PrFLzjVqH9v3lQaoY=", + "lastModified": 1750431636, + "narHash": "sha256-vnzzBDbCGvInmfn2ijC4HsIY/3W1CWbwS/YQoFgdgPg=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "db030f62a449568345372bd62ed8c5be4824fa49", + "rev": "1552a9f4513f3f0ceedcf90320e48d3d47165712", "type": "github" }, "original": { @@ -207,11 +207,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1749935160, - "narHash": "sha256-lTLR7AyrrIS/b4frHKb5pw/gcPM0GgoGCURqeiOX9k8=", + "lastModified": 1750614446, + "narHash": "sha256-6WH0aRFay79r775RuTqUcnoZNm6A4uHxU1sbcNIk63s=", "owner": "nix-community", "repo": "home-manager", - "rev": "8fabeb9c142a303e02270c3a3a0d8e00af9d0dfe", + "rev": "7c35504839f915abec86a96435b881ead7eb6a2b", "type": "github" }, "original": { @@ -247,11 +247,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1749627191, - "narHash": "sha256-bUv8CDE6Uyxak4UkOvRjx5xj6+msEHSpYGeAjkuTnTs=", + "lastModified": 1750403547, + "narHash": "sha256-XDDINMbHTtKQeSRpX5mwq20z23Wg/I/G4JUinA3V8Xg=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "f31df4cb6b2eeef6cf0113edb687297be72a69df", + "rev": "52b86b86d925ec00c836ecc6d36f9c947bb15736", "type": "github" }, "original": { @@ -269,11 +269,11 @@ "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1749905278, - "narHash": "sha256-fwb0SLRj8yqhdFqqafrlUZzwwSHYV1L75AaJ0wMXREM=", + "lastModified": 1750639081, + "narHash": "sha256-runeaOtke5IaDADQKeHLhwLGFCTtXSWvbSXC95PPKu8=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "23cc9a3996ac2f203f974798d3dcb56277b00aee", + "rev": "67f0b864cc75de3f0a9489630a14d132568ad050", "type": "gitlab" }, "original": { @@ -333,11 +333,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1749401433, - "narHash": "sha256-HXIQzULIG/MEUW2Q/Ss47oE3QrjxvpUX7gUl4Xp6lnc=", + "lastModified": 1749903597, + "narHash": "sha256-jp0D4vzBcRKwNZwfY4BcWHemLGUs4JrS3X9w5k/JYDA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "08fcb0dcb59df0344652b38ea6326a2d8271baff", + "rev": "41da1e3ea8e23e094e5e3eeb1e6b830468a7399e", "type": "github" }, "original": { @@ -365,11 +365,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1749285348, - "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", + "lastModified": 1750365781, + "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", + "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", "type": "github" }, "original": { @@ -429,11 +429,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1749794982, - "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", + "lastModified": 1750506804, + "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", + "rev": "4206c4cb56751df534751b058295ea61357bbbaa", "type": "github" }, "original": { @@ -550,11 +550,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1749592509, - "narHash": "sha256-VunQzfZFA+Y6x3wYi2UE4DEQ8qKoAZZCnZPUlSoqC+A=", + "lastModified": 1750119275, + "narHash": "sha256-Rr7Pooz9zQbhdVxux16h7URa6mA80Pb/G07T4lHvh0M=", "owner": "Mic92", "repo": "sops-nix", - "rev": "50754dfaa0e24e313c626900d44ef431f3210138", + "rev": "77c423a03b9b2b79709ea2cb63336312e78b72e2", "type": "github" }, "original": { diff --git a/linux/quasar/gui.nix b/linux/quasar/gui.nix index 3a45874..779af25 100644 --- a/linux/quasar/gui.nix +++ b/linux/quasar/gui.nix @@ -22,6 +22,7 @@ in { nvtopPackages.full picard qbittorrent + retroarchFull ryujinx telegram-desktop thunderbird