diff --git a/common/debloat.nix b/common/debloat.nix index 64e9788..86874da 100644 --- a/common/debloat.nix +++ b/common/debloat.nix @@ -1,7 +1,5 @@ { lib, ... }: { - - # misc perl system.disableInstallerTools = true; programs.less.lessopen = null; programs.command-not-found.enable = false; diff --git a/common/nix/gc.nix b/common/nix/gc.nix index 75a0ee3..ccd0790 100644 --- a/common/nix/gc.nix +++ b/common/nix/gc.nix @@ -1,4 +1,10 @@ -{ pkgs, inputs, ... }: +{ + pkgs, + inputs, + getFlakePkg, + getFlakePkg', + ... +}: { imports = [ inputs.angrr.nixosModules.angrr @@ -15,7 +21,8 @@ enable = true; enableNixGcIntegration = true; period = "2weeks"; - package = inputs.angrr.packages.${pkgs.system}.default; + package = getFlakePkg inputs.angrr; }; + programs.direnv.angrr.package = getFlakePkg' inputs.angrr "angrr-direnv"; } diff --git a/flake.lock b/flake.lock index 480567b..62b9f66 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1757693657, - "narHash": "sha256-MpYOH40p8M/uipnK1l/r2+EoFuBkO9fXVjinLQ3OSa4=", + "lastModified": 1758903512, + "narHash": "sha256-tuM+wN3d+1/FfCiFA39nOsvoh03HaeZxXE5poAD3iOk=", "owner": "linyinfeng", "repo": "angrr", - "rev": "301fab01da4b7640452603df7ebc14fb62597757", + "rev": "91b0f7b42c7d6637a03b2893cf5593a1173e42e7", "type": "github" }, "original": { @@ -308,11 +308,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1758204752, - "narHash": "sha256-tgblfdzdM3XAzYHHvA9GX9SR2P8NG2IzewmfnRmTUxg=", + "lastModified": 1758833221, + "narHash": "sha256-c3fpREWUKGonlmV/aesmyRxbJZQypHgXStR7SwdcCo0=", "owner": "helix-editor", "repo": "helix", - "rev": "0ae37dc52ba715100893c327414bcb1a1924a4c3", + "rev": "109c812233e442addccf1739dec4406248bd3244", "type": "github" }, "original": { @@ -396,11 +396,11 @@ ] }, "locked": { - "lastModified": 1757920978, - "narHash": "sha256-Mv16aegXLulgyDunijP6SPFJNm8lSXb2w3Q0X+vZ9TY=", + "lastModified": 1758810399, + "narHash": "sha256-bpWoE1tiFX5T1tr5EudkpW9Kk02XR+6olkoSkf3nHZU=", "owner": "nix-community", "repo": "home-manager", - "rev": "11cc5449c50e0e5b785be3dfcb88245232633eb8", + "rev": "39d26c16866260eee6d0487fe9c102ba1c1bf7b2", "type": "github" }, "original": { @@ -558,11 +558,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1758186479, - "narHash": "sha256-UdC6KXSnt1QfEigiP6TtS3R9TIqPEFJegPoTcjhC4SY=", + "lastModified": 1758901074, + "narHash": "sha256-R7XQL6ixYywDsGkorX05KnTlsIeQr9DzQ3geD9Ba6kU=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "b399b939d7b980b52cbd739a7d44f07017c8572e", + "rev": "397234705a9fa05464107c58286a8308be0c50c2", "type": "github" }, "original": { @@ -612,11 +612,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1758183971, - "narHash": "sha256-rZpQqXa9LIwWulScUEHMqtcJqlidx5OfEfEr/iVC+AM=", + "lastModified": 1758691861, + "narHash": "sha256-CYgoGrY/Fx+hjzp8graTxJw1M7mn1f2jBkK26M04T0s=", "owner": "YaLTeR", "repo": "niri", - "rev": "d9648e6bde1d2fc4a568dec93ba65c11073192a3", + "rev": "e837e39623457dc5ad29c34a5ce4d4616e5fbf1e", "type": "github" }, "original": { @@ -669,11 +669,11 @@ "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1757822619, - "narHash": "sha256-3HIpe3P2h1AUPYcAH9cjuX0tZOqJpX01c0iDwoUYNZ8=", + "lastModified": 1758427679, + "narHash": "sha256-xwjWRJTKDCjQ0iwfh7WhDhgcS0Wt3d1Yscg83mKBCn4=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "050a5feb5d1bb5b6e5fc04a7d3d816923a87c9ea", + "rev": "fd2569ca2ef7d69f244cd9ffcb66a0540772ff85", "type": "github" }, "original": { @@ -737,11 +737,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1757487488, - "narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=", + "lastModified": 1758690382, + "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ab0f3607a6c7486ea22229b92ed2d355f1482ee0", + "rev": "e643668fd71b949c53f8626614b21ff71a07379d", "type": "github" }, "original": { @@ -813,11 +813,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1758070117, - "narHash": "sha256-uLwwHFCZnT1c3N3biVe/0hCkag2GSrf9+M56+Okf+WY=", + "lastModified": 1758791193, + "narHash": "sha256-F8WmEwFoHsnix7rt290R0rFXNJiMbClMZyIC/e+HYf0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e9b7f2ff62b35f711568b1f0866243c7c302028d", + "rev": "25e53aa156d47bad5082ff7618f5feb1f5e02d01", "type": "github" }, "original": { @@ -829,11 +829,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1758070117, - "narHash": "sha256-uLwwHFCZnT1c3N3biVe/0hCkag2GSrf9+M56+Okf+WY=", + "lastModified": 1758791193, + "narHash": "sha256-F8WmEwFoHsnix7rt290R0rFXNJiMbClMZyIC/e+HYf0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e9b7f2ff62b35f711568b1f0866243c7c302028d", + "rev": "25e53aa156d47bad5082ff7618f5feb1f5e02d01", "type": "github" }, "original": { @@ -861,11 +861,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1757745802, - "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", + "lastModified": 1758277210, + "narHash": "sha256-iCGWf/LTy+aY0zFu8q12lK8KuZp7yvdhStehhyX1v8w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", + "rev": "8eaee110344796db060382e15d3af0a9fc396e0e", "type": "github" }, "original": { @@ -908,11 +908,11 @@ }, "nixpkgs_14": { "locked": { - "lastModified": 1758035966, - "narHash": "sha256-qqIJ3yxPiB0ZQTT9//nFGQYn8X/PBoJbofA7hRKZnmE=", + "lastModified": 1758690382, + "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8d4ddb19d03c65a36ad8d189d001dc32ffb0306b", + "rev": "e643668fd71b949c53f8626614b21ff71a07379d", "type": "github" }, "original": { @@ -924,11 +924,11 @@ }, "nixpkgs_15": { "locked": { - "lastModified": 1758029758, - "narHash": "sha256-fKqsvznISxVSBo6aaiGGXMRiBG4IIuV3sSySxx80pcQ=", + "lastModified": 1758815401, + "narHash": "sha256-Nj4iA2Msx0qfHPFDc0biubSsaChuZQlJrS3aNIaQ/T8=", "owner": "PedroHLC", "repo": "nixpkgs", - "rev": "4eb5897225c3d7e78a0b9d1542197ee7c8d270a5", + "rev": "0cc09391d851ec12e1dcbb8d105a75ab6344432b", "type": "github" }, "original": { @@ -1052,11 +1052,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1758035966, - "narHash": "sha256-qqIJ3yxPiB0ZQTT9//nFGQYn8X/PBoJbofA7hRKZnmE=", + "lastModified": 1758690382, + "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8d4ddb19d03c65a36ad8d189d001dc32ffb0306b", + "rev": "e643668fd71b949c53f8626614b21ff71a07379d", "type": "github" }, "original": { @@ -1091,11 +1091,11 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1758033778, - "narHash": "sha256-oQH2wLOWLFHXT3NE+gcsFOX+Pq40bKjlOH1xw0wcmT8=", + "lastModified": 1758886919, + "narHash": "sha256-4y+Z3EIIFw61+uGVgsNpWx3STmNbex8rTyHJPsPwyjE=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "b3efa297b9c6a9e55a44f3b6905d55f80738704f", + "rev": "39a646acc74e720d337edb57cf8473e96f6164ef", "type": "github" }, "original": { @@ -1217,11 +1217,11 @@ ] }, "locked": { - "lastModified": 1757930296, - "narHash": "sha256-Z9u5VszKs8rfEvg2AsFucWEjl7wMtAln9l1b78cfBh4=", + "lastModified": 1758767687, + "narHash": "sha256-znUulOqcL/Kkdr7CkyIi8Z1pTGXpi54Xg2FmlyJmv4A=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "09442765a05c2ca617c20ed68d9613da92a2d96b", + "rev": "b8bcc09d4f627f4e325408f6e7a85c3ac31f0eeb", "type": "github" }, "original": { @@ -1360,11 +1360,11 @@ ] }, "locked": { - "lastModified": 1756662192, - "narHash": "sha256-F1oFfV51AE259I85av+MAia221XwMHCOtZCMcZLK2Jk=", + "lastModified": 1758728421, + "narHash": "sha256-ySNJ008muQAds2JemiyrWYbwbG+V7S5wg3ZVKGHSFu8=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "1aabc6c05ccbcbf4a635fb7a90400e44282f61c4", + "rev": "5eda4ee8121f97b218f7cc73f5172098d458f1d1", "type": "github" }, "original": { @@ -1433,11 +1433,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1757179758, - "narHash": "sha256-TIvyWzRt1miQj6Cf5Wy8Qz43XIZX7c4vTVwRLAT5S4Y=", + "lastModified": 1758577423, + "narHash": "sha256-sB2GAOjhjoWnjU6A/uHNJiY6O3UeztV5pJAN2g1FkXU=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "970728d0d9d1eada342bb8860af214b601139e58", + "rev": "03368548ba745e17a85bd631613a59cb2d8469a4", "type": "github" }, "original": { diff --git a/graphical/desktop/niri-config.kdl b/graphical/desktop/niri-config.kdl index b284aea..07f9c50 100755 --- a/graphical/desktop/niri-config.kdl +++ b/graphical/desktop/niri-config.kdl @@ -22,7 +22,7 @@ output "DP-2" { variable-refresh-rate on-demand=false focus-at-startup } -screenshot-path "~/screenshots/%Y-%m-%d %H-%M-%S.png" +screenshot-path "~/screenshots/%Y-%m-%d_%H-%M-%S.png" prefer-no-csd layout { gaps 64 diff --git a/hosts/quiver/input.nix b/hosts/quiver/input.nix index e44d52e..ee8e1eb 100644 --- a/hosts/quiver/input.nix +++ b/hosts/quiver/input.nix @@ -1,6 +1,14 @@ { lib, pkgs, ... }: +let + ckb-next = pkgs.ckb-next.overrideAttrs (prev: { + cmakeFlags = (prev.cmakeFlags or [ ]) ++ [ "-DUSE_DBUS_MENU=0" ]; + }); +in { - hardware.ckb-next.enable = true; + hardware.ckb-next = { + enable = true; + package = ckb-next; + }; services.libinput.mouse = { accelProfile = "flat"; @@ -8,6 +16,6 @@ }; quick.services = { - ckb-next = "${lib.getExe pkgs.ckb-next} -c -b"; + ckb-next = "${lib.getExe ckb-next} -c -b"; }; } diff --git a/lib/create.nix b/lib/create.nix index 61ef7f7..df8f155 100644 --- a/lib/create.nix +++ b/lib/create.nix @@ -24,10 +24,10 @@ in getFlakePkg' = p: n: p.packages.${info.system}.${n}; }; modules = [ - (_: { - disabledModules = [ "services/misc/open-webui.nix" ]; - imports = [ "${inputs.nixpkgs-stable}/nixos/modules/services/misc/open-webui.nix" ]; - }) + # (_: { + # disabledModules = [ "services/misc/open-webui.nix" ]; + # imports = [ "${inputs.nixpkgs-stable}/nixos/modules/services/misc/open-webui.nix" ]; + # }) inputs.arbys.nixosModules.arbys inputs.hjem.nixosModules.hjem (