Skip to content

Commit b9b862b

Browse files
ajgonajgon
committed
chore(deps): lock file maintenance
1 parent 7b16551 commit b9b862b

File tree

10 files changed

+71
-68
lines changed

10 files changed

+71
-68
lines changed

‎flake.lock‎

Lines changed: 43 additions & 43 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎machines/liadtop/configuration.nix‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ rec {
3737
};
3838
};
3939
bluetooth.enable = true;
40-
radeon.enable = true;
40+
# not much value, a lot of build time
41+
# radeon.enable = true;
4142
sound.enable = true;
4243
};
4344

‎modules/apps/awesome/default.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ in
138138
autorandrPath = "${lib.getExe pkgs.autorandr}",
139139
scrotPath = "${lib.getExe pkgs.scrot}",
140140
slopPath = "${lib.getExe pkgs.slop}",
141-
xkillPath = "${lib.getExe pkgs.xorg.xkill}",
142-
xsetPath = "${lib.getExe pkgs.xorg.xset}",
141+
xkillPath = "${lib.getExe pkgs.xkill}",
142+
xsetPath = "${lib.getExe pkgs.xset}",
143143
144144
modkey = "${cfg.modKey}",
145145
terminal = "${lib.getExe config.myHomeApps.xorg.terminal}",

‎modules/apps/chiaki-ng/default.nix‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ let
1616
pad_name="Wireless Controller Touchpad"
1717
while true; do
1818
sleep 5
19-
if ${lib.getExe pkgs.xorg.xinput} | grep -q "$pad_name"; then
20-
pad_id="$(${lib.getExe pkgs.xorg.xinput} | grep 'Wireless Controller Touchpad' | sed -E 's@.*id=([0-9]+).*@\1@g')"
19+
if ${lib.getExe pkgs.xinput} | grep -q "$pad_name"; then
20+
pad_id="$(${lib.getExe pkgs.xinput} | grep 'Wireless Controller Touchpad' | sed -E 's@.*id=([0-9]+).*@\1@g')"
2121
22-
if [[ "$(${lib.getExe pkgs.xorg.xinput} get-button-map "$pad_id")"] == 1* ]]; then
23-
${lib.getExe pkgs.xorg.xinput} set-button-map "$pad_id" 3 2 1 4 5 6 7
22+
if [[ "$(${lib.getExe pkgs.xinput} get-button-map "$pad_id")"] == 1* ]]; then
23+
${lib.getExe pkgs.xinput} set-button-map "$pad_id" 3 2 1 4 5 6 7
2424
fi
2525
fi
2626
done

‎modules/apps/xorg/default.nix‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,17 @@ in
4646
${lib.getExe (pkgs.callPackage ../../pkgs/libinput-three-finger-drag.nix { })} &
4747
'')
4848
+ (lib.optionalString cfg.mapRightCtrlToAltGr ''
49-
${lib.getExe pkgs.xorg.xmodmap} -e "keycode 105 = Mode_switch Mode_switch Mode_switch Mode_switch"
50-
${lib.getExe pkgs.xorg.xmodmap} -e "keycode 38 = a A aogonek Aogonek aogonek Aogonek aogonek Aogonek a A aogonek Aogonek"
51-
${lib.getExe pkgs.xorg.xmodmap} -e "keycode 54 = c C cacute Cacute cacute Cacute cacute Cacute"
52-
${lib.getExe pkgs.xorg.xmodmap} -e "keycode 26 = e E eogonek Eogonek eogonek Eogonek eogonek Eogonek e E eogonek Eogonek"
53-
${lib.getExe pkgs.xorg.xmodmap} -e "keycode 46 = l L lstroke Lstroke lstroke Lstroke lstroke Lstroke l L lstroke Lstroke"
54-
${lib.getExe pkgs.xorg.xmodmap} -e "keycode 57 = n N nacute Nacute nacute Nacute nacute Nacute n N nacute Nacute"
55-
${lib.getExe pkgs.xorg.xmodmap} -e "keycode 32 = o O oacute Oacute oacute Oacute oacute Oacute o O oacute Oacute"
56-
${lib.getExe pkgs.xorg.xmodmap} -e "keycode 39 = s S sacute Sacute sacute Sacute sacute Sacute s S sacute Sacute"
57-
${lib.getExe pkgs.xorg.xmodmap} -e "keycode 53 = x X zacute Zacute zacute Zacute zacute Zacute x X zacute Zacute"
58-
${lib.getExe pkgs.xorg.xmodmap} -e "keycode 52 = z Z zabovedot Zabovedot zabovedot Zabovedot zabovedot Zabovedot z Z zabovedot Zabovedot"
59-
${lib.getExe pkgs.xorg.xmodmap} -e "keycode 54 = c C cacute Cacute cacute Cacute cacute"
49+
${lib.getExe pkgs.xmodmap} -e "keycode 105 = Mode_switch Mode_switch Mode_switch Mode_switch"
50+
${lib.getExe pkgs.xmodmap} -e "keycode 38 = a A aogonek Aogonek aogonek Aogonek aogonek Aogonek a A aogonek Aogonek"
51+
${lib.getExe pkgs.xmodmap} -e "keycode 54 = c C cacute Cacute cacute Cacute cacute Cacute"
52+
${lib.getExe pkgs.xmodmap} -e "keycode 26 = e E eogonek Eogonek eogonek Eogonek eogonek Eogonek e E eogonek Eogonek"
53+
${lib.getExe pkgs.xmodmap} -e "keycode 46 = l L lstroke Lstroke lstroke Lstroke lstroke Lstroke l L lstroke Lstroke"
54+
${lib.getExe pkgs.xmodmap} -e "keycode 57 = n N nacute Nacute nacute Nacute nacute Nacute n N nacute Nacute"
55+
${lib.getExe pkgs.xmodmap} -e "keycode 32 = o O oacute Oacute oacute Oacute oacute Oacute o O oacute Oacute"
56+
${lib.getExe pkgs.xmodmap} -e "keycode 39 = s S sacute Sacute sacute Sacute sacute Sacute s S sacute Sacute"
57+
${lib.getExe pkgs.xmodmap} -e "keycode 53 = x X zacute Zacute zacute Zacute zacute Zacute x X zacute Zacute"
58+
${lib.getExe pkgs.xmodmap} -e "keycode 52 = z Z zabovedot Zabovedot zabovedot Zabovedot zabovedot Zabovedot z Z zabovedot Zabovedot"
59+
${lib.getExe pkgs.xmodmap} -e "keycode 54 = c C cacute Cacute cacute Cacute cacute"
6060
'');
6161
};
6262

‎modules/apps/yazi/default.nix‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ in
1919
programs.yazi = {
2020
enable = true;
2121
enableZshIntegration = true;
22+
shellWrapperName = "y";
2223
keymap = {
2324
mgr = {
2425
prepend_keymap = [

‎modules/pkgs/retrom.nix‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
openssl,
1919
perl,
2020
pkg-config,
21-
pnpm_10,
21+
pnpmConfigHook,
22+
fetchPnpmDeps,
2223
protobuf,
2324
webkitgtk_4_1,
2425
supportNvidia ? false,
@@ -38,7 +39,7 @@ let
3839
repo = pname;
3940
hash = "sha256-lB7WBVM800tC0HKiOEaF4mZM4QAozpGqkjFlI/0F5Lc=";
4041
};
41-
pnpmDeps = pnpm_10.fetchDeps {
42+
pnpmDeps = fetchPnpmDeps {
4243
inherit pname version src;
4344

4445
fetcherVersion = 2;
@@ -56,7 +57,7 @@ let
5657
dontFixup = true;
5758

5859
nativeBuildInputs = [
59-
pnpm_10.configHook
60+
pnpmConfigHook
6061
gnused
6162
nodejs_22
6263
faketty
@@ -110,7 +111,7 @@ in
110111
openssl
111112
perl
112113
pkg-config
113-
pnpm_10.configHook
114+
pnpmConfigHook
114115
protobuf
115116
depsGenerated
116117
];

‎modules/system/apps/xorg/default.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ in
6060
extraPackages = [ sddm-astronaut ];
6161
};
6262
# minisforum is garbage
63-
environment = lib.optionalAttrs (config.mySystem.hardwareModule == "ms-01") {
63+
generic.environment = lib.optionalAttrs (config.mySystem.hardwareModule == "ms-01") {
6464
QT_XCB_GL_INTEGRATION = "none";
6565
};
6666
autoLogin = lib.mkIf cfg.autoLogin {

‎modules/system/apps/xorg/kiosk.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ let
1313
default_border none
1414
for_window [class=".*"] fullscreen
1515
16-
exec ${lib.getExe pkgs.xorg.xset} s off -dpms
16+
exec ${lib.getExe pkgs.xset} s off -dpms
1717
exec ${cfg.command}
1818
'';
1919
in

‎modules/system/networking.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ in
153153
services = {
154154
resolved = {
155155
enable = lib.mkDefault true;
156-
fallbackDns = cfg.fallbackDNS;
156+
settings.Resolve.FallbackDNS = cfg.fallbackDNS;
157157
}
158158
// lib.optionalAttrs (cfg.nextdnsID != null) {
159159
dnsovertls = "true";

0 commit comments

Comments
 (0)