From 1626d24aed9188ee167b2b2341ddbd659e0e2a17 Mon Sep 17 00:00:00 2001 From: atagen Date: Sun, 20 Jul 2025 13:29:04 +1000 Subject: [PATCH] bitwarden, niri-tag, idk --- flake.lock | 754 ++++++++++++++++++++++++------------ flake.nix | 22 +- home/bolt.nix | 2 +- home/home.nix | 2 +- home/modules/chat.nix | 3 +- home/modules/cli.nix | 2 +- home/modules/desktop.nix | 2 +- home/modules/dev.nix | 70 +++- home/modules/niri.nix | 122 +++--- home/programs/bitwarden.nix | 13 + home/programs/firefox.nix | 2 +- system/configuration.nix | 14 + system/quiver.nix | 14 +- system/substituters.nix | 2 +- 14 files changed, 686 insertions(+), 338 deletions(-) create mode 100644 home/programs/bitwarden.nix diff --git a/flake.lock b/flake.lock index 8a625a6..9ae074a 100644 --- a/flake.lock +++ b/flake.lock @@ -1,18 +1,65 @@ { "nodes": { - "culr": { + "angrr": { "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ] + "crane": "crane", + "flake-compat": "flake-compat", + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs", + "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1738972869, - "narHash": "sha256-meaUvbOADLsUCsAT/vMecmfVpq0Jqypynq8hCUl9Mps=", + "lastModified": 1752250807, + "narHash": "sha256-zXZNU7xsPDcAEfvWwhyU1LD35egz1zfpEyDwcPuBKnQ=", + "owner": "linyinfeng", + "repo": "angrr", + "rev": "f72481311f614f2a56eed3400b8fb923fd0011da", + "type": "github" + }, + "original": { + "owner": "linyinfeng", + "repo": "angrr", + "type": "github" + } + }, + "arbys": { + "locked": { + "lastModified": 1752908944, + "narHash": "sha256-bx+zNhM2rxt55qnlgWfOq97JzxwzWzvynKP5h9uJoZk=", + "path": "/home/bolt/code/arbys", + "type": "path" + }, + "original": { + "path": "/home/bolt/code/arbys", + "type": "path" + } + }, + "crane": { + "locked": { + "lastModified": 1751562746, + "narHash": "sha256-smpugNIkmDeicNz301Ll1bD7nFOty97T79m4GUMUczA=", + "owner": "ipetkov", + "repo": "crane", + "rev": "aed2020fd3dc26e1e857d4107a5a67a33ab6c1fd", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "culr": { + "inputs": { + "nixpkgs": "nixpkgs_2", + "systems": "systems" + }, + "locked": { + "lastModified": 1751299055, + "narHash": "sha256-OLM1Qf4smkreQut+c+UVOE1CT+rbe0tul3oW05E+1Uw=", "ref": "refs/heads/master", - "rev": "40feebba44d4722706b66ac51e1997cb630c09c9", - "revCount": 68, + "rev": "5c8e3fdedca1234a04fda46b2da0aabf431f0153", + "revCount": 70, "type": "git", "url": "https://git.atagen.co/atagen/culr" }, @@ -22,6 +69,22 @@ } }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -36,7 +99,7 @@ "type": "github" } }, - "flake-compat_2": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1696426674, @@ -53,6 +116,27 @@ } }, "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "angrr", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, @@ -70,7 +154,7 @@ "type": "github" } }, - "flake-parts_2": { + "flake-parts_3": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_2" }, @@ -103,24 +187,6 @@ } }, "flake-utils": { - "inputs": { - "systems": "systems" - }, - "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_2": { "inputs": { "systems": "systems_3" }, @@ -155,9 +221,9 @@ }, "git-hooks-nix": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "gitignore": "gitignore", - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_14" }, "locked": { "lastModified": 1747372754, @@ -197,15 +263,15 @@ }, "helix": { "inputs": { - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_3", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1750857684, - "narHash": "sha256-pbF4oz+HZE/rXsm9YOOA9aV/QnwTvc0zHDTpkaHpYK4=", + "lastModified": 1752015948, + "narHash": "sha256-PRtz78Je1kD9PiVaJD8qeIEjWWmfaqJ77Z92e9g4TA8=", "owner": "helix-editor", "repo": "helix", - "rev": "c3c4895179d4bc5a00e22fdf129d41c1af96226a", + "rev": "16d06643a4444ee297058e608c1de1a5bd8db083", "type": "github" }, "original": { @@ -222,11 +288,11 @@ "smfh": "smfh" }, "locked": { - "lastModified": 1750342922, - "narHash": "sha256-TykbfwTCFBL9yk0/xYwOEbHWA83JIQt4ocunMBEyuJE=", + "lastModified": 1751728847, + "narHash": "sha256-KU2NiDsR067mCOrkR/29fX7E4PmjfmXIETTicx3CfwA=", "owner": "feel-co", "repo": "hjem", - "rev": "26c5ebaad2b2cfeaf6cf360952f5fe8876326c80", + "rev": "a1a2680af8038c4b85c6078e44fc3e422c81e04b", "type": "github" }, "original": { @@ -242,11 +308,11 @@ ] }, "locked": { - "lastModified": 1750798083, - "narHash": "sha256-DTCCcp6WCFaYXWKFRA6fiI2zlvOLCf5Vwx8+/0R8Wc4=", + "lastModified": 1751990210, + "narHash": "sha256-krWErNDl9ggMLSfK00Q2BcoSk3+IRTSON/DiDgUzzMw=", "owner": "nix-community", "repo": "home-manager", - "rev": "ff31a4677c1a8ae506aa7e003a3dba08cb203f82", + "rev": "218da00bfa73f2a61682417efe74549416c16ba6", "type": "github" }, "original": { @@ -263,11 +329,11 @@ ] }, "locked": { - "lastModified": 1750798083, - "narHash": "sha256-DTCCcp6WCFaYXWKFRA6fiI2zlvOLCf5Vwx8+/0R8Wc4=", + "lastModified": 1751824240, + "narHash": "sha256-aDDC0CHTlL7QDKWWhdbEgVPK6KwWt+ca0QkmHYZxMzI=", "owner": "nix-community", "repo": "home-manager", - "rev": "ff31a4677c1a8ae506aa7e003a3dba08cb203f82", + "rev": "fd9e55f5fac45a26f6169310afca64d56b681935", "type": "github" }, "original": { @@ -279,7 +345,7 @@ "hudcore": { "inputs": { "nix-systems": "nix-systems", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1746619291, @@ -304,11 +370,11 @@ ] }, "locked": { - "lastModified": 1750403547, - "narHash": "sha256-XDDINMbHTtKQeSRpX5mwq20z23Wg/I/G4JUinA3V8Xg=", + "lastModified": 1751529406, + "narHash": "sha256-jwKDHyUycp678zDYa5Hyfq3msO73YMXdZPxp96dU7po=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "52b86b86d925ec00c836ecc6d36f9c947bb15736", + "rev": "b2e5ce654e4f5bf8905c2e07a96dcf4966e6277d", "type": "github" }, "original": { @@ -336,11 +402,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1750867311, - "narHash": "sha256-ePRqzLiUc+duqBj5fdsEKqdir3pIySIv/aqotBP7fbg=", - "rev": "34696c65a241a2a16bcb1c97946e179ead6e41ea", + "lastModified": 1751931138, + "narHash": "sha256-Q0pIV16Vx9PZQRVXc1GS/IcKYlmcVMdkSGPdBsiLyKU=", + "rev": "fc3261c3405b122c8c2e5bdc3da6c4fb7ffa80a9", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/34696c65a241a2a16bcb1c97946e179ead6e41ea.tar.gz?rev=34696c65a241a2a16bcb1c97946e179ead6e41ea" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/fc3261c3405b122c8c2e5bdc3da6c4fb7ffa80a9.tar.gz?rev=fc3261c3405b122c8c2e5bdc3da6c4fb7ffa80a9" }, "original": { "type": "tarball", @@ -349,7 +415,7 @@ }, "lix-module": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "flakey-profile": "flakey-profile", "lix": [ "lix" @@ -359,11 +425,11 @@ ] }, "locked": { - "lastModified": 1747667424, - "narHash": "sha256-7EICjbmG6lApWKhFtwvZovdcdORY1CEe6/K7JwtpYfs=", - "rev": "3c23c6ae2aecc1f76ae7993efe1a78b5316f0700", + "lastModified": 1751909859, + "narHash": "sha256-gbpuESxl/An4GTh7QEbQRYJozVIxWkwVGbWK0/0GoRc=", + "rev": "4d4c2b8f0a801c91ce5b717c77fe3a17efa1402f", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/3c23c6ae2aecc1f76ae7993efe1a78b5316f0700.tar.gz?rev=3c23c6ae2aecc1f76ae7993efe1a78b5316f0700" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/4d4c2b8f0a801c91ce5b717c77fe3a17efa1402f.tar.gz?rev=4d4c2b8f0a801c91ce5b717c77fe3a17efa1402f" }, "original": { "type": "tarball", @@ -373,17 +439,15 @@ "meat": { "inputs": { "nix-systems": "nix-systems_2", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs_5", "unf": "unf" }, "locked": { - "lastModified": 1750945243, - "narHash": "sha256-AhOhcaMNHQcFLA6oFQ4XhjaBhKDdQun+xIs0OwwfAp4=", + "lastModified": 1752153625, + "narHash": "sha256-N4N0z0I9rtVgAPnPeHBMB46MongPCUTpZdYxOtt2dVY=", "ref": "refs/heads/master", - "rev": "c8978534dc297e108c5fd214f3704421dfda97de", - "revCount": 34, + "rev": "51d501a68e2f6c11460733bffb590056edbfec11", + "revCount": 36, "type": "git", "url": "https://git.atagen.co/atagen/meat" }, @@ -394,14 +458,14 @@ }, "naersk": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1745925850, - "narHash": "sha256-cyAAMal0aPrlb1NgzMxZqeN1mAJ2pJseDhm2m6Um8T0=", + "lastModified": 1751923969, + "narHash": "sha256-QNo234SxSB2lLavaT2d+g+Z2WB7o7w29vYkM6zfRLi4=", "owner": "nix-community", "repo": "naersk", - "rev": "38bc60bbc157ae266d4a0c96671c6c742ee17a5f", + "rev": "0473954e399eec0081ee816f3430c17d1f7e5a42", "type": "github" }, "original": { @@ -412,9 +476,9 @@ }, "ndg": { "inputs": { - "flake-compat": "flake-compat", - "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_3" + "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1748103964, @@ -432,14 +496,14 @@ }, "nil": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1750558251, - "narHash": "sha256-wmb+kcqG05jQA2RPq+KZhOeCxSEOAgumgp/remOsczs=", + "lastModified": 1751341694, + "narHash": "sha256-zXag1+8iZC3H5yVFP7KhIi4ps9z8xKrFIkyaeXlZ7Uo=", "owner": "oxalica", "repo": "nil", - "rev": "4e5ac6ec65c775fbc6adba1c6022b29c7eccde0f", + "rev": "b043bfe1f3f4c4be4b688e24c5ae96e81f525805", "type": "github" }, "original": { @@ -452,17 +516,40 @@ "inputs": { "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_9", "nixpkgs-stable": "nixpkgs-stable", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1750920099, - "narHash": "sha256-Nt906asgI25vQ+/FFHpZ2VeS8N3EMxRBlt9o7F2+Ib8=", + "lastModified": 1752057206, + "narHash": "sha256-f8fNAag3K3WAq+lJr2EEu2f3xVSFLPddLgJKZRzXa3M=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "151cff5b067b51384cf88d5bd5a4ec74b5984c7c", + "rev": "90c2edcf32d0fcb511fee9a0b8c580a18178c109", + "type": "github" + }, + "original": { + "owner": "sodiboo", + "repo": "niri-flake", + "type": "github" + } + }, + "niri-flake": { + "inputs": { + "niri-stable": "niri-stable_2", + "niri-unstable": "niri-unstable_2", + "nixpkgs": "nixpkgs_11", + "nixpkgs-stable": "nixpkgs-stable_2", + "xwayland-satellite-stable": "xwayland-satellite-stable_2", + "xwayland-satellite-unstable": "xwayland-satellite-unstable_2" + }, + "locked": { + "lastModified": 1752057206, + "narHash": "sha256-f8fNAag3K3WAq+lJr2EEu2f3xVSFLPddLgJKZRzXa3M=", + "owner": "sodiboo", + "repo": "niri-flake", + "rev": "90c2edcf32d0fcb511fee9a0b8c580a18178c109", "type": "github" }, "original": { @@ -488,23 +575,36 @@ "type": "github" } }, + "niri-stable_2": { + "flake": false, + "locked": { + "lastModified": 1748151941, + "narHash": "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "8ba57fcf25d2fc9565131684a839d58703f1dae7", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "ref": "v25.05.1", + "repo": "niri", + "type": "github" + } + }, "niri-tag": { "inputs": { "naersk": "naersk", - "niri-flake": [ - "niri" - ], - "nixpkgs": [ - "nixpkgs" - ], + "niri-flake": "niri-flake", + "nixpkgs": "nixpkgs_12", "systems": "systems_4" }, "locked": { - "lastModified": 1750918709, - "narHash": "sha256-82oOscM5vJFN6Mb120HlwFq9f+LCYfhy6jPgVZwtPAA=", + "lastModified": 1752060407, + "narHash": "sha256-3TmD23aCu7dnIxYGnRekDZhB4lvNFoB6MZlPjc8+ouA=", "ref": "refs/heads/main", - "rev": "9c275d05280d48294527c02f5f598353997892f9", - "revCount": 29, + "rev": "ae0b5e0f637d9e0798bb4c4e29b7736ecc0476a0", + "revCount": 35, "type": "git", "url": "https://git.atagen.co/atagen/niri-tag" }, @@ -529,6 +629,22 @@ "type": "github" } }, + "niri-unstable_2": { + "flake": false, + "locked": { + "lastModified": 1750791124, + "narHash": "sha256-F5iVU/hjoSHSSe0gllxm0PcAaseEtGNanYK5Ha3k2Tg=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "37458d94b288945f6cfbd3c5c233f634d59f246c", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "repo": "niri", + "type": "github" + } + }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -554,14 +670,14 @@ }, "nix-index-database": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_13" }, "locked": { - "lastModified": 1750565152, - "narHash": "sha256-A6ZIoIgaPPkzIVxKuaxwEJicPOeTwC/MD9iuC3FVhDM=", + "lastModified": 1751774635, + "narHash": "sha256-DuOznGdgMxeSlPpUu6Wkq0ZD5e2Cfv9XRZeZlHWMd1s=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "78cd697acc2e492b4e92822a4913ffad279c20e6", + "rev": "85686025ba6d18df31cc651a91d5adef63378978", "type": "github" }, "original": { @@ -572,10 +688,10 @@ }, "nix-rice": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_3", "git-hooks-nix": "git-hooks-nix", "kitty-themes-src": "kitty-themes-src", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_15", "nixpkgs-lib": "nixpkgs-lib_3", "systems": "systems_5" }, @@ -625,11 +741,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1740560979, - "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", + "lastModified": 1751984180, + "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5135c59491985879812717f4c9fea69604e7f26f", + "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", "type": "github" }, "original": { @@ -686,11 +802,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1750838302, - "narHash": "sha256-aVkL3/yu50oQzi2YuKo0ceiCypVZpZXYd2P2p1FMJM4=", + "lastModified": 1751943650, + "narHash": "sha256-7orTnNqkGGru8Je6Un6mq1T8YVVU/O5kyW4+f9C1mZQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7284e2decc982b81a296ab35aa46e804baaa1cfe", + "rev": "88983d4b665fb491861005137ce2b11a9f89f203", "type": "github" }, "original": { @@ -702,11 +818,27 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1750646418, - "narHash": "sha256-4UAN+W0Lp4xnUiHYXUXAPX18t+bn6c4Btry2RqM9JHY=", + "lastModified": 1751943650, + "narHash": "sha256-7orTnNqkGGru8Je6Un6mq1T8YVVU/O5kyW4+f9C1mZQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1f426f65ac4e6bf808923eb6f8b8c2bfba3d18c5", + "rev": "88983d4b665fb491861005137ce2b11a9f89f203", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_3": { + "locked": { + "lastModified": 1751274312, + "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", "type": "github" }, "original": { @@ -718,26 +850,27 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1748538152, - "narHash": "sha256-lqAVR6FhqjdY9XpBs+cpIbHJpHxQaEFTeJMu/nkA9s0=", - "owner": "nixos", + "lastModified": 1751949589, + "narHash": "sha256-mgFxAPLWw0Kq+C8P3dRrZrOYEQXOtKuYVlo9xvPntt8=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "966f441f64a65ff4590233e8c45e4f05197b3bfc", + "rev": "9b008d60392981ad674e04016d25619281550a9d", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_11": { "locked": { - "lastModified": 1750776420, - "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", + "lastModified": 1751792365, + "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", + "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", "type": "github" }, "original": { @@ -749,27 +882,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1750741721, - "narHash": "sha256-Z0djmTa1YmnGMfE9jEe05oO4zggjDmxOGKwt844bUhE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4b1164c3215f018c4442463a27689d973cffd750", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1746397377, - "narHash": "sha256-5oLdRa3vWSRbuqPIFFmQBGGUqaYZBxX+GGtN9f/n4lU=", + "lastModified": 1751949589, + "narHash": "sha256-mgFxAPLWw0Kq+C8P3dRrZrOYEQXOtKuYVlo9xvPntt8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ed30f8aba41605e3ab46421e3dcb4510ec560ff8", + "rev": "9b008d60392981ad674e04016d25619281550a9d", "type": "github" }, "original": { @@ -779,13 +896,13 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_13": { "locked": { - "lastModified": 1745930157, - "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", + "lastModified": 1751637120, + "narHash": "sha256-xVNy/XopSfIG9c46nRmPaKfH1Gn/56vQ8++xWA8itO4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", + "rev": "5c724ed1388e53cc231ed98330a60eb2f7be4be3", "type": "github" }, "original": { @@ -795,87 +912,7 @@ "type": "github" } }, - "nixpkgs_4": { - "locked": { - "lastModified": 1748217807, - "narHash": "sha256-P3u2PXxMlo49PutQLnk2PhI/imC69hFl1yY4aT5Nax8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "3108eaa516ae22c2360928589731a4f1581526ef", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1749619289, - "narHash": "sha256-qX6gXVjaCXXbcn6A9eSLUf8Fm07MgPGe5ir3++y2O1Q=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f72be405a10668b8b00937b452f2145244103ebc", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1750776420, - "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1749871736, - "narHash": "sha256-K9yBph93OLTNw02Q6e9CYFGrUhvEXnh45vrZqIRWfvQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6afe187897bef7933475e6af374c893f4c84a293", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { - "locked": { - "lastModified": 1750365781, - "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_9": { + "nixpkgs_14": { "locked": { "lastModified": 1730768919, "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=", @@ -891,20 +928,195 @@ "type": "github" } }, + "nixpkgs_15": { + "locked": { + "lastModified": 1748538152, + "narHash": "sha256-lqAVR6FhqjdY9XpBs+cpIbHJpHxQaEFTeJMu/nkA9s0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "966f441f64a65ff4590233e8c45e4f05197b3bfc", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_16": { + "locked": { + "lastModified": 1751792365, + "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_17": { + "locked": { + "lastModified": 1751792365, + "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1751949589, + "narHash": "sha256-mgFxAPLWw0Kq+C8P3dRrZrOYEQXOtKuYVlo9xvPntt8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "9b008d60392981ad674e04016d25619281550a9d", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1740560979, + "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5135c59491985879812717f4c9fea69604e7f26f", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1746397377, + "narHash": "sha256-5oLdRa3vWSRbuqPIFFmQBGGUqaYZBxX+GGtN9f/n4lU=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ed30f8aba41605e3ab46421e3dcb4510ec560ff8", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1751949589, + "narHash": "sha256-mgFxAPLWw0Kq+C8P3dRrZrOYEQXOtKuYVlo9xvPntt8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "9b008d60392981ad674e04016d25619281550a9d", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1745930157, + "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1748217807, + "narHash": "sha256-P3u2PXxMlo49PutQLnk2PhI/imC69hFl1yY4aT5Nax8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3108eaa516ae22c2360928589731a4f1581526ef", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { + "locked": { + "lastModified": 1749619289, + "narHash": "sha256-qX6gXVjaCXXbcn6A9eSLUf8Fm07MgPGe5ir3++y2O1Q=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f72be405a10668b8b00937b452f2145244103ebc", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_9": { + "locked": { + "lastModified": 1751792365, + "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nyx": { "inputs": { "flake-schemas": "flake-schemas", "home-manager": "home-manager_2", "jovian": "jovian", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_17", "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1750891659, - "narHash": "sha256-BjNHNxJvzS9KIcTGfomKBYXYqNxKGSMJeY1dm6gl3ks=", + "lastModified": 1751984126, + "narHash": "sha256-PrNg+sypyNMU0dHLbfVFQx58NEnS59DUIu0SZSq3DSk=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "a680a0f729cf94828348db53dd26599bfc52beb2", + "rev": "8feb220c99c94c4957d37253eff6100cc33d7e8a", "type": "github" }, "original": { @@ -921,11 +1133,11 @@ ] }, "locked": { - "lastModified": 1750880040, - "narHash": "sha256-ZwQH4akrZf5BxOfXx9Skjw7UpWAj1/ITVRDZsS/AYLA=", + "lastModified": 1752007746, + "narHash": "sha256-iFgYM6lYfEJrCHaqvXjr+tbrUQHxptXomi+nMKe7SJk=", "ref": "refs/heads/master", - "rev": "d949f913479445e4f0ca3a95a183ee45d98dc359", - "revCount": 596, + "rev": "3d594e16dd3850973336c70014a948dc97837d39", + "revCount": 608, "type": "git", "url": "https://git.outfoxxed.me/quickshell/quickshell.git" }, @@ -936,6 +1148,8 @@ }, "root": { "inputs": { + "angrr": "angrr", + "arbys": "arbys", "culr": "culr", "helix": "helix", "hjem": "hjem", @@ -949,8 +1163,8 @@ "niri-tag": "niri-tag", "nix-index-database": "nix-index-database", "nix-rice": "nix-rice", - "nixpkgs": "nixpkgs_11", - "nixpkgs-stable": "nixpkgs-stable_2", + "nixpkgs": "nixpkgs_16", + "nixpkgs-stable": "nixpkgs-stable_3", "nyx": "nyx", "quickshell": "quickshell" } @@ -1006,11 +1220,11 @@ ] }, "locked": { - "lastModified": 1750819193, - "narHash": "sha256-XvkupGPZqD54HuKhN/2WhbKjAHeTl1UEnWspzUzRFfA=", + "lastModified": 1751856221, + "narHash": "sha256-/QE1eV0ckFvgRMcKjZqgdJDoXFNwSMepwRoBjaw2MCk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "1ba3b9c59b68a4b00156827ad46393127b51b808", + "rev": "34cae4b56929c5b340e1c5b10d9a98a425b2a51e", "type": "github" }, "original": { @@ -1029,31 +1243,31 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1749547788, - "narHash": "sha256-n6fd0pb7zd6fVstSzNUEm7qc3NJdPkmDLulGtARQkCI=", - "owner": "Gerg-L", + "lastModified": 1749906619, + "narHash": "sha256-/9Ww10kYopxfCNNnNDwENTubs7Wzqlw+O6PJAHNOYQw=", + "owner": "feel-co", "repo": "smfh", - "rev": "c2dfd2c142a80d9f4ef3b22b65ba1cc6b6d5d40c", + "rev": "39f5c06153f63100376bc607b1465850b6df77fd", "type": "github" }, "original": { - "owner": "Gerg-L", + "owner": "feel-co", "repo": "smfh", "type": "github" } }, "systems": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -1117,10 +1331,31 @@ "type": "github" } }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "angrr", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1752055615, + "narHash": "sha256-19m7P4O/Aw/6+CzncWMAJu89JaKeMh3aMle1CNQSIwM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "c9d477b5d5bd7f26adddd3f96cfd6a904768d4f9", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "unf": { "inputs": { "ndg": "ndg", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1748163740, @@ -1153,14 +1388,47 @@ "type": "github" } }, + "xwayland-satellite-stable_2": { + "flake": false, + "locked": { + "lastModified": 1748488455, + "narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=", + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "ref": "v0.6", + "repo": "xwayland-satellite", + "type": "github" + } + }, "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1750821680, - "narHash": "sha256-Bu5unTxnqok2RoU5P394Gh0vRaoyI/5xlOOJDF6akrc=", + "lastModified": 1751228685, + "narHash": "sha256-MENtauGBhJ+kDeFaawvWGXaFG3Il6qQzjaP0RmtfM0k=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "2e7c318ac2bbf699b6ab92ef91e661e16415dfac", + "rev": "557ebeb616e03d5e4a8049862bbbd1f02c6f020b", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "type": "github" + } + }, + "xwayland-satellite-unstable_2": { + "flake": false, + "locked": { + "lastModified": 1751228685, + "narHash": "sha256-MENtauGBhJ+kDeFaawvWGXaFG3Il6qQzjaP0RmtfM0k=", + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "rev": "557ebeb616e03d5e4a8049862bbbd1f02c6f020b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0aa908d..80eb7a2 100644 --- a/flake.nix +++ b/flake.nix @@ -18,6 +18,8 @@ niri niri-tag lix-module + angrr + arbys # smooooth ]) ++ [ @@ -64,15 +66,9 @@ inputs.lix.follows = "lix"; }; - meat = { - url = "git+https://git.atagen.co/atagen/meat"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + meat.url = "git+https://git.atagen.co/atagen/meat"; - culr = { - url = "git+https://git.atagen.co/atagen/culr"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + culr.url = "git+https://git.atagen.co/atagen/culr"; # comfyui = { # url = "path:./flakes/comfyui"; @@ -102,11 +98,11 @@ # smooooth.url = "path:/home/bolt/code/smooooth"; - niri-tag = { - url = "git+https://git.atagen.co/atagen/niri-tag"; - inputs.niri-flake.follows = "niri"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + niri-tag.url = "git+https://git.atagen.co/atagen/niri-tag"; + + angrr.url = "github:linyinfeng/angrr"; + + arbys.url = "path:/home/bolt/code/arbys"; }; } diff --git a/home/bolt.nix b/home/bolt.nix index 79cacb5..d1b4010 100644 --- a/home/bolt.nix +++ b/home/bolt.nix @@ -9,7 +9,7 @@ ]; home.packages = builtins.attrValues { - inherit (pkgs) nicotine-plus; + inherit (pkgs) nicotine-plus feishin; }; } diff --git a/home/home.nix b/home/home.nix index a03b98c..0f069fd 100644 --- a/home/home.nix +++ b/home/home.nix @@ -22,7 +22,7 @@ nix.gc = { automatic = true; frequency = "daily"; - options = "--delete-older-than 3d"; + options = "--delete-older-than 14d"; }; xdg = { diff --git a/home/modules/chat.nix b/home/modules/chat.nix index 4f8062f..c69e984 100644 --- a/home/modules/chat.nix +++ b/home/modules/chat.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ config, pkgs, ... }: { imports = [ ../util/firefox-webapp.nix @@ -19,4 +19,5 @@ icon = ../icons/fb_msg.png; }; }; + home.packages = [ pkgs.cinny-desktop ]; } diff --git a/home/modules/cli.nix b/home/modules/cli.nix index 48004a0..0c7b494 100644 --- a/home/modules/cli.nix +++ b/home/modules/cli.nix @@ -9,7 +9,7 @@ ]; home.packages = builtins.attrValues { inherit (pkgs) - btop + btop-cuda bat ripgrep fd diff --git a/home/modules/desktop.nix b/home/modules/desktop.nix index 03bacde..391a3b5 100644 --- a/home/modules/desktop.nix +++ b/home/modules/desktop.nix @@ -8,13 +8,13 @@ ./chat.nix ../programs/firefox.nix ../programs/wlogout.nix + ../programs/bitwarden.nix ]; home.packages = builtins.attrValues { inherit (pkgs) file-roller nautilus thunderbird - keepassxc ; }; } diff --git a/home/modules/dev.nix b/home/modules/dev.nix index 5ebdcc2..6b2aad8 100644 --- a/home/modules/dev.nix +++ b/home/modules/dev.nix @@ -1,18 +1,69 @@ -{ pkgs, rice, ... }: +{ + pkgs, + lib, + rice, + ... +}: let - get = builtins.attrValues; + getPkgs = builtins.attrValues; in { # imports = [ # ../programs/vscode.nix # ]; - home.packages = get { - inherit (pkgs) - git-credential-keepassxc - direnv - ; - }; + home.packages = + getPkgs { + inherit (pkgs) + direnv + ; + } + ++ [ + # from https://gist.github.com/mikeboiko/58ab730afd65bca0a125bc12b6f4670d + (pkgs.writeTextFile { + name = "rbw-helper"; + text = '' + declare -A params + + if [ "x$1" == "xget" ]; then + read line + while [ -n "$line" ]; do + key=$\{line%%=*} + value=$\{line#*=} + params[$key]=$value + read line + done + + if [ "x$\{params['protocol']}" != "xhttps" ]; then + exit + fi + + if [ -z "$\{params["host"]}" ]; then + exit + fi + + rbw ls > /dev/null 2>&1 + if [ $? -ne 0 ]; then + echo "Please login to rbw to use git credential helper" > /dev/stderr + exit + fi + + user=`rbw get --full $\{params["host"]} | grep "Username:" | cut -d' ' -f2-` + pass=`rbw get $\{params["host"]}` + + if [ "x$user" == "x" ] || [ "x$pass" == "x" ]; then + echo "Couldn't find host in rbw DB." > /dev/stderr + exit + fi + + echo username=$user + echo password=$pass + fi + ''; + executable = true; + destination = "/bin/git-credential-rw"; + }) + ]; programs.zed-editor = { enable = false; @@ -68,7 +119,8 @@ in userName = "atagen"; userEmail = "boss@atagen.co"; extraConfig = { - credential.helper = "keepassxc"; + credential.helper = "rbw"; }; }; + } diff --git a/home/modules/niri.nix b/home/modules/niri.nix index 3265e6d..0f54082 100644 --- a/home/modules/niri.nix +++ b/home/modules/niri.nix @@ -72,7 +72,7 @@ in range nameValuePair mapAttrs' - mergeAttrs + mergeAttrsList ; inherit (builtins) listToAttrs replaceStrings; inherit (config.lib.niri) actions; @@ -122,67 +122,65 @@ in }) (range 1 6) ); in - { - "Mod+D".action.spawn = [ - "qs" - "ipc" - "call" - "launch" - "toggle" - ]; - "Mod+F".action.spawn = "firefox"; - "Mod+E".action.spawn = "nautilus"; - "Mod+Return".action.spawn = "kitty"; - "Mod+Shift+E".action.spawn = "wlogout"; - "Mod+Equal".action.spawn = "keepassxc"; - "Mod+Shift+Q".action = actions.close-window; - "Mod+Shift+S".action = actions.screenshot; - "Mod+R".action = actions.switch-preset-column-width; - "Mod+Shift+R".action = actions.maximize-column; - "XF86AudioRaiseVolume".action.spawn = [ - "volumectl" - "-u" - "up" - ]; - "XF86AudioLowerVolume".action.spawn = [ - "volumectl" - "-u" - "down" - ]; - "XF86AudioMute".action.spawn = [ - "volumectl" - "toggle-mute" - ]; - "XF86AudioStop".action.spawn = [ - "playerctl" - "stop" - ]; - "XF86AudioPlay".action.spawn = [ - "playerctl" - "play-pause" - ]; - "XF86AudioNext".action.spawn = [ - "playerctl" - "next" - ]; - "XF86AudioPrev".action.spawn = [ - "playerctl" - "previous" - ]; - "Mod+Space".action = actions.toggle-window-floating; - } - # // makeDirBind "Mod" "focus-window-or-workspace-$DIR" vBinds - // makeDirBind "Mod" "focus-column-or-monitor-$DIR" hBinds - # // makeDirBind "Mod+Shift" "move-window-to-workspace-$DIR" vBinds - // makeDirBind "Mod+Shift" "move-column-$DIR-or-to-monitor-$DIR" hBinds - // makeDirBind "Mod+Ctrl" "consume-or-expel-window-$DIR" hBinds - // makeDirBind "Mod+Ctrl" "move-window-$DIR" vBinds - // makeTagBind "Mod" "toggle-tag" - // makeTagBind "Mod+Shift" "toggle" - // makeTagBind "Mod+Ctrl" "exclusive-tag" - # // makeWsBind "Mod" "focus-workspace" - # // makeWsBind "Mod+Shift" "move-window-to-workspace"; - ; + mergeAttrsList [ + { + "Mod+D".action.spawn = [ + "qs" + "ipc" + "call" + "launch" + "toggle" + ]; + "Mod+F".action.spawn = "firefox"; + "Mod+E".action.spawn = "nautilus"; + "Mod+Return".action.spawn = "kitty"; + "Mod+Shift+E".action.spawn = "wlogout"; + "Mod+Equal".action.spawn = "bitwarden"; + "Mod+Shift+Q".action = actions.close-window; + "Mod+Shift+S".action = actions.screenshot; + "Mod+R".action = actions.switch-preset-column-width; + "Mod+Shift+R".action = actions.maximize-column; + "XF86AudioRaiseVolume".action.spawn = [ + "volumectl" + "-u" + "up" + ]; + "XF86AudioLowerVolume".action.spawn = [ + "volumectl" + "-u" + "down" + ]; + "XF86AudioMute".action.spawn = [ + "volumectl" + "toggle-mute" + ]; + "XF86AudioStop".action.spawn = [ + "playerctl" + "stop" + ]; + "XF86AudioPlay".action.spawn = [ + "playerctl" + "play-pause" + ]; + "XF86AudioNext".action.spawn = [ + "playerctl" + "next" + ]; + "XF86AudioPrev".action.spawn = [ + "playerctl" + "previous" + ]; + "Mod+Space".action = actions.toggle-window-floating; + } + (makeDirBind "Mod" "focus-window-$DIR" vBinds) + (makeDirBind "Mod" "focus-column-or-monitor-$DIR" hBinds) + (makeDirBind "Mod+Shift" "move-column-$DIR-or-to-monitor-$DIR" hBinds) + (makeDirBind "Mod+Ctrl" "consume-or-expel-window-$DIR" hBinds) + (makeDirBind "Mod+Ctrl" "move-window-$DIR" vBinds) + (makeTagBind "Mod" "toggle-tag") + (makeTagBind "Mod+Shift" "toggle") + (makeTagBind "Mod+Ctrl" "exclusive-tag") + ]; outputs = { # "Unknown-1".enable = false; "DP-1" = { diff --git a/home/programs/bitwarden.nix b/home/programs/bitwarden.nix new file mode 100644 index 0000000..94f79b6 --- /dev/null +++ b/home/programs/bitwarden.nix @@ -0,0 +1,13 @@ +{ pkgs, ... }: +{ + programs.rbw = { + enable = true; + settings = { + email = "boss@atagen.co"; + pinentry = pkgs.pinentry-gnome3; + base_url = "https://v.atagen.co"; + }; + }; + + home.packages = [ pkgs.bitwarden ]; +} diff --git a/home/programs/firefox.nix b/home/programs/firefox.nix index a7e3168..cfbdf61 100644 --- a/home/programs/firefox.nix +++ b/home/programs/firefox.nix @@ -51,10 +51,10 @@ in "*".installation_mode = "blocked"; # blocks all addons except the ones specified below "uBlock0@raymondhill.net" = officialAddon "ublock-origin"; "addon@darkreader.org" = officialAddon "darkreader"; - "keepassxc-browser@keepassxc.org" = officialAddon "keepassxc-browser"; "vimium-c@gdh1995.cn" = officialAddon "vimium-c"; "{b86e4813-687a-43e6-ab65-0bde4ab75758}" = officialAddon "localcdn-fork-of-decentraleyes"; "jid1-5Fs7iTLscUaZBgwr@jetpack" = officialAddon "happy-bonobo-disable-webrtc"; + "{446900e4-71c2-419f-a6a7-df9c091e268b}" = officialAddon "bitwarden-password-mananger"; }; Preferences = { diff --git a/system/configuration.nix b/system/configuration.nix index 594d15a..ca8bc14 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -20,6 +20,20 @@ ./modules/culr.nix ]; + nix.gc = { + automatic = true; + dates = "daily"; + persistent = true; + options = "--delete-older-than 14d"; + }; + + services.angrr = { + enable = true; + enableNixGcIntegration = true; + period = "2weeks"; + package = inputs.angrr.packages.${pkgs.system}.default; + }; + hardware.enableRedistributableFirmware = true; hardware.enableAllFirmware = true; diff --git a/system/quiver.nix b/system/quiver.nix index 65122ef..2729271 100644 --- a/system/quiver.nix +++ b/system/quiver.nix @@ -11,6 +11,12 @@ ./configuration.nix ]; + environment = { + arbys.enable = true; + files = { + }; + }; + services.ollama = { enable = true; user = "ollama"; @@ -63,10 +69,10 @@ boot.loader.efi.canTouchEfiVariables = true; - # boot.plymouth = { - # enable = true; - # inherit (rice.plymouth) theme themePackages font; - # }; + boot.plymouth = { + enable = true; + # inherit (rice.plymouth) theme themePackages font; + }; security.tpm2.enable = true; diff --git a/system/substituters.nix b/system/substituters.nix index bea6410..a816340 100644 --- a/system/substituters.nix +++ b/system/substituters.nix @@ -17,7 +17,7 @@ "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs=" "walker-git.cachix.org-1:vmC0ocfPWh0S/vRAQGtChuiZBTAe4wiKDeyyXM0/7pM=" "ocaml.nix-cache.com-1:/xI2h2+56rwFfKyyFVbkJSeGqSIYMC/Je+7XXqGKDIY=" - "cache.atagen.co:aw7n3q/HD/kJ5cZSjK+BUE3Ics8e0OuaXO5EkV7GCeI=" + "cache.atagen.co:SOUkNQxuu/eQ7FcI8nlUe7FpV27e7YjQlDQdn8HTUnw=" ]; }; }