diff --git a/flake.lock b/flake.lock index 8c7dedb..60de750 100644 --- a/flake.lock +++ b/flake.lock @@ -1039,11 +1039,11 @@ "sqlite-lib-src": "sqlite-lib-src" }, "locked": { - "lastModified": 1756753599, - "narHash": "sha256-yD8PMlRjUI2sN5PvkDJRfGz96zCp4gejaguDVmZ4utg=", + "lastModified": 1757078979, + "narHash": "sha256-3ax8YuYp3MIUYIdov8l2cmXIwO/TSGsc1TUv3r1yIAg=", "ref": "refs/heads/master", - "rev": "da3540c0c134331c10f1a8d124ee0925e57f8112", - "revCount": 1279, + "rev": "02b54de9c4f391f75eb8287e3857ecda30d483a4", + "revCount": 1291, "type": "git", "url": "ssh://git@tangled.sh/tangled.sh/core" }, diff --git a/flake.nix b/flake.nix index 820f772..741e425 100644 --- a/flake.nix +++ b/flake.nix @@ -145,7 +145,6 @@ inherit overlays; system = "aarch64-linux"; hostname = "ramune"; - modules = [ inputs.tangled.nixosModules.knot ]; }; overlays = { diff --git a/home/base/encrypt/DDA4674BEB2FBE8A1EFB6F542FA66EDC2BFD54F5.key.age b/home/base/encrypt/DDA4674BEB2FBE8A1EFB6F542FA66EDC2BFD54F5.key.age index 90700d70f1b308e98a8c8faa589ce49204f03086..e08e97272585f0ae6454067cb374965a31473884 100644 GIT binary patch delta 619 zcmeyx(!)AIr`|m?#i=sTv@|c#+dI3!Gp9V#J;KtxvcM}a!#LPEz#`DtJSWJjGT7HR zlB?1`tTMbZTsy2vKh?S1$uuCND9O0YxFj&k-LtCH)ZC>Yw9>-NBR}8GkxN%sSHZ2! z*dQz<#LYV($0McK!^=A?JkcHZXkEQJ(_+%PBTpx- z>y_GhO3NW!qjcuBFW0kA)p@-7s~92lZM~oH@3Yd8WhHYywg^9rdVc=NA(1JIHrW2l z(5qrwvHx^Qyl#K}xr+1m&+w;l)ozgRD6?+WKBB3!XQuf>HkIT=q332#d35DIW(bG{ z9$8-(xWH{5hnT0+v!+DZiVEBBCq9LHw;VY(ZD;I$T@k|*t7g3u*WP$6YeD6LxG7D? zXEC}m{#_&UjQ?b$K$tp*_oBBlZ9P?GcB^}j&g>VGVt3u`>ELo{d;OuV*^6!WW!>L@ z&6-pGa?9tS?N9hyMSSCm70)i-sX9ARX?C`EQyXWo-c1GzQyBsmHJC&&~x<+uyT28i8-@a_z zXF4(YW7_;zM<-o4was?Ic8|oxQ7IpNbDJu+N3}T2a=d!W&Gpy(#dk^~W=**r>-%Bm z*^bMfZ?Lbm+m=*gCTB4(Y|_R}<^>NWXW4!IRg+e6aOz28!Mj(^tY|sx@^Aa=``Yi% d1#b}5NKH7)-ZSU(>xVrL9?U*;Uxeoh4*&pGy9KQccgyePQRpfIs0sy@{*KR?3N%a`lF&$dUqBa<_p zENwekxj}MMPRL{%1l5(fo)%KKRo>eW8ao+kPG@n7}MK<%q-b51T$d9p$6TlLpV zn#rCIPdg+$_nkMzbAHZ_HSZVC3*V4>I{)~Y+xJ$AwMg2PD~h-;-ot*f`^Sz6US%S0 zK5V%jwrkbqn#2_=>RUCJs=T^*E|_n|caOA{mPhkMJtp2%s9N(Oj!kw;vDp0L+&+~f ze^0JEd-cV8-Iqt@dT&_?{o)jzV<{lxxL4w{t%Ah4y5CKoWweS)Y81S^@(ZU=NRyUx zyf3|QlYP&W8KPI?W=KVMCjU=)yvD`hP3VrQFUgap8AjactPDH=Gr^~J@ zSE8bHbEJ^7`^^*VFYWeRYP}_;e&H#X1iRrK0l(Qg`*wX-JR8T9^xVng=&gr5ldknd zl`=X;>pYpS{8ML=_RFjf)6bk0F6Z2sQPZ=CA#CaFZ|f6xFIu%H=9l%gj3o=xY!gbw z_Z&3KUjO}$g@Ka$@eL=8^g@-7Yzq?HyNg-tvq(*Z;Nv6le|J6ptiUiy@#iaJ_P@VR zPi_5^R$z8KXwP>u$+y1_#jEuza&_~rxWDbj*1yYIQh)K73b-)6{2BbN>@xqNvOvkd JraBG|zW{w?6-WR8 diff --git a/home/base/gpg.nix b/home/base/gpg.nix index 0703c62..c4d78df 100644 --- a/home/base/gpg.nix +++ b/home/base/gpg.nix @@ -22,30 +22,37 @@ in { publicKeys = [ { source = ./assets/pubring.asc; trust = "ultimate"; } ]; + scdaemonSettings = { + disable-ccid = true; + }; }; services.gpg-agent = { enable = true; enableSshSupport = true; + enableScDaemon = false; verbose = true; - sshKeys = [ "DDA4674BEB2FBE8A1EFB6F542FA66EDC2BFD54F5" ]; - defaultCacheTtl = 1; - defaultCacheTtlSsh = 1; - maxCacheTtl = 10; - maxCacheTtlSsh = 10; + defaultCacheTtl = 20; + defaultCacheTtlSsh = 20; + maxCacheTtl = 60; + maxCacheTtlSsh = 60; noAllowExternalCache = true; - pinentry = helpers.mkIfDarwin { - package = pkgs.pinentry-touchid; - program = "pinentry-touchid"; - }; + pinentry = mkMerge [ + (helpers.mkIfDarwin { + package = pkgs.pinentry-touchid; + program = "pinentry-touchid"; + }) + (helpers.mkIfLinux { + package = pkgs.pinentry-all; + program = "pinentry-qt"; + }) + ]; }; systemd.user.services.gpg-agent.Service.Slice = "session.slice"; modules.git.signingKey = mkDefault "4EAF3D43CDBB01C9"; - home.file."${home}/sshcontrol".text = "DDA4674BEB2FBE8A1EFB6F542FA66EDC2BFD54F5"; - # ed25519 2025-09-06 [C] age.secrets."147CBD801C5E0D0C27DD006653D3D96FF952F652.key" = { symlink = true; diff --git a/lib/system.nix b/lib/system.nix index 9fec253..ba3e124 100644 --- a/lib/system.nix +++ b/lib/system.nix @@ -77,6 +77,7 @@ nixpkgs.lib.nixosSystem { inherit system specialArgs lib; modules = systemModules ++ [ + inputs.tangled.nixosModules.knot inputs.yeetmouse.nixosModules.default inputs.agenix.nixosModules.default home-manager.nixosModules.home-manager { diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix index b7c3ebf..495feda 100644 --- a/modules/desktop/hyprland.nix +++ b/modules/desktop/hyprland.nix @@ -25,6 +25,7 @@ let kb_model=${cfg.hyprland.input.kb_model} kb_variant=${cfg.hyprland.input.kb_variant} sensitivity=${toString cfg.hyprland.input.sensitivity} + accel_profile = "flat" } misc { @@ -34,7 +35,6 @@ let } render { - explicit_sync=0 direct_scanout=1 expand_undersized_textures=false cm_fs_passthrough=1 diff --git a/modules/desktop/session.nix b/modules/desktop/session.nix index d411735..28828fa 100644 --- a/modules/desktop/session.nix +++ b/modules/desktop/session.nix @@ -56,7 +56,7 @@ in { }; upower.enable = true; gvfs.enable = true; - logind = { + logind.settings.Login = { powerKey = "suspend"; powerKeyLongPress = "poweroff"; lidSwitch = "suspend";