diff --git a/common/users.nix b/common/users.nix index 32aa858..1bd493c 100644 --- a/common/users.nix +++ b/common/users.nix @@ -44,6 +44,7 @@ in { alejandra dua fd + jjui nil rclone sops @@ -72,27 +73,6 @@ in { fzf.enable = true; git = { enable = true; - extraConfig = { - column.ui = "auto"; - commit.verbose = true; - core.autocrlf = "input"; - fetch = { - prune = true; - pruneTags = true; - all = true; - }; - help.autocorrect = "prompt"; - init.defaultBranch = "development"; - pull.rebase = false; - push = { - autoSetupRemote = true; - default = "simple"; - }; - rebase = { - autoSquash = true; - autoStash = true; - }; - }; ignores = [ ".direnv" ".envrc" @@ -123,13 +103,15 @@ in { jujutsu = { enable = true; settings = { + git.sign-on-push = true; signing = { behaviour = "own"; backend = "gpg"; }; ui = { + default-command = "status"; editor = "hx"; - pager = "bat"; + paginate = "never"; }; user = { email = postMaster; @@ -189,24 +171,40 @@ in { { kickoff = { icon = "nix-snowflake-white"; + showButtonsFor = "power"; sortAlphabetically = true; }; } - "org.kde.plasma.pager" + { + pager.general.navigationWrapsAround = true; + } { iconTasks.launchers = []; } - "org.kde.plasma.marginsseparator" - "org.kde.plasma.systemtray" - "org.kde.plasma.digitalclock" + { + systemTray = { + icons.scaleToFit = false; + items.showAll = true; + }; + } + { + digitalClock.timeZone.selected = ["Local"]; + } ]; } ]; powerdevil.AC = { autoSuspend.action = "nothing"; - dimDisplay.enable = true; - powerButtonAction = "showLogoutScreen"; - whenLaptopLidClosed = "turnOffScreen"; + dimDisplay = { + enable = true; + idleTimeout = 600; + }; + powerButtonAction = "sleep"; + powerProfile = "performance"; + turnOffDisplay = { + idleTimeout = 1200; + idleTimeoutWhenLocked = 60; + }; whenSleepingEnter = "standby"; }; spectacle.shortcuts.captureRectangularRegion = "Meta+Shift+S"; diff --git a/flake.lock b/flake.lock index 5ebbdac..0f1015b 100644 --- a/flake.lock +++ b/flake.lock @@ -19,11 +19,11 @@ "candy-icons": { "flake": false, "locked": { - "lastModified": 1749333685, - "narHash": "sha256-bXUlc8SnLIEopGtqyXbqu50qe1PNW5875l8WdsfyANw=", + "lastModified": 1750718489, + "narHash": "sha256-UxuW9cRGmKS2t8ik2tMAQHU0Xj+W5WhWuBxnLkkPnoE=", "ref": "refs/heads/master", - "rev": "9720f52c97f582780f0927541ba19963603ad7f5", - "revCount": 1313, + "rev": "29976b2036490599753766f869f83e9346d8cf8e", + "revCount": 1319, "type": "git", "url": "https://github.com/EliverLara/candy-icons" }, @@ -37,11 +37,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1750040002, - "narHash": "sha256-KrC9iOVYIn6ukpVlHbqSA4hYCZ6oDyJKrcLqv4c5v84=", + "lastModified": 1750903843, + "narHash": "sha256-Ng9+f0H5/dW+mq/XOKvB9uwvGbsuiiO6HrPdAcVglCs=", "owner": "nix-community", "repo": "disko", - "rev": "7f1857b31522062a6a00f88cbccf86b43acceed1", + "rev": "83c4da299c1d7d300f8c6fd3a72ac46cb0d59aae", "type": "github" }, "original": { @@ -189,11 +189,11 @@ }, "hardware": { "locked": { - "lastModified": 1750431636, - "narHash": "sha256-vnzzBDbCGvInmfn2ijC4HsIY/3W1CWbwS/YQoFgdgPg=", + "lastModified": 1750837715, + "narHash": "sha256-2m1ceZjbmgrJCZ2PuQZaK4in3gcg3o6rZ7WK6dr5vAA=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "1552a9f4513f3f0ceedcf90320e48d3d47165712", + "rev": "98236410ea0fe204d0447149537a924fb71a6d4f", "type": "github" }, "original": { @@ -207,11 +207,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1750614446, - "narHash": "sha256-6WH0aRFay79r775RuTqUcnoZNm6A4uHxU1sbcNIk63s=", + "lastModified": 1751131846, + "narHash": "sha256-VqXwSsEpmQlVUK0Y6FZ4YQwB63zWWD6ziHgQW2zEiUA=", "owner": "nix-community", "repo": "home-manager", - "rev": "7c35504839f915abec86a96435b881ead7eb6a2b", + "rev": "da077f20db88a173629624a30380658840d377b3", "type": "github" }, "original": { @@ -269,11 +269,11 @@ "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1750639081, - "narHash": "sha256-runeaOtke5IaDADQKeHLhwLGFCTtXSWvbSXC95PPKu8=", + "lastModified": 1750949569, + "narHash": "sha256-dTWYv7EPfS5fM+61AUGUd7CD/8DGYdVw/KzGY7XgKq0=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "67f0b864cc75de3f0a9489630a14d132568ad050", + "rev": "b10c54606bb5293158c37b1fac3909dc3a26449f", "type": "gitlab" }, "original": { @@ -291,16 +291,15 @@ "sweet-ambar-blue-dark": "sweet-ambar-blue-dark", "sweet-folders": "sweet-folders", "sweet-kde": "sweet-kde", - "wallpaper-engine-plasma6-plugin": "wallpaper-engine-plasma6-plugin", "yorha-grub-theme": "yorha-grub-theme", "yorha-sound-theme": "yorha-sound-theme" }, "locked": { - "lastModified": 1749395968, - "narHash": "sha256-8TLFo4Rzl/o9Tx5bn5GGI4HsIiT3lGjrlhVwjOYSyqA=", + "lastModified": 1751139812, + "narHash": "sha256-4PhuwmyNDNATCxzWivq7VQBc6zuCYxDy1iniP9g5bPE=", "ref": "refs/heads/main", - "rev": "907106e54eaa732b251b4729fccba3b375c52f01", - "revCount": 38, + "rev": "d6cc9a072dd6e10a6d032982966550211bb08c89", + "revCount": 39, "type": "git", "url": "https://forgejo.invariantspace.com/macronova/nix-custom" }, @@ -333,11 +332,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1749903597, - "narHash": "sha256-jp0D4vzBcRKwNZwfY4BcWHemLGUs4JrS3X9w5k/JYDA=", + "lastModified": 1750836778, + "narHash": "sha256-sRLyRiC7TezRbbjGJwUFOgb2xMbSr3wQ0oJKfYlQ6s0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "41da1e3ea8e23e094e5e3eeb1e6b830468a7399e", + "rev": "d7bb1922f0bb3d0c990f56f9cdb767fdb20a5f22", "type": "github" }, "original": { @@ -413,11 +412,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1749285348, - "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", + "lastModified": 1751011381, + "narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", + "rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7", "type": "github" }, "original": { @@ -429,11 +428,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1750506804, - "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=", + "lastModified": 1751011381, + "narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4206c4cb56751df534751b058295ea61357bbbaa", + "rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7", "type": "github" }, "original": { @@ -517,11 +516,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1749636823, - "narHash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=", + "lastModified": 1750779888, + "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "623c56286de5a3193aa38891a6991b28f9bab056", + "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", "type": "github" }, "original": { @@ -660,24 +659,6 @@ "type": "github" } }, - "wallpaper-engine-plasma6-plugin": { - "flake": false, - "locked": { - "lastModified": 1730612159, - "narHash": "sha256-ICQLtw+qaOMf0lkqKegp+Dkl7eUgPqKDn8Fj5Osb7eA=", - "ref": "refs/heads/main", - "rev": "ed58dd8b920dbb2bf0859ab64e0b5939b8a32a0e", - "revCount": 628, - "submodules": true, - "type": "git", - "url": "https://github.com/catsout/wallpaper-engine-kde-plugin" - }, - "original": { - "submodules": true, - "type": "git", - "url": "https://github.com/catsout/wallpaper-engine-kde-plugin" - } - }, "yorha-grub-theme": { "flake": false, "locked": {