From 77190240a54ceea76e484caf9a22c7f61d9e0d29 Mon Sep 17 00:00:00 2001 From: Asmir A Date: Sat, 28 Oct 2023 14:51:13 +0200 Subject: [PATCH 01/43] mediabox: limit systemd journal size --- mediabox/configuration.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mediabox/configuration.nix b/mediabox/configuration.nix index 81ea7e9..696f891 100644 --- a/mediabox/configuration.nix +++ b/mediabox/configuration.nix @@ -254,6 +254,14 @@ }; }; + journald.extraConfig = '' + SystemMaxUse=50M + ''; + + logind.extraConfig = '' + KillUserProcesses=yes + ''; + xserver = { enable = true; libinput.enable = true; From a307927cf3acbe56425402dd217a437aaf54bfca Mon Sep 17 00:00:00 2001 From: Asmir A Date: Sat, 28 Oct 2023 15:39:32 +0200 Subject: [PATCH 02/43] mediabox: add inputs to home-manager --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index f83dc1c..438a132 100644 --- a/flake.nix +++ b/flake.nix @@ -105,6 +105,7 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.users.akill = import ./home/home.nix; + home-manager.extraSpecialArgs = {inherit inputs;}; } peerix.nixosModules.peerix { From 27691ecf660b205a0ab343d3837682847ec5df5a Mon Sep 17 00:00:00 2001 From: Asmir A Date: Sat, 28 Oct 2023 15:44:09 +0200 Subject: [PATCH 03/43] readme: Add main repo URL --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 4ec9c62..81999af 100644 --- a/README.md +++ b/README.md @@ -1 +1,3 @@ NixOS configuration using nix flakes and home-manager + +Main repository found at: https://git.project-cloud.net/asmir/nixos\_flake\_config From b7c578c3043d56f45e3457fb051a72f6cfbe46b5 Mon Sep 17 00:00:00 2001 From: Asmir A Date: Sat, 28 Oct 2023 15:46:58 +0200 Subject: [PATCH 04/43] readme: change format from md to txt --- README.md => README.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename README.md => README.txt (100%) diff --git a/README.md b/README.txt similarity index 100% rename from README.md rename to README.txt From d0fb21119fca825217e1daec65485afc1b7826d5 Mon Sep 17 00:00:00 2001 From: Asmir A Date: Sat, 28 Oct 2023 15:47:25 +0200 Subject: [PATCH 05/43] readme: remove md escapes --- README.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.txt b/README.txt index 81999af..2cfe2fe 100644 --- a/README.txt +++ b/README.txt @@ -1,3 +1,3 @@ NixOS configuration using nix flakes and home-manager -Main repository found at: https://git.project-cloud.net/asmir/nixos\_flake\_config +Main repository found at: https://git.project-cloud.net/asmir/nixos_flake_config From cc74cb1484d3b5047d4590a33f6b8ee44f2fe642 Mon Sep 17 00:00:00 2001 From: Asmir A Date: Sat, 28 Oct 2023 16:33:45 +0200 Subject: [PATCH 06/43] nixy/configuration remove header --- nixy/configuration.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixy/configuration.nix b/nixy/configuration.nix index 92fedda..0fe0f7b 100644 --- a/nixy/configuration.nix +++ b/nixy/configuration.nix @@ -1,6 +1,3 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). { config, pkgs, From d5fbf61c34888a4f6394db41fee4949eb249a753 Mon Sep 17 00:00:00 2001 From: Asmir A Date: Sat, 28 Oct 2023 16:55:04 +0200 Subject: [PATCH 07/43] blue: remove header from configuration --- blue/configuration.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/blue/configuration.nix b/blue/configuration.nix index a92c14e..d4757d8 100644 --- a/blue/configuration.nix +++ b/blue/configuration.nix @@ -1,6 +1,3 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). { config, pkgs, From f4a7213057d680185342a4fc66135dda853d6154 Mon Sep 17 00:00:00 2001 From: Asmir A Date: Sat, 28 Oct 2023 18:11:08 +0200 Subject: [PATCH 08/43] home/git: add sign key and enable signing by default --- home/home.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/home.nix b/home/home.nix index aa0bbcb..6fe8b6d 100644 --- a/home/home.nix +++ b/home/home.nix @@ -168,6 +168,8 @@ with lib; { pull = {rebase = true;}; credential = {helper = "store";}; }; + signing.key = "020C42B7A9ABA3E2"; + signing.signByDefault = true; }; obs-studio = { From 5275d7a226498cd3ec6d6d02fa00b605e8695e85 Mon Sep 17 00:00:00 2001 From: Asmir A Date: Sat, 28 Oct 2023 23:45:13 +0200 Subject: [PATCH 09/43] packages: add zapzap flake --- packages/zapzap/.nixd.json | 1 + packages/zapzap/flake.lock | 27 +++++++++++++++++++++++++++ packages/zapzap/flake.nix | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+) create mode 120000 packages/zapzap/.nixd.json create mode 100644 packages/zapzap/flake.lock create mode 100644 packages/zapzap/flake.nix diff --git a/packages/zapzap/.nixd.json b/packages/zapzap/.nixd.json new file mode 120000 index 0000000..0a1dd46 --- /dev/null +++ b/packages/zapzap/.nixd.json @@ -0,0 +1 @@ +../../.nixd.json \ No newline at end of file diff --git a/packages/zapzap/flake.lock b/packages/zapzap/flake.lock new file mode 100644 index 0000000..721b11a --- /dev/null +++ b/packages/zapzap/flake.lock @@ -0,0 +1,27 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1698336494, + "narHash": "sha256-sO72WDBKyijYD1GcKPlGsycKbMBiTJMBCnmOxLAs880=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "808c0d8c53c7ae50f82aca8e7df263225cf235bf", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/packages/zapzap/flake.nix b/packages/zapzap/flake.nix new file mode 100644 index 0000000..01016bc --- /dev/null +++ b/packages/zapzap/flake.nix @@ -0,0 +1,38 @@ +{ + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + + outputs = inputs @ { + self, + nixpkgs, + }: let + supportedSystems = ["x86_64-linux" "aarch64-linux"]; + forAllSystems = nixpkgs.lib.genAttrs supportedSystems; + pkgs = forAllSystems (system: nixpkgs.legacyPackages.${system}); + in { + packages = forAllSystems (system: rec { + zapzap = pkgs.${system}.python3Packages.buildPythonPackage { + name = "zapzap"; + src = pkgs.${system}.fetchFromGitHub { + owner = "zapzap-linux"; + repo = "zapzap"; + rev = "5de4a4015128c164af3c964ecbe5b6358d98b521"; + hash = "sha256-bd3YcITK4lraOu7D/xZfnibilAZQZWqazVVtUwqJ4wc="; + }; + dontWrapQtApps = true; + propagatedBuildInputs = with pkgs.${system}.python3Packages; [pyqt6-webengine qt6.qtwayland qt6.qtsvg]; + nativeBuildInputs = with pkgs.${system}; [qt6.wrapQtAppsHook makeWrapper]; + env = { + HOME = "/tmp"; + }; + preFixup = '' + makeWrapperArgs+=( + # Force the app to use QT_PLUGIN_PATH values from wrapper + --unset QT_PLUGIN_PATH + "''${qtWrapperArgs[@]}" + ) + ''; + }; + default = zapzap; + }); + }; +} From 2c015fc1e6ac530c57a649ff278dfd8bb2c6369e Mon Sep 17 00:00:00 2001 From: Asmir A Date: Sun, 29 Oct 2023 00:41:21 +0200 Subject: [PATCH 10/43] packages/zapzap: remove flake from repo --- packages/zapzap/default.nix | 24 +++++++++++++++++++++++ packages/zapzap/flake.lock | 27 -------------------------- packages/zapzap/flake.nix | 38 ------------------------------------- 3 files changed, 24 insertions(+), 65 deletions(-) create mode 100644 packages/zapzap/default.nix delete mode 100644 packages/zapzap/flake.lock delete mode 100644 packages/zapzap/flake.nix diff --git a/packages/zapzap/default.nix b/packages/zapzap/default.nix new file mode 100644 index 0000000..86558fa --- /dev/null +++ b/packages/zapzap/default.nix @@ -0,0 +1,24 @@ +{pkgs}: { + zapzap = pkgs.python3Packages.buildPythonPackage { + name = "zapzap"; + src = pkgs.fetchFromGitHub { + owner = "zapzap-linux"; + repo = "zapzap"; + rev = "5de4a4015128c164af3c964ecbe5b6358d98b521"; + hash = "sha256-bd3YcITK4lraOu7D/xZfnibilAZQZWqazVVtUwqJ4wc="; + }; + dontWrapQtApps = true; + propagatedBuildInputs = with pkgs.python3Packages; [pyqt6-webengine qt6.qtwayland qt6.qtsvg]; + nativeBuildInputs = with pkgs; [qt6.wrapQtAppsHook makeWrapper]; + env = { + HOME = "/tmp"; + }; + preFixup = '' + makeWrapperArgs+=( + # Force the app to use QT_PLUGIN_PATH values from wrapper + --unset QT_PLUGIN_PATH + "''${qtWrapperArgs[@]}" + ) + ''; + }; +} diff --git a/packages/zapzap/flake.lock b/packages/zapzap/flake.lock deleted file mode 100644 index 721b11a..0000000 --- a/packages/zapzap/flake.lock +++ /dev/null @@ -1,27 +0,0 @@ -{ - "nodes": { - "nixpkgs": { - "locked": { - "lastModified": 1698336494, - "narHash": "sha256-sO72WDBKyijYD1GcKPlGsycKbMBiTJMBCnmOxLAs880=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "808c0d8c53c7ae50f82aca8e7df263225cf235bf", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "nixpkgs": "nixpkgs" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/packages/zapzap/flake.nix b/packages/zapzap/flake.nix deleted file mode 100644 index 01016bc..0000000 --- a/packages/zapzap/flake.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - - outputs = inputs @ { - self, - nixpkgs, - }: let - supportedSystems = ["x86_64-linux" "aarch64-linux"]; - forAllSystems = nixpkgs.lib.genAttrs supportedSystems; - pkgs = forAllSystems (system: nixpkgs.legacyPackages.${system}); - in { - packages = forAllSystems (system: rec { - zapzap = pkgs.${system}.python3Packages.buildPythonPackage { - name = "zapzap"; - src = pkgs.${system}.fetchFromGitHub { - owner = "zapzap-linux"; - repo = "zapzap"; - rev = "5de4a4015128c164af3c964ecbe5b6358d98b521"; - hash = "sha256-bd3YcITK4lraOu7D/xZfnibilAZQZWqazVVtUwqJ4wc="; - }; - dontWrapQtApps = true; - propagatedBuildInputs = with pkgs.${system}.python3Packages; [pyqt6-webengine qt6.qtwayland qt6.qtsvg]; - nativeBuildInputs = with pkgs.${system}; [qt6.wrapQtAppsHook makeWrapper]; - env = { - HOME = "/tmp"; - }; - preFixup = '' - makeWrapperArgs+=( - # Force the app to use QT_PLUGIN_PATH values from wrapper - --unset QT_PLUGIN_PATH - "''${qtWrapperArgs[@]}" - ) - ''; - }; - default = zapzap; - }); - }; -} From 33fffd5f92c41f3af99a3547e15151afa48bcd49 Mon Sep 17 00:00:00 2001 From: Asmir A Date: Sun, 29 Oct 2023 00:41:39 +0200 Subject: [PATCH 11/43] packages/zapzap: add derivation --- packages/zapzap/default.nix | 43 ++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/packages/zapzap/default.nix b/packages/zapzap/default.nix index 86558fa..37155fc 100644 --- a/packages/zapzap/default.nix +++ b/packages/zapzap/default.nix @@ -1,24 +1,23 @@ -{pkgs}: { - zapzap = pkgs.python3Packages.buildPythonPackage { - name = "zapzap"; - src = pkgs.fetchFromGitHub { - owner = "zapzap-linux"; - repo = "zapzap"; - rev = "5de4a4015128c164af3c964ecbe5b6358d98b521"; - hash = "sha256-bd3YcITK4lraOu7D/xZfnibilAZQZWqazVVtUwqJ4wc="; - }; - dontWrapQtApps = true; - propagatedBuildInputs = with pkgs.python3Packages; [pyqt6-webengine qt6.qtwayland qt6.qtsvg]; - nativeBuildInputs = with pkgs; [qt6.wrapQtAppsHook makeWrapper]; - env = { - HOME = "/tmp"; - }; - preFixup = '' - makeWrapperArgs+=( - # Force the app to use QT_PLUGIN_PATH values from wrapper - --unset QT_PLUGIN_PATH - "''${qtWrapperArgs[@]}" - ) - ''; +{pkgs}: +pkgs.python3Packages.buildPythonPackage { + name = "zapzap"; + src = pkgs.fetchFromGitHub { + owner = "zapzap-linux"; + repo = "zapzap"; + rev = "5de4a4015128c164af3c964ecbe5b6358d98b521"; + hash = "sha256-bd3YcITK4lraOu7D/xZfnibilAZQZWqazVVtUwqJ4wc="; }; + dontWrapQtApps = true; + propagatedBuildInputs = with pkgs.python3Packages; [pyqt6-webengine qt6.qtwayland qt6.qtsvg]; + nativeBuildInputs = with pkgs; [qt6.wrapQtAppsHook makeWrapper]; + env = { + HOME = "/tmp"; + }; + preFixup = '' + makeWrapperArgs+=( + # Force the app to use QT_PLUGIN_PATH values from wrapper + --unset QT_PLUGIN_PATH + "''${qtWrapperArgs[@]}" + ) + ''; } From b7b2d5fc729bbd84d27b8726d5c8c5f69a80f6a2 Mon Sep 17 00:00:00 2001 From: Asmir A Date: Sun, 29 Oct 2023 00:42:00 +0200 Subject: [PATCH 12/43] home/packages: add zapzap --- home/home_packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/home/home_packages.nix b/home/home_packages.nix index e830493..cae531b 100644 --- a/home/home_packages.nix +++ b/home/home_packages.nix @@ -83,7 +83,9 @@ zig zls - /* install here until nvim flake is fixed */ + /* + install here until nvim flake is fixed + */ alejandra ccls gopls @@ -101,5 +103,6 @@ ++ [ inputs.swaysw.packages.x86_64-linux.swaysw inputs.nvim.packages.x86_64-linux.nvim + (import ../packages/zapzap/default.nix {inherit pkgs;}) ]; } From 4613b2650337ce150d66dbba06509925814cb67a Mon Sep 17 00:00:00 2001 From: Asmir A Date: Sun, 29 Oct 2023 00:59:12 +0200 Subject: [PATCH 13/43] home/sway: switch whatsapp-for-linux with zapzap --- home/sway.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/sway.nix b/home/sway.nix index 3c9dda4..f9001f0 100644 --- a/home/sway.nix +++ b/home/sway.nix @@ -18,7 +18,7 @@ window.commands = [ { command = "move scratchpad, resize set 1152 648"; - criteria = {app_id = "pulsemixer|python3|whatsapp-for-linux|com.viber.Viber";}; + criteria = {app_id = "pulsemixer|python3|com.rtosta.zapzap|whatsapp-for-linux|com.viber.Viber";}; } { command = "move scratchpad, resize set 1502 845"; @@ -106,7 +106,7 @@ "Mod4+l" = '' exec swaymsg [app_id="python3"] scratchpad show || exec foot -a python3 python3''; - "Mod4+h" = "exec swaymsg [app_id=whatsapp-for-linux] scratchpad show || exec whatsapp-for-linux"; + "Mod4+h" = "exec swaymsg [app_id=com.rtosta.zapzap] scratchpad show || exec zapzap"; "Mod4+j" = "exec swaymsg [app_id=com.viber.Viber] scratchpad show"; "Mod4+y" = '' exec swaymsg [app_id="pulsemixer"] scratchpad show || exec foot -a pulsemixer pulsemixer''; From 5f57ca4b79e0a659224a6e4232f063195d316e3e Mon Sep 17 00:00:00 2001 From: Asmir A Date: Sun, 29 Oct 2023 12:15:51 +0100 Subject: [PATCH 14/43] packages/viber: add derivation --- home/sway.nix | 6 +- packages/viber/default.nix | 155 +++++++++++++++++++++++++++++++++++++ 2 files changed, 158 insertions(+), 3 deletions(-) create mode 100644 packages/viber/default.nix diff --git a/home/sway.nix b/home/sway.nix index f9001f0..8c3d810 100644 --- a/home/sway.nix +++ b/home/sway.nix @@ -18,11 +18,11 @@ window.commands = [ { command = "move scratchpad, resize set 1152 648"; - criteria = {app_id = "pulsemixer|python3|com.rtosta.zapzap|whatsapp-for-linux|com.viber.Viber";}; + criteria = {app_id = "pulsemixer|python3|com.rtosta.zapzap|whatsapp-for-linux|com.viber";}; } { command = "move scratchpad, resize set 1502 845"; - criteria = {class = "ViberPC";}; + criteria = {app_id = "com.viber";}; } { command = "floating enable"; @@ -107,7 +107,7 @@ "Mod4+l" = '' exec swaymsg [app_id="python3"] scratchpad show || exec foot -a python3 python3''; "Mod4+h" = "exec swaymsg [app_id=com.rtosta.zapzap] scratchpad show || exec zapzap"; - "Mod4+j" = "exec swaymsg [app_id=com.viber.Viber] scratchpad show"; + "Mod4+j" = "exec swaymsg [app_id=com.viber] scratchpad show || exec viber"; "Mod4+y" = '' exec swaymsg [app_id="pulsemixer"] scratchpad show || exec foot -a pulsemixer pulsemixer''; diff --git a/packages/viber/default.nix b/packages/viber/default.nix new file mode 100644 index 0000000..6907f17 --- /dev/null +++ b/packages/viber/default.nix @@ -0,0 +1,155 @@ +{ + alsa-lib, + brotli, + cups, + curl, + dbus, + dpkg, + expat, + fetchurl, + fontconfig, + freetype, + glib, + gst_all_1, + harfbuzz, + krb5, + lcms, + lib, + libcap, + libevent, + libGL, + libGLU, + libopus, + libpulseaudio, + libwebp, + libxkbcommon, + libxml2, + libxslt, + makeWrapper, + mesa, + nspr, + nss, + openssl, + snappy, + stdenv, + systemd, + wayland, + xorg, + zlib, + zstd, + ... +}: +stdenv.mkDerivation { + pname = "viber"; + version = "21.0.0.1"; + + src = fetchurl { + # Official link: https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb + url = "https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb"; + sha256 = "0q34mwbk0i2vj2f16hk7pyshl8fqwym3lyr7iss22qw8cxx3mcg3"; + }; + + nativeBuildInputs = [makeWrapper]; + buildInputs = [dpkg]; + + dontUnpack = true; + + libPath = lib.makeLibraryPath [ + alsa-lib + brotli + cups + curl + dbus + expat + fontconfig + freetype + glib + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-base + gst_all_1.gstreamer + harfbuzz + krb5 + lcms + libcap + libevent + libGLU + libGL + libopus + libpulseaudio + libwebp + libxkbcommon + libxml2 + libxslt + mesa + nspr + nss + openssl + snappy + stdenv.cc.cc + systemd + wayland + zlib + zstd + + xorg.libICE + xorg.libSM + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXScrnSaver + xorg.libXtst + xorg.xcbutilimage + xorg.xcbutilkeysyms + xorg.xcbutilrenderutil + xorg.xcbutilwm + xorg.libxkbfile + ]; + + installPhase = '' + dpkg-deb -x $src $out + mkdir -p $out/bin + + # Soothe nix-build "suspicions" + chmod -R g-w $out + + for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true + patchelf --set-rpath $libPath:$out/opt/viber/lib $file || true + done + + # qt.conf is not working, so override everything using environment variables + wrapProgram $out/opt/viber/Viber \ + --set QT_PLUGIN_PATH "$out/opt/viber/plugins" \ + --set QT_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" \ + --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" \ + --set QML2_IMPORT_PATH "$out/opt/viber/qml" + ln -s $out/opt/viber/Viber $out/bin/viber + + mv $out/usr/share $out/share + rm -rf $out/usr + + # Fix the desktop link + substituteInPlace $out/share/applications/viber.desktop \ + --replace /opt/viber/Viber $out/opt/viber/Viber \ + --replace /usr/share/ $out/share/ + ''; + + dontStrip = true; + dontPatchELF = true; + + meta = { + homepage = "https://www.viber.com"; + description = "An instant messaging and Voice over IP (VoIP) app"; + sourceProvenance = with lib.sourceTypes; [binaryNativeCode]; + license = lib.licenses.unfree; + platforms = ["x86_64-linux"]; + maintainers = with lib.maintainers; [jagajaga]; + }; +} From 65caa07dc025c1251da0467ee0d2e678d3b65681 Mon Sep 17 00:00:00 2001 From: Asmir A Date: Sun, 29 Oct 2023 14:34:10 +0100 Subject: [PATCH 15/43] home/sway: replace swaybar with waybar --- home/sway.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/home/sway.nix b/home/sway.nix index 8c3d810..51e70a5 100644 --- a/home/sway.nix +++ b/home/sway.nix @@ -52,13 +52,7 @@ bars = [ { - position = "top"; - fonts = { - names = ["Iosevka" "FontAwesome"]; - style = "Bold Semi-Condensed"; - size = 12.0; - }; - statusCommand = "i3status-rs ~/.config/i3status-rust/config-top.toml"; + command = "${pkgs.waybar}/bin/waybar"; } ]; From 9d7436939b6a9e98030d2a9afd0e2167f690ce28 Mon Sep 17 00:00:00 2001 From: Asmir A Date: Sun, 29 Oct 2023 14:34:21 +0100 Subject: [PATCH 16/43] home/packages: add viber --- home/home_packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/home_packages.nix b/home/home_packages.nix index cae531b..a04a04b 100644 --- a/home/home_packages.nix +++ b/home/home_packages.nix @@ -104,5 +104,6 @@ inputs.swaysw.packages.x86_64-linux.swaysw inputs.nvim.packages.x86_64-linux.nvim (import ../packages/zapzap/default.nix {inherit pkgs;}) + (pkgs.callPackage ../packages/viber/default.nix {}) ]; } From 60e18856a7f5eacb483dbb30ec34415d311aa1ca Mon Sep 17 00:00:00 2001 From: Asmir A Date: Sun, 29 Oct 2023 14:34:52 +0100 Subject: [PATCH 17/43] packages/viber: add webarchive url instead of direct link --- packages/viber/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/viber/default.nix b/packages/viber/default.nix index 6907f17..1f58ce0 100644 --- a/packages/viber/default.nix +++ b/packages/viber/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { src = fetchurl { # Official link: https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb - url = "https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb"; + url = "https://web.archive.org/web/20230906015353if_/https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb"; sha256 = "0q34mwbk0i2vj2f16hk7pyshl8fqwym3lyr7iss22qw8cxx3mcg3"; }; From 99699ca2de1726c16a5292d4380cf2cced42db97 Mon Sep 17 00:00:00 2001 From: Asmir A Date: Sun, 29 Oct 2023 18:41:23 +0100 Subject: [PATCH 18/43] Revert "home/sway: replace swaybar with waybar" This reverts commit 65caa07dc025c1251da0467ee0d2e678d3b65681. --- home/sway.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/home/sway.nix b/home/sway.nix index 51e70a5..8c3d810 100644 --- a/home/sway.nix +++ b/home/sway.nix @@ -52,7 +52,13 @@ bars = [ { - command = "${pkgs.waybar}/bin/waybar"; + position = "top"; + fonts = { + names = ["Iosevka" "FontAwesome"]; + style = "Bold Semi-Condensed"; + size = 12.0; + }; + statusCommand = "i3status-rs ~/.config/i3status-rust/config-top.toml"; } ]; From 6ddeed17ac83455ce0d34236457c8388a71c55c1 Mon Sep 17 00:00:00 2001 From: Asmir A Date: Mon, 30 Oct 2023 17:18:33 +0100 Subject: [PATCH 19/43] home/packages: add inkscape --- home/home_packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/home_packages.nix b/home/home_packages.nix index a04a04b..0b45adf 100644 --- a/home/home_packages.nix +++ b/home/home_packages.nix @@ -33,6 +33,7 @@ hyperfine imagemagick imv + inkscape jellyfin-media-player kdenlive kicad From 9c77a6775b77474d2ab4ff5a954cbbef46df9091 Mon Sep 17 00:00:00 2001 From: Asmir A Date: Mon, 30 Oct 2023 20:24:43 +0100 Subject: [PATCH 20/43] home/packages: add ghostscript and poppler_utils --- home/home_packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/home_packages.nix b/home/home_packages.nix index 0b45adf..bf6f626 100644 --- a/home/home_packages.nix +++ b/home/home_packages.nix @@ -25,6 +25,7 @@ firefox gcc gdb + ghostscript glab glaxnimate gnumake @@ -53,6 +54,7 @@ patchelf pavucontrol pirate-get + poppler_utils powertop pulsemixer python3 From 139b48e84b556e99b78f514bcce92b86faf6f4fa Mon Sep 17 00:00:00 2001 From: Asmir A Date: Mon, 30 Oct 2023 23:58:31 +0100 Subject: [PATCH 21/43] home/packages: add tea --- home/home_packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/home_packages.nix b/home/home_packages.nix index bf6f626..4c91653 100644 --- a/home/home_packages.nix +++ b/home/home_packages.nix @@ -68,6 +68,7 @@ sioyek skypeforlinux slurp + tea texlive.combined.scheme-full thunderbird upx From fb4cf114487b00dfdb22aae0433cd5f63c7e4961 Mon Sep 17 00:00:00 2001 From: Asmir A Date: Mon, 30 Oct 2023 23:58:49 +0100 Subject: [PATCH 22/43] nixy/nix: enable sandbox --- nixy/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixy/configuration.nix b/nixy/configuration.nix index 0fe0f7b..e16b629 100644 --- a/nixy/configuration.nix +++ b/nixy/configuration.nix @@ -26,6 +26,7 @@ gc.options = "--delete-older-than 7d"; package = pkgs.nixUnstable; settings = { + sandbox = true; experimental-features = ["nix-command" "flakes"]; }; }; From ee5102e9596aed681297d5611e0bba83d9ee3723 Mon Sep 17 00:00:00 2001 From: Asmir A Date: Tue, 31 Oct 2023 19:41:46 +0100 Subject: [PATCH 23/43] home/zsh: update prompt --- home/zsh.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/zsh.nix b/home/zsh.nix index a444e2b..4ba9c48 100644 --- a/home/zsh.nix +++ b/home/zsh.nix @@ -52,8 +52,8 @@ src = pkgs.fetchFromGitHub { owner = "sindresorhus"; repo = "pure"; - rev = "47c0c881f0e7cfdb5eaccd335f52ad17b897c060"; - sha256 = "15xdhi72pq88ls5gx1h0k23jvb41j6kq6ar17dqmd5d38zsgwl3v"; + rev = "87e6f5dd4c793f6d980532205aaefe196780606f"; + hash = "sha256-TR4CyBZ+KoZRs9XDmWE5lJuUXXU1J8E2Z63nt+FS+5w="; }; file = "pure.plugin.zsh"; } From 9f958a5643bc175354ed80d50d66ad1e31a7c3c6 Mon Sep 17 00:00:00 2001 From: Asmir A Date: Tue, 31 Oct 2023 21:22:47 +0100 Subject: [PATCH 24/43] home/gpg: set pinentry to curses --- home/home.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/home.nix b/home/home.nix index 6fe8b6d..4a20c57 100644 --- a/home/home.nix +++ b/home/home.nix @@ -199,6 +199,7 @@ with lib; { enable = true; defaultCacheTtl = 1800; enableSshSupport = true; + pinentryFlavor = "curses"; }; swayidle = { From b2b5a9564c4ccb7cb5b17a996527f15dd1126934 Mon Sep 17 00:00:00 2001 From: Asmir A Date: Tue, 31 Oct 2023 21:23:16 +0100 Subject: [PATCH 25/43] nixy/environment: remove SSH_ASKPASS from env --- nixy/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixy/configuration.nix b/nixy/configuration.nix index e16b629..c4c87ec 100644 --- a/nixy/configuration.nix +++ b/nixy/configuration.nix @@ -108,6 +108,9 @@ nixpkgs.config.allowUnfree = true; nixpkgs.overlays = [nix-xilinx.overlay]; environment = { + extraInit = '' + unset -v SSH_ASKPASS + ''; homeBinInPath = true; variables = { PATH = "$HOME/.cargo/bin"; From 036ffda2f8ef57a37c1e7f56560a7df2818bc23e Mon Sep 17 00:00:00 2001 From: Asmir A Date: Thu, 2 Nov 2023 13:46:30 +0100 Subject: [PATCH 26/43] nixy/fs: change fs uuid --- nixy/hardware-configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixy/hardware-configuration.nix b/nixy/hardware-configuration.nix index 4ea5a4b..6314279 100644 --- a/nixy/hardware-configuration.nix +++ b/nixy/hardware-configuration.nix @@ -55,7 +55,7 @@ }; fileSystems."/opt/xilinx" = { - device = "/dev/disk/by-uuid/09912fb9-0284-4b4e-add1-d4a27329539f"; + device = "/dev/disk/by-uuid/f5c27ef2-8053-4d96-9f8f-c6a50d6193b9"; fsType = "erofs"; }; From 641bed9cad2c6a52ae98b304ac8788cf8229b098 Mon Sep 17 00:00:00 2001 From: Asmir A Date: Thu, 2 Nov 2023 13:47:55 +0100 Subject: [PATCH 27/43] packages: add dtach, tmux --- common/packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/packages.nix b/common/packages.nix index e73131c..a7c6bdb 100644 --- a/common/packages.nix +++ b/common/packages.nix @@ -17,6 +17,7 @@ direnv dmidecode dnsmasq + dtach fd file fzf @@ -55,6 +56,7 @@ strace swaylock tig + tmux traceroute unrar unzip From ef5dd97e8f79594d4b2160b758c43aec7dc0049c Mon Sep 17 00:00:00 2001 From: Asmir A Date: Thu, 2 Nov 2023 13:48:09 +0100 Subject: [PATCH 28/43] flake: update nvim --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 75cc969..14e8a1d 100644 --- a/flake.lock +++ b/flake.lock @@ -192,11 +192,11 @@ ] }, "locked": { - "lastModified": 1698363600, - "narHash": "sha256-r71uS/uw3I9xJAnmlgaN0TC9aC/1m2L4iNhKjqBzAtQ=", + "lastModified": 1698783626, + "narHash": "sha256-esHANPDZbeIiBlXdFjBXpalHzSgtn+2TOmUa76dE6us=", "ref": "refs/heads/master", - "rev": "9652f4cb75d799ee5a2511883d2fda60bea00141", - "revCount": 19, + "rev": "b660608fb3ff05e1ba88222d2e8d16a8ca5e580e", + "revCount": 20, "type": "git", "url": "https://git.project-cloud.net/asmir/nvim_flake" }, From 3106fe565d49a56d6d74492133f47b913b6e637a Mon Sep 17 00:00:00 2001 From: Asmir A Date: Thu, 2 Nov 2023 14:32:57 +0100 Subject: [PATCH 29/43] flake: update --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 14e8a1d..78987c3 100644 --- a/flake.lock +++ b/flake.lock @@ -89,11 +89,11 @@ ] }, "locked": { - "lastModified": 1698250431, - "narHash": "sha256-qs2gTeH4wpnWPO6Oi6sOhp2IhG0i0DzcnrJxIY3/CP8=", + "lastModified": 1698873617, + "narHash": "sha256-FfGFcfbULwbK1vD+H0rslIOfmy4g8f2hXiPkQG3ZCTk=", "owner": "nix-community", "repo": "home-manager", - "rev": "09587fbbc6a669f7725613e044c2577dc5d43ab5", + "rev": "48b0a30202516e25d9885525fbb200a045f23f26", "type": "github" }, "original": { @@ -125,11 +125,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1697723726, - "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", + "lastModified": 1698611440, + "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", + "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735", "type": "github" }, "original": { @@ -171,11 +171,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1697929210, - "narHash": "sha256-RkQZif6QhswEwv7484mrKfIU8XmIWm+ED6llbr4IyxM=", + "lastModified": 1698544399, + "narHash": "sha256-vhRmPyEyoPkrXF2iykBsWHA05MIaOSmMRLMF7Hul6+s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fb000224952bf7749a9e8b3779104ef7ea4465c8", + "rev": "d87c5d8c41c9b3b39592563242f3a448b5cc4bc9", "type": "github" }, "original": { @@ -273,11 +273,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1697943852, - "narHash": "sha256-DaBxUPaZhQ3yLCmAATshYB7qo7NwcMvSFWz9T3bjYYY=", + "lastModified": 1698929376, + "narHash": "sha256-TmROaV9W6HArdTUgxLN334Kw+CradxWHw1HYM/3H6xI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "30a0ba4a20703b4bfe047fe5def1fc24978e322c", + "rev": "84d6b27dc71ac02422e192c35806d06915d2bf67", "type": "github" }, "original": { From d720a9cefbd7efeb0b7482572b3437a8b1a1e79e Mon Sep 17 00:00:00 2001 From: Asmir A Date: Thu, 2 Nov 2023 15:44:10 +0100 Subject: [PATCH 30/43] home/packages: temporary disable glaxnimate --- home/home_packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/home_packages.nix b/home/home_packages.nix index 4c91653..e532fb7 100644 --- a/home/home_packages.nix +++ b/home/home_packages.nix @@ -27,7 +27,7 @@ gdb ghostscript glab - glaxnimate + /*glaxnimate*/ gnumake go grim From 747d488bfbd9086bc8758b9e1ed4271013aae0e2 Mon Sep 17 00:00:00 2001 From: Asmir A Date: Thu, 2 Nov 2023 16:28:16 +0100 Subject: [PATCH 31/43] packages/viber: add direct link as archive.org is slow atm --- packages/viber/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/viber/default.nix b/packages/viber/default.nix index 1f58ce0..6907f17 100644 --- a/packages/viber/default.nix +++ b/packages/viber/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { src = fetchurl { # Official link: https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb - url = "https://web.archive.org/web/20230906015353if_/https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb"; + url = "https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb"; sha256 = "0q34mwbk0i2vj2f16hk7pyshl8fqwym3lyr7iss22qw8cxx3mcg3"; }; From 4ce7d3fc892dbded6cd4129ba3b9c168a574d335 Mon Sep 17 00:00:00 2001 From: Asmir A Date: Thu, 2 Nov 2023 17:01:04 +0100 Subject: [PATCH 32/43] Revert "flake: update" This reverts commit 3106fe565d49a56d6d74492133f47b913b6e637a. --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 78987c3..14e8a1d 100644 --- a/flake.lock +++ b/flake.lock @@ -89,11 +89,11 @@ ] }, "locked": { - "lastModified": 1698873617, - "narHash": "sha256-FfGFcfbULwbK1vD+H0rslIOfmy4g8f2hXiPkQG3ZCTk=", + "lastModified": 1698250431, + "narHash": "sha256-qs2gTeH4wpnWPO6Oi6sOhp2IhG0i0DzcnrJxIY3/CP8=", "owner": "nix-community", "repo": "home-manager", - "rev": "48b0a30202516e25d9885525fbb200a045f23f26", + "rev": "09587fbbc6a669f7725613e044c2577dc5d43ab5", "type": "github" }, "original": { @@ -125,11 +125,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1698611440, - "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=", + "lastModified": 1697723726, + "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735", + "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", "type": "github" }, "original": { @@ -171,11 +171,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1698544399, - "narHash": "sha256-vhRmPyEyoPkrXF2iykBsWHA05MIaOSmMRLMF7Hul6+s=", + "lastModified": 1697929210, + "narHash": "sha256-RkQZif6QhswEwv7484mrKfIU8XmIWm+ED6llbr4IyxM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d87c5d8c41c9b3b39592563242f3a448b5cc4bc9", + "rev": "fb000224952bf7749a9e8b3779104ef7ea4465c8", "type": "github" }, "original": { @@ -273,11 +273,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1698929376, - "narHash": "sha256-TmROaV9W6HArdTUgxLN334Kw+CradxWHw1HYM/3H6xI=", + "lastModified": 1697943852, + "narHash": "sha256-DaBxUPaZhQ3yLCmAATshYB7qo7NwcMvSFWz9T3bjYYY=", "owner": "Mic92", "repo": "sops-nix", - "rev": "84d6b27dc71ac02422e192c35806d06915d2bf67", + "rev": "30a0ba4a20703b4bfe047fe5def1fc24978e322c", "type": "github" }, "original": { From 70efe40a809c3d40869159cbd1c90a4e39409f65 Mon Sep 17 00:00:00 2001 From: Asmir A Date: Fri, 3 Nov 2023 00:37:32 +0100 Subject: [PATCH 33/43] packages: add bubblewrap with overlay patches --- home/home_packages.nix | 1 + packages/bubblewrap/default.nix | 56 +++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 packages/bubblewrap/default.nix diff --git a/home/home_packages.nix b/home/home_packages.nix index e532fb7..d790b4e 100644 --- a/home/home_packages.nix +++ b/home/home_packages.nix @@ -109,5 +109,6 @@ inputs.nvim.packages.x86_64-linux.nvim (import ../packages/zapzap/default.nix {inherit pkgs;}) (pkgs.callPackage ../packages/viber/default.nix {}) + (pkgs.callPackage ../packages/bubblewrap/default.nix {}) ]; } diff --git a/packages/bubblewrap/default.nix b/packages/bubblewrap/default.nix new file mode 100644 index 0000000..44645bd --- /dev/null +++ b/packages/bubblewrap/default.nix @@ -0,0 +1,56 @@ +{ + lib, + stdenv, + fetchFromGitHub, + docbook_xsl, + libxslt, + meson, + ninja, + pkg-config, + bash-completion, + libcap, + libselinux, +}: +stdenv.mkDerivation rec { + pname = "bubblewrap"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "rhendric"; + repo = "bubblewrap"; + rev = "23ff0f875b3a0200c1796daa01173ecec7deaf88"; + hash = "sha256-EWsuAGsShaHEmLi0jUHX2bFQZkinIOsRbgB7tZSfq8E="; + }; + + postPatch = '' + substituteInPlace tests/libtest.sh \ + --replace "/var/tmp" "$TMPDIR" + ''; + + nativeBuildInputs = [ + docbook_xsl + libxslt + meson + ninja + pkg-config + ]; + + buildInputs = [ + bash-completion + libcap + libselinux + ]; + + # incompatible with Nix sandbox + doCheck = false; + + meta = with lib; { + changelog = "https://github.com/containers/bubblewrap/releases/tag/${src.rev}"; + description = "Unprivileged sandboxing tool"; + homepage = "https://github.com/containers/bubblewrap"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [dotlambda]; + platforms = platforms.linux; + mainProgram = "bwrap"; + }; +} From 3d2d8ea2745ebb313d1e3190ca1bf7a9c36a6577 Mon Sep 17 00:00:00 2001 From: Asmir A Date: Fri, 3 Nov 2023 00:38:02 +0100 Subject: [PATCH 34/43] viber: wrap with bubblewrap to disable $HOME access --- packages/viber/default.nix | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/packages/viber/default.nix b/packages/viber/default.nix index 6907f17..2a61ad4 100644 --- a/packages/viber/default.nix +++ b/packages/viber/default.nix @@ -3,6 +3,9 @@ brotli, cups, curl, + bubblewrap, + bash, + writeShellScriptBin, dbus, dpkg, expat, @@ -112,7 +115,16 @@ stdenv.mkDerivation { xorg.libxkbfile ]; - installPhase = '' + installPhase = let + viberWrap = writeShellScriptBin "viberWrap" '' + ${bubblewrap}/bin/bwrap --bind / / \ + --dev /dev \ + --tmpfs $HOME \ + --bind $HOME/.ViberPC/ $HOME/.ViberPC \ + --bind $HOME/Downloads/ $HOME/Downloads \ + $@ + ''; + in '' dpkg-deb -x $src $out mkdir -p $out/bin @@ -130,7 +142,10 @@ stdenv.mkDerivation { --set QT_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" \ --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" \ --set QML2_IMPORT_PATH "$out/opt/viber/qml" - ln -s $out/opt/viber/Viber $out/bin/viber + + echo "#!${bash}/bin/bash" > $out/bin/viber + echo "${viberWrap}/bin/viberWrap $out/opt/viber/Viber" >> $out/bin/viber + chmod +x $out/bin/viber mv $out/usr/share $out/share rm -rf $out/usr @@ -140,7 +155,6 @@ stdenv.mkDerivation { --replace /opt/viber/Viber $out/opt/viber/Viber \ --replace /usr/share/ $out/share/ ''; - dontStrip = true; dontPatchELF = true; From 2cc745ea2683889c0eb51b3fc937293154cb5094 Mon Sep 17 00:00:00 2001 From: Asmir A Date: Fri, 3 Nov 2023 12:39:24 +0100 Subject: [PATCH 35/43] home/qutebrowser: temporary fix where qutebrowser hangs with vulkan enabled --- home/home.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/home.nix b/home/home.nix index 4a20c57..0d54321 100644 --- a/home/home.nix +++ b/home/home.nix @@ -126,7 +126,7 @@ with lib; { qutebrowser = { enable = true; - package = pkgs.qutebrowser; + package = pkgs.qutebrowser.override { enableVulkan = false; }; keyBindings = { normal = { "j" = "scroll-px 0 25"; From b432b209c317d138460ac6b07642e03e3e8dbca3 Mon Sep 17 00:00:00 2001 From: Asmir A Date: Sat, 4 Nov 2023 10:23:36 +0100 Subject: [PATCH 36/43] nixy/kernel: temporary fix for console issue --- nixy/configuration.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/nixy/configuration.nix b/nixy/configuration.nix index c4c87ec..9c9efca 100644 --- a/nixy/configuration.nix +++ b/nixy/configuration.nix @@ -47,6 +47,19 @@ readOnlyNixStore = true; supportedFilesystems = ["btrfs"]; tmp.useTmpfs = true; + + kernelPatches = let + inherit (lib.kernel) yes; + in [ + { + name = "264832"; + patch = null; + extraStructuredConfig = { + FRAMEBUFFER_CONSOLE_DETECT_PRIMARY = yes; + DRM_FBDEV_EMULATION = yes; + }; + } + ]; }; security = { From bb306d3145bee6d13ca14102e50040d20c9d6d9b Mon Sep 17 00:00:00 2001 From: Asmir A Date: Sat, 4 Nov 2023 10:23:49 +0100 Subject: [PATCH 37/43] flake: update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 14e8a1d..d43f489 100644 --- a/flake.lock +++ b/flake.lock @@ -19,11 +19,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -89,11 +89,11 @@ ] }, "locked": { - "lastModified": 1698250431, - "narHash": "sha256-qs2gTeH4wpnWPO6Oi6sOhp2IhG0i0DzcnrJxIY3/CP8=", + "lastModified": 1698896213, + "narHash": "sha256-u42NZt52F3o7pM5V7sYlLOp5tSN8z9+fO2wFcOs0EOQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "09587fbbc6a669f7725613e044c2577dc5d43ab5", + "rev": "831b4fa31749208e576050c563e9773aafd04941", "type": "github" }, "original": { @@ -110,11 +110,11 @@ ] }, "locked": { - "lastModified": 1696069591, - "narHash": "sha256-YFPEWMV6XRi7CgDB1qJ67dIYPnrOETuxQO4mnPmxbQs=", + "lastModified": 1699035130, + "narHash": "sha256-emK4aJCC2gW94b2P3N2LjkQ6PEMLUcDduVWwYQ7aq+o=", "owner": "asmir.abdulahovic", "repo": "nix-xilinx", - "rev": "a20ac5924afa24d45227df7d7d54574a9409a4a6", + "rev": "0323990db46c32e361e4fd70600d859eb90862af", "type": "gitlab" }, "original": { @@ -125,11 +125,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1697723726, - "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", + "lastModified": 1698924604, + "narHash": "sha256-GCFbkl2tj8fEZBZCw3Tc0AkGo0v+YrQlohhEGJ/X4s0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", + "rev": "fa804edfb7869c9fb230e174182a8a1a7e512c40", "type": "github" }, "original": { @@ -171,11 +171,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1697929210, - "narHash": "sha256-RkQZif6QhswEwv7484mrKfIU8XmIWm+ED6llbr4IyxM=", + "lastModified": 1698544399, + "narHash": "sha256-vhRmPyEyoPkrXF2iykBsWHA05MIaOSmMRLMF7Hul6+s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fb000224952bf7749a9e8b3779104ef7ea4465c8", + "rev": "d87c5d8c41c9b3b39592563242f3a448b5cc4bc9", "type": "github" }, "original": { @@ -273,11 +273,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1697943852, - "narHash": "sha256-DaBxUPaZhQ3yLCmAATshYB7qo7NwcMvSFWz9T3bjYYY=", + "lastModified": 1698929376, + "narHash": "sha256-TmROaV9W6HArdTUgxLN334Kw+CradxWHw1HYM/3H6xI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "30a0ba4a20703b4bfe047fe5def1fc24978e322c", + "rev": "84d6b27dc71ac02422e192c35806d06915d2bf67", "type": "github" }, "original": { From 5025dd2571f1868834c6a176a61b0721bd39280b Mon Sep 17 00:00:00 2001 From: Asmir A Date: Sat, 4 Nov 2023 10:26:23 +0100 Subject: [PATCH 38/43] mediabox/kernel: temporary fix for console issue --- mediabox/configuration.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/mediabox/configuration.nix b/mediabox/configuration.nix index 696f891..0979153 100644 --- a/mediabox/configuration.nix +++ b/mediabox/configuration.nix @@ -45,6 +45,19 @@ readOnlyNixStore = true; supportedFilesystems = ["btrfs"]; tmp.useTmpfs = true; + + kernelPatches = let + inherit (lib.kernel) yes; + in [ + { + name = "264832"; + patch = null; + extraStructuredConfig = { + FRAMEBUFFER_CONSOLE_DETECT_PRIMARY = yes; + DRM_FBDEV_EMULATION = yes; + }; + } + ]; }; security = { From e4c0207bd304d9ac79eae4d4c829fc31f03c6a91 Mon Sep 17 00:00:00 2001 From: Asmir A Date: Mon, 6 Nov 2023 19:23:11 +0100 Subject: [PATCH 39/43] magpie/firewall: do not log refused connections, enable ping --- magpie/configuration.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/magpie/configuration.nix b/magpie/configuration.nix index 01b1bc2..6b58a39 100644 --- a/magpie/configuration.nix +++ b/magpie/configuration.nix @@ -243,12 +243,14 @@ owner = config.users.users.nextcloud.name; }; - networking.hostName = "magpie"; - networking.wireless.enable = false; networking.firewall.enable = true; networking.firewall.allowedTCPPorts = [80 443 587]; networking.firewall.allowedUDPPorts = []; + networking.firewall.allowPing = true; + networking.firewall.logRefusedConnections = lib.mkDefault false; + networking.hostName = "magpie"; networking.networkmanager.enable = true; + networking.wireless.enable = false; system.stateVersion = "22.11"; } From 70d3c338c810aecce3ba75493ba870ae3f65050e Mon Sep 17 00:00:00 2001 From: Asmir A Date: Mon, 6 Nov 2023 19:23:55 +0100 Subject: [PATCH 40/43] Revert "home/qutebrowser: temporary fix where qutebrowser hangs with vulkan enabled" This reverts commit 2cc745ea2683889c0eb51b3fc937293154cb5094. --- home/home.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/home.nix b/home/home.nix index 0d54321..4a20c57 100644 --- a/home/home.nix +++ b/home/home.nix @@ -126,7 +126,7 @@ with lib; { qutebrowser = { enable = true; - package = pkgs.qutebrowser.override { enableVulkan = false; }; + package = pkgs.qutebrowser; keyBindings = { normal = { "j" = "scroll-px 0 25"; From 9c2f2a932f9858874da81649a817ffed4cf0ea2a Mon Sep 17 00:00:00 2001 From: Asmir A Date: Mon, 6 Nov 2023 19:24:05 +0100 Subject: [PATCH 41/43] Revert "nixy/kernel: temporary fix for console issue" This reverts commit b432b209c317d138460ac6b07642e03e3e8dbca3. --- nixy/configuration.nix | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/nixy/configuration.nix b/nixy/configuration.nix index 9c9efca..c4c87ec 100644 --- a/nixy/configuration.nix +++ b/nixy/configuration.nix @@ -47,19 +47,6 @@ readOnlyNixStore = true; supportedFilesystems = ["btrfs"]; tmp.useTmpfs = true; - - kernelPatches = let - inherit (lib.kernel) yes; - in [ - { - name = "264832"; - patch = null; - extraStructuredConfig = { - FRAMEBUFFER_CONSOLE_DETECT_PRIMARY = yes; - DRM_FBDEV_EMULATION = yes; - }; - } - ]; }; security = { From 2f0bc3ef58302fa56f80eed6ae8a3f7a3896bd0c Mon Sep 17 00:00:00 2001 From: Asmir A Date: Mon, 6 Nov 2023 19:24:19 +0100 Subject: [PATCH 42/43] Revert "flake: update" This reverts commit bb306d3145bee6d13ca14102e50040d20c9d6d9b. --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index d43f489..14e8a1d 100644 --- a/flake.lock +++ b/flake.lock @@ -19,11 +19,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { @@ -89,11 +89,11 @@ ] }, "locked": { - "lastModified": 1698896213, - "narHash": "sha256-u42NZt52F3o7pM5V7sYlLOp5tSN8z9+fO2wFcOs0EOQ=", + "lastModified": 1698250431, + "narHash": "sha256-qs2gTeH4wpnWPO6Oi6sOhp2IhG0i0DzcnrJxIY3/CP8=", "owner": "nix-community", "repo": "home-manager", - "rev": "831b4fa31749208e576050c563e9773aafd04941", + "rev": "09587fbbc6a669f7725613e044c2577dc5d43ab5", "type": "github" }, "original": { @@ -110,11 +110,11 @@ ] }, "locked": { - "lastModified": 1699035130, - "narHash": "sha256-emK4aJCC2gW94b2P3N2LjkQ6PEMLUcDduVWwYQ7aq+o=", + "lastModified": 1696069591, + "narHash": "sha256-YFPEWMV6XRi7CgDB1qJ67dIYPnrOETuxQO4mnPmxbQs=", "owner": "asmir.abdulahovic", "repo": "nix-xilinx", - "rev": "0323990db46c32e361e4fd70600d859eb90862af", + "rev": "a20ac5924afa24d45227df7d7d54574a9409a4a6", "type": "gitlab" }, "original": { @@ -125,11 +125,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1698924604, - "narHash": "sha256-GCFbkl2tj8fEZBZCw3Tc0AkGo0v+YrQlohhEGJ/X4s0=", + "lastModified": 1697723726, + "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fa804edfb7869c9fb230e174182a8a1a7e512c40", + "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", "type": "github" }, "original": { @@ -171,11 +171,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1698544399, - "narHash": "sha256-vhRmPyEyoPkrXF2iykBsWHA05MIaOSmMRLMF7Hul6+s=", + "lastModified": 1697929210, + "narHash": "sha256-RkQZif6QhswEwv7484mrKfIU8XmIWm+ED6llbr4IyxM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d87c5d8c41c9b3b39592563242f3a448b5cc4bc9", + "rev": "fb000224952bf7749a9e8b3779104ef7ea4465c8", "type": "github" }, "original": { @@ -273,11 +273,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1698929376, - "narHash": "sha256-TmROaV9W6HArdTUgxLN334Kw+CradxWHw1HYM/3H6xI=", + "lastModified": 1697943852, + "narHash": "sha256-DaBxUPaZhQ3yLCmAATshYB7qo7NwcMvSFWz9T3bjYYY=", "owner": "Mic92", "repo": "sops-nix", - "rev": "84d6b27dc71ac02422e192c35806d06915d2bf67", + "rev": "30a0ba4a20703b4bfe047fe5def1fc24978e322c", "type": "github" }, "original": { From 3d7385616bbe5532645716494a6d8417584090d1 Mon Sep 17 00:00:00 2001 From: Asmir A Date: Mon, 6 Nov 2023 19:24:34 +0100 Subject: [PATCH 43/43] Revert "mediabox/kernel: temporary fix for console issue" This reverts commit 5025dd2571f1868834c6a176a61b0721bd39280b. --- mediabox/configuration.nix | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/mediabox/configuration.nix b/mediabox/configuration.nix index 0979153..696f891 100644 --- a/mediabox/configuration.nix +++ b/mediabox/configuration.nix @@ -45,19 +45,6 @@ readOnlyNixStore = true; supportedFilesystems = ["btrfs"]; tmp.useTmpfs = true; - - kernelPatches = let - inherit (lib.kernel) yes; - in [ - { - name = "264832"; - patch = null; - extraStructuredConfig = { - FRAMEBUFFER_CONSOLE_DETECT_PRIMARY = yes; - DRM_FBDEV_EMULATION = yes; - }; - } - ]; }; security = {