From cf71ecde9f6d153bd87256eae7f94c03203ed984 Mon Sep 17 00:00:00 2001 From: Dmitriy Kholkin Date: Tue, 14 Mar 2023 22:56:00 +0300 Subject: [PATCH] update --- flake.lock | 156 ++++++++++++------------ patches/gitea-208605.patch | 13 +- patches/zen-kernels.patch | 16 +-- profiles/overlay.nix | 2 - profiles/workspace/hyprland/default.nix | 4 + profiles/workspace/mako.nix | 2 +- profiles/workspace/misc.nix | 1 + 7 files changed, 100 insertions(+), 94 deletions(-) diff --git a/flake.lock b/flake.lock index 5256608..3da0278 100644 --- a/flake.lock +++ b/flake.lock @@ -44,11 +44,11 @@ "arkenfox-userjs": { "flake": false, "locked": { - "lastModified": 1675728165, - "narHash": "sha256-ebSx6DaXoGKcCoK6UcDnWvdAW6J2X6pJRPD1Pw7UNOw=", + "lastModified": 1678691587, + "narHash": "sha256-EGfPa1uGYwQLhM27nyWosJo5Pe4yIhC3JOW0vqajK7w=", "owner": "arkenfox", "repo": "user.js", - "rev": "73884850632ffe284f76881786f7d5903b917f58", + "rev": "e2e8c4ea8f9c8034a2ff72fe3c2d4a4a89404c10", "type": "github" }, "original": { @@ -340,11 +340,11 @@ ] }, "locked": { - "lastModified": 1675933616, - "narHash": "sha256-/rczJkJHtx16IFxMmAWu5nNYcSXNg1YYXTHoGjLrLUA=", + "lastModified": 1678379998, + "narHash": "sha256-TZdfNqftHhDuIFwBcN9MUThx5sQXCTeZk9je5byPKRw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "47478a4a003e745402acf63be7f9a092d51b83d7", + "rev": "c13d60b89adea3dc20704c045ec4d50dd964d447", "type": "github" }, "original": { @@ -584,11 +584,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1676933022, - "narHash": "sha256-gLghsEHOy2W2ZmSwqNOyj2mSHe9SMpdcbqnoySlZnmY=", + "lastModified": 1678729503, + "narHash": "sha256-j+h4Bdqbe+qjzhxdhkRmVgSx2lxJ8HnKeYcAhhnd1zM=", "owner": "nix-community", "repo": "home-manager", - "rev": "5e889b385c43a8a72ada5ebc4888bbebb129b438", + "rev": "24c1a6335e3da6a3ecf82f33ac50c2ad66aee346", "type": "github" }, "original": { @@ -605,11 +605,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1676935051, - "narHash": "sha256-OC+mgw7enQRnAg90IDjQkEwUkMRa/Q5DntDGa9oC4PM=", + "lastModified": 1678801868, + "narHash": "sha256-jbXNJUhDy97f3eamLXW9mdJqujr/AXfCY7ReIAOPMds=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "431c74f111285eab41c17d724f335a324b5c833a", + "rev": "0807b8b95f595083a19bb5fe317d7242bcb26654", "type": "github" }, "original": { @@ -646,11 +646,11 @@ ] }, "locked": { - "lastModified": 1676681260, - "narHash": "sha256-R2FvbPzgvDSVs0jCUA9CMDIgw4F6exF8cR+y3Yea5jQ=", + "lastModified": 1677282271, + "narHash": "sha256-wNooEHZpKMJN2jj2qPa1jRhi6f5q1yTYCxQcXEJ32eM=", "owner": "hyprwm", "repo": "hyprpaper", - "rev": "2bc88dc8c220db674f458432aec0ac0d9ea6a640", + "rev": "83867464c523c3ac2f7ce53d2c4b8d4f9b7551cd", "type": "github" }, "original": { @@ -680,11 +680,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1676808538, - "narHash": "sha256-jW0bgdzrOnbnvMMOhhwX+a/CwjLiieGHJDqVWnTvTvM=", + "lastModified": 1678622938, + "narHash": "sha256-w46ngc0Exfa37GTY5sQiRofOSsFQVbSYGcq+Of63T0A=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "7c4e585bbbbc519702b01bcc25b60fe453d08be1", + "rev": "293e9a4e4addcae085c56469c12cfee5bdaa17cf", "type": "github" }, "original": { @@ -768,11 +768,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1676934729, - "narHash": "sha256-9KGViGnyOc+V3Zk20IJbucWv352OZ12oKv8jmHxqUEU=", + "lastModified": 1678733561, + "narHash": "sha256-bs9TuOd0UmEaizyf5avT1ojob8tvMItqqZ6GZk3OYYE=", "owner": "nixos", "repo": "nix", - "rev": "5510daf132db87c211d41ec91e24a837ad6e42cf", + "rev": "a387f46967ae9eb97eaeb17ca26fb583283815ce", "type": "github" }, "original": { @@ -791,11 +791,11 @@ ] }, "locked": { - "lastModified": 1676464624, - "narHash": "sha256-RXtoupBu+sJbpXicPxAxMAs+kZl932Vbp/D7Q6UfOBk=", + "lastModified": 1678148805, + "narHash": "sha256-fHzmWdVJSVUTBbW4M0+DSwQfOEQO1GWJVgFS+LFjjBE=", "owner": "thiagokokada", "repo": "nix-alien", - "rev": "5a30e8619fc28ce870643e2c1a1ff9c0d130fd1e", + "rev": "ee4f7080092e060939570dbe51ca3587cfaa5760", "type": "github" }, "original": { @@ -810,11 +810,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1676801869, - "narHash": "sha256-WhpCDVJr1ffW3u6PR0Hrnpq6QQpSNbof9bPXNGqNF5w=", + "lastModified": 1678710449, + "narHash": "sha256-2VdoFcZVEGKu8E+volY9k51HQ+aEoEblhwApgbaM1+A=", "owner": "nix-community", "repo": "nix-direnv", - "rev": "67f1e03dde3ee86a9aa71ab31a3167d250bcd8ce", + "rev": "7afcc5a6ced509bf4c3e21be695e7adaf708c1a2", "type": "github" }, "original": { @@ -829,11 +829,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1676510875, - "narHash": "sha256-419+vVOC12120BwzafeGaAB4+GGueCUanSHN9BH2cdk=", + "lastModified": 1678670528, + "narHash": "sha256-efyTqERGI5Nm0CSFd1EvWIZADhBaE1GEKq4do1+0EAg=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "7c3bc3b566c94753388c9ccbc79b936ed33574d7", + "rev": "4477932be8445c73202f68be30721440df3a6110", "type": "github" }, "original": { @@ -888,11 +888,11 @@ ] }, "locked": { - "lastModified": 1676942493, - "narHash": "sha256-NhIyzzyn0BV3f+SvBdiHHiOx2hL9jM2oTR/j7lXPq/I=", + "lastModified": 1678756141, + "narHash": "sha256-T+HOdBSck/ehWZJsdYw9IFOuy14NQqz7UNpyHScpGG8=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "fd8cee8a7fecae85c163938237c8db1cf219947e", + "rev": "abcf052e7c7c49a72e0669d950dc757af99e65ef", "type": "github" }, "original": { @@ -903,11 +903,11 @@ }, "nixlib": { "locked": { - "lastModified": 1636849918, - "narHash": "sha256-nzUK6dPcTmNVrgTAC1EOybSMsrcx+QrVPyqRdyKLkjA=", + "lastModified": 1677373009, + "narHash": "sha256-kxhz4QUP8tXa/yVSpEzDDZSEp9FvhzRqZzb+SeUaekw=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "28a5b0557f14124608db68d3ee1f77e9329e9dd5", + "rev": "c9d4f2476046c6a7a2ce3c2118c48455bf0272ea", "type": "github" }, "original": { @@ -924,11 +924,11 @@ ] }, "locked": { - "lastModified": 1676297861, - "narHash": "sha256-YECUmK34xzg0IERpnbCnaO6z6YgfecJlstMWX7dqOZ8=", + "lastModified": 1678351966, + "narHash": "sha256-tRFEU0lu3imZb3dtELBY+UbEhWXbb0xlBrsIlpICb+A=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "1e0a05219f2a557d4622bc38f542abb360518795", + "rev": "0c043999b16caba6fb571af2d228775729829943", "type": "github" }, "original": { @@ -970,11 +970,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1676767889, - "narHash": "sha256-VjGXT6nZv8KrmrIUkAJr8MjDLJ/mRgWZqCC9mq5J6Gg=", + "lastModified": 1678582451, + "narHash": "sha256-ORE3VMo7ZB5dFctdgVq3znAklUtJBmL3F4aUCFJumfk=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "710d8816159a542ed0b1dcaf47748e2813af53f5", + "rev": "14ad8df808e5dc13bf4664da1e24a36814c28c16", "type": "github" }, "original": { @@ -1003,11 +1003,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1676949029, - "narHash": "sha256-3IX0NnwB7XtNIQlzla9viOS1M0FF5CKygehC2ar/Ezs=", + "lastModified": 1678801515, + "narHash": "sha256-ap35STmcs0kGf5HiKZjSEgi7seDpkbLqx8qBt8U+sic=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7e85bb6e21198cb2d8d3ee6193fc9edc6c7aa8b5", + "rev": "7ca65eeecf7918c4842109723809ad0e069fcc89", "type": "github" }, "original": { @@ -1043,11 +1043,11 @@ ] }, "locked": { - "lastModified": 1676932603, - "narHash": "sha256-VdoSwfWfSO9NUR51lbzpAtl0NuT4SWocxCS6jNDbWyU=", + "lastModified": 1678803304, + "narHash": "sha256-RxMjwz92Qz7rFfJTMpYNwl1aXdjGfA1c1tBlw6XUGGQ=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "99530473811247054556fbaf689ec97000902225", + "rev": "54942d7ceb5f046c07e0edcf7f687160ce77d17a", "type": "github" }, "original": { @@ -1058,11 +1058,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1675273418, - "narHash": "sha256-tpYc4TEGvDzh9uRf44QemyQ4TpVuUbxb07b2P99XDbM=", + "lastModified": 1677676435, + "narHash": "sha256-6FxdcmQr5JeZqsQvfinIMr0XcTyTuR7EXX0H3ANShpQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4d7c2644dbac9cf8282c0afe68fca8f0f3e7b2db", + "rev": "a08d6979dd7c82c4cef0dcc6ac45ab16051c1169", "type": "github" }, "original": { @@ -1090,11 +1090,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1676763583, - "narHash": "sha256-y8j1GRwWeRN7KIrUIksgoTyYXWjraWvMtWK/cc4muNY=", + "lastModified": 1678594102, + "narHash": "sha256-OHAHYiMWJFPNxuW/PcOMlSD2tvXnEYC1jxREBADHwwQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "06365ba4549654b7ce58c33365c1282800e83a9e", + "rev": "796b4a3c1d903c4b9270cd2548fe46f524eeb886", "type": "github" }, "original": { @@ -1106,11 +1106,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1676721149, - "narHash": "sha256-mN2EpTGxxVNnFZLoLWRwh6f7UWhXy4qE+wO2CZyrXps=", + "lastModified": 1678654296, + "narHash": "sha256-aVfw3ThpY7vkUeF1rFy10NAkpKDS2imj3IakrzT0Occ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5f4e07deb7c44f27d498f8df9c5f34750acf52d2", + "rev": "5a1dc8acd977ff3dccd1328b7c4a6995429a656b", "type": "github" }, "original": { @@ -1122,11 +1122,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1676510113, - "narHash": "sha256-TBB/1Fv1/S7si9/Dy/DwYCoJBBZSwJu2zzQzagW8P48=", + "lastModified": 1678670110, + "narHash": "sha256-Yi84/EUqMl+S3Uafzoskta3eW0/HId/fH0rSkaw5nk8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cd1364e35b503d0add3f4bc57006ebb02070ae14", + "rev": "7c84ea61abbe8038e273fbef035e0364a35be17d", "type": "github" }, "original": { @@ -1170,11 +1170,11 @@ }, "nur": { "locked": { - "lastModified": 1676947256, - "narHash": "sha256-ZzFLCGl9rNv5Q76L6wMOCl3d5Lfk5Ilvjl43NHVSxw8=", + "lastModified": 1678788009, + "narHash": "sha256-O9nMPCAly/lUJHqtz8IAa8sf4uuB/6arHDEyQoRXTyw=", "owner": "nix-community", "repo": "NUR", - "rev": "249c267424a36c1270e3978cca38270a540d491a", + "rev": "a93973a3dd17284678ad6691dd38246b6ea3bf4f", "type": "github" }, "original": { @@ -1234,11 +1234,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1677785163, - "narHash": "sha256-dQ2Ds/LW+s02euIdASfIoA/QRLJ+Qs1Rl4kPcFzA5dw=", + "lastModified": 1678757989, + "narHash": "sha256-wJptpX6TTUZLBHZzSXPmF5o329VSFIkEd2VSxvwDX3E=", "owner": "AtaraxiaSjel", "repo": "PrismLauncher", - "rev": "6019aaa14f792564ca84e4daded09ca92e56a1cd", + "rev": "1c3be078d37a83deec8c61a64968af07bc35ab37", "type": "github" }, "original": { @@ -1251,11 +1251,11 @@ "qbittorrent-ee": { "flake": false, "locked": { - "lastModified": 1676582356, - "narHash": "sha256-pDrqWiheQWOkFS4N83UZ3sRDHNoytf4BvFr7y/qpVqo=", + "lastModified": 1677569098, + "narHash": "sha256-MuVwqUaPQij6Kox9BLjxkOqPLz/B+hALX7AurKy65KM=", "owner": "c0re100", "repo": "qBittorrent-Enhanced-Edition", - "rev": "7eb057f32e8726e9139d0818a2270f914b9a5434", + "rev": "76478c487b18f5eef7e385e83c691f5f953c368f", "type": "github" }, "original": { @@ -1340,11 +1340,11 @@ "rycee": { "flake": false, "locked": { - "lastModified": 1676933567, - "narHash": "sha256-8XQcOwUZyHduUEsGAYW0L+5/1vi4aTiYwGfTuw8Fb30=", + "lastModified": 1678766574, + "narHash": "sha256-6y6bFCKZvXWVGH+IxKSr1YPgnWWvgwU3dWqjtMm3zwU=", "owner": "rycee", "repo": "nur-expressions", - "rev": "050ef9fb14d20d4ffb27636ec57b5d44c1ee52ce", + "rev": "715eb1857fdaea4a5cec5bdad9d443906e2b83c8", "type": "gitlab" }, "original": { @@ -1394,11 +1394,11 @@ }, "utils_2": { "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1676283394, + "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", "type": "github" }, "original": { @@ -1497,11 +1497,11 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1675374853, - "narHash": "sha256-BSrjNcddYWhFUMtjGwxiEXw67MYRaIHGvLn19Mvm1NE=", + "lastModified": 1677789111, + "narHash": "sha256-dWrk+Q3bLdtFe5rkyaAKWCQJCeE/KFNllcu1DvBC38c=", "owner": "wlroots", "repo": "wlroots", - "rev": "677a3f2f8847ed2de49dd60868f9d9487a546f58", + "rev": "5ae17de23f5fd9bb252a698f3771c840280e2c05", "type": "gitlab" }, "original": { diff --git a/patches/gitea-208605.patch b/patches/gitea-208605.patch index 98a77b5..64e34e5 100644 --- a/patches/gitea-208605.patch +++ b/patches/gitea-208605.patch @@ -1,8 +1,8 @@ diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix -index 00e90f5b32b..90879dce7dc 100644 +index 014c5b16097..c559edc6978 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix -@@ -567,7 +567,10 @@ in +@@ -569,7 +569,10 @@ in Restart = "always"; # Runtime directory and mode RuntimeDirectory = "gitea"; @@ -14,7 +14,7 @@ index 00e90f5b32b..90879dce7dc 100644 # Access write directories ReadWritePaths = [ cfg.dump.backupDir cfg.repositoryRoot cfg.stateDir cfg.lfs.contentDir ]; UMask = "0027"; -@@ -587,15 +590,17 @@ in +@@ -589,15 +592,17 @@ in ProtectKernelModules = true; ProtectKernelLogs = true; ProtectControlGroups = true; @@ -23,13 +23,14 @@ index 00e90f5b32b..90879dce7dc 100644 + RestrictNamespaces = true; LockPersonality = true; MemoryDenyWriteExecute = true; ++ RemoveIPC = true; RestrictRealtime = true; RestrictSUIDSGID = true; -+ RemoveIPC = true; PrivateMounts = true; # System Call Filtering SystemCallArchitectures = "native"; -- SystemCallFilter = "~@clock @cpu-emulation @debug @keyring @memlock @module @mount @obsolete @raw-io @reboot @setuid @swap"; -+ SystemCallFilter = [ "~@cpu-emulation @debug @keyring @memlock @mount @obsolete @privileged @resources @setuid" "setrlimit" ]; +- SystemCallFilter = "~@clock @cpu-emulation @debug @keyring @module @mount @obsolete @raw-io @reboot @setuid @swap"; ++ SystemCallFilter = [ "~@clock ~@cpu-emulation @debug @keyring @module @mount @obsolete @privileged @setuid" "setrlimit" ]; }; + environment = { diff --git a/patches/zen-kernels.patch b/patches/zen-kernels.patch index 8b9af88..9f599d5 100644 --- a/patches/zen-kernels.patch +++ b/patches/zen-kernels.patch @@ -1,15 +1,17 @@ diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix -index 2745cd7..b12262d 100644 +index 865d028..97f6685 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix -@@ -12,8 +12,8 @@ let +@@ -11,9 +11,9 @@ let + }; # ./update-zen.py lqx lqxVariant = { - version = "6.1.12"; #lqx -- suffix = "lqx1"; #lqx -- sha256 = "0a6slrydf47hk4b3xlxycjw9y2xgjgvzjic2psbcb1c5y75zq720"; #lqx -+ suffix = "lqx4"; #lqx -+ sha256 = "15gy18wx2iz75j4l130z4905mabswh5v5n9vk9l302pgxm550xbr"; #lqx +- version = "6.2.5"; #lqx +- suffix = "lqx3"; #lqx +- sha256 = "0njzx2wkdiimp4lp7sl22ldsma65kcvz287z2dj46l0sssgh3830"; #lqx ++ version = "6.1.18"; #lqx ++ suffix = "lqx1"; #lqx ++ sha256 = "1gyjy01ys74apa65abgvxcj0y51vf5ixampyj3jd8lxzn4vvkih6"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { diff --git a/profiles/overlay.nix b/profiles/overlay.nix index 1a05b6b..362f128 100644 --- a/profiles/overlay.nix +++ b/profiles/overlay.nix @@ -12,7 +12,6 @@ with lib; { # inputs.nixpkgs-wayland.overlay inputs.nix-alien.overlay inputs.nur.overlay - # inputs.nixos-rocm.overlay roundcube-plugins (final: prev: rec { @@ -39,7 +38,6 @@ with lib; { youtube-to-mpv = pkgs.callPackage ./packages/youtube-to-mpv.nix { term = config.defaultApplications.term.cmd; }; seadrive-fuse = pkgs.callPackage ./packages/seadrive-fuse.nix { }; steam = master.steam.override { - withJava = true; extraPkgs = pkgs: with pkgs; [ mono libkrb5 keyutils ]; }; waybar = inputs.nixpkgs-wayland.packages.${system}.waybar.overrideAttrs (old: { diff --git a/profiles/workspace/hyprland/default.nix b/profiles/workspace/hyprland/default.nix index 387df51..5910dc8 100644 --- a/profiles/workspace/hyprland/default.nix +++ b/profiles/workspace/hyprland/default.nix @@ -195,6 +195,7 @@ in with config.deviceSpecific; with lib; { bind=${modifier},q,killactive, bind=${modifier},f,fullscreen,0 bind=${modifier}SHIFT,F,togglefloating, + bind=${modifier}CTRL,F,toggleopaque, bind=${modifier},left,movefocus,l bind=${modifier},right,movefocus,r bind=${modifier},up,movefocus,u @@ -324,6 +325,9 @@ in with config.deviceSpecific; with lib; { windowrule=opaque,virt-manager windowrule=opaque,^(.+WinBox.+)$ windowrule=tile,^(.+WinBox.+)$ + + windowrule=opaque,.*jellyfin.* + '' '' exec=${importGsettings} # exec-once=swayidle -w timeout 600 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' diff --git a/profiles/workspace/mako.nix b/profiles/workspace/mako.nix index 27d6a33..47e660c 100644 --- a/profiles/workspace/mako.nix +++ b/profiles/workspace/mako.nix @@ -7,7 +7,7 @@ WantedBy = [ "hyprland-session.target" ]; }; }; - programs.mako = with config.lib.base16; { + services.mako = with config.lib.base16; { enable = true; layer = "overlay"; font = "${theme.fonts.mono.family} ${theme.fontSizes.normal.str}"; diff --git a/profiles/workspace/misc.nix b/profiles/workspace/misc.nix index bcebfba..73c5aba 100644 --- a/profiles/workspace/misc.nix +++ b/profiles/workspace/misc.nix @@ -13,6 +13,7 @@ xdg.portal.extraPortals = [ pkgs.pass-secret-service ]; programs.ydotool.enable = true; + services.journald.extraConfig = "Compress=false"; home-manager.users.${config.mainuser} = { news.display = "silent";