From 990f219e241445f23d6fcdb0c4b25b951b444f61 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Tue, 21 Jan 2025 19:10:18 +0100 Subject: [PATCH 1/5] nix/os/devices/steveej-x13s: bump versions --- nix/os/devices/steveej-x13s/flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nix/os/devices/steveej-x13s/flake.lock b/nix/os/devices/steveej-x13s/flake.lock index 91c87e3..1be097c 100644 --- a/nix/os/devices/steveej-x13s/flake.lock +++ b/nix/os/devices/steveej-x13s/flake.lock @@ -308,11 +308,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1737165118, - "narHash": "sha256-s40Kk/OulP3J/1JvC3VT16U4r/Xw6Qdi7SRw3LYkPWs=", + "lastModified": 1737299813, + "narHash": "sha256-Qw2PwmkXDK8sPQ5YQ/y/icbQ+TYgbxfjhgnkNJyT1X8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6a3ae7a5a12fb8cac2d59d7df7cbd95f9b2f0566", + "rev": "107d5ef05c0b1119749e381451389eded30fb0d5", "type": "github" }, "original": { From c06d2e19bfcc6d3651651657a6d7db901637868d Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Thu, 23 Jan 2025 10:01:23 +0100 Subject: [PATCH 2/5] nix/os/devices/sj-srv1: bump versions --- nix/os/devices/sj-srv1/flake.lock | 99 ++++--------------------------- 1 file changed, 12 insertions(+), 87 deletions(-) diff --git a/nix/os/devices/sj-srv1/flake.lock b/nix/os/devices/sj-srv1/flake.lock index 8ab4b67..623708a 100644 --- a/nix/os/devices/sj-srv1/flake.lock +++ b/nix/os/devices/sj-srv1/flake.lock @@ -1,21 +1,5 @@ { "nodes": { - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -23,11 +7,11 @@ ] }, "locked": { - "lastModified": 1734366194, - "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", + "lastModified": 1736373539, + "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", "owner": "nix-community", "repo": "home-manager", - "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", + "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", "type": "github" }, "original": { @@ -37,36 +21,13 @@ "type": "github" } }, - "nixos-dns": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1725163709, - "narHash": "sha256-VqUwWZBBdDE0Jk1tRW6Bsg978R6rTILrvsqjfjHz2HY=", - "owner": "Janik-Haag", - "repo": "nixos-dns", - "rev": "ac41b8690c8db01af1eb77ea2fd330a1c43d814f", - "type": "github" - }, - "original": { - "owner": "Janik-Haag", - "repo": "nixos-dns", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1734875076, - "narHash": "sha256-Pzyb+YNG5u3zP79zoi8HXYMs15Q5dfjDgwCdUI5B0nY=", + "lastModified": 1737404927, + "narHash": "sha256-e1WgPJpIYbOuokjgylcsuoEUCB4Jl2rQXa2LUD6XAG8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1807c2b91223227ad5599d7067a61665c52d1295", + "rev": "ae584d90cbd0396a422289ee3efb1f1c9d141dc3", "type": "github" }, "original": { @@ -78,11 +39,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1734988233, - "narHash": "sha256-Ucfnxq1rF/GjNP3kTL+uTfgdoE9a3fxDftSfeLIS8mA=", + "lastModified": 1737621708, + "narHash": "sha256-EJRzBfAi7XlPlyQuGgyCctX6PpR1P7nMnRxrHOnfXj0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "de1864217bfa9b5845f465e771e0ecb48b30e02d", + "rev": "f0413353abad5d3826571102243795bb80ed5444", "type": "github" }, "original": { @@ -94,11 +55,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1734962273, - "narHash": "sha256-Xu8m+P0dXpRsYqPY1XfOvYaLd8NVpQyiMYrzwwNFyiM=", + "lastModified": 1737597992, + "narHash": "sha256-FECKBxkd+w5I/fhsquthDiw/r/MdCpqmKikBU9yQGug=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fc9c33366b98237cc759cdd90ef6058f5a1cb9dd", + "rev": "d0bb4699177f691c8e558b32b3bdc38bc112f76f", "type": "github" }, "original": { @@ -111,46 +72,10 @@ "root": { "inputs": { "home-manager": "home-manager", - "nixos-dns": "nixos-dns", "nixpkgs": "nixpkgs", "nixpkgs-master": "nixpkgs-master", "nixpkgs-unstable": "nixpkgs-unstable" } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "id": "systems", - "type": "indirect" - } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nixos-dns", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1714058656, - "narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } } }, "root": "root", From aec69ec8ffc373a5ad73c022b5f96169e332d0d6 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Sat, 25 Jan 2025 10:08:11 +0100 Subject: [PATCH 3/5] nix/os/devices/steveej-x13s: bump versions --- nix/os/devices/steveej-x13s/flake.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/nix/os/devices/steveej-x13s/flake.lock b/nix/os/devices/steveej-x13s/flake.lock index 1be097c..5f6abae 100644 --- a/nix/os/devices/steveej-x13s/flake.lock +++ b/nix/os/devices/steveej-x13s/flake.lock @@ -181,16 +181,16 @@ "linux-jhovold": { "flake": false, "locked": { - "lastModified": 1736759316, - "narHash": "sha256-cNqR3H797YcCsHutwNGdV+u6T0AUh17TGev/LCqNCy8=", + "lastModified": 1737386371, + "narHash": "sha256-FIbwr2WKslYbC/AIBNcUgoEpDm0aB8knhHYQ6m2bu6k=", "owner": "jhovold", "repo": "linux", - "rev": "1ca98ace316a107b488b33959ce012b5875edbef", + "rev": "5602f2f7c53f5c0d2566f493224b82f55ed68abb", "type": "github" }, "original": { "owner": "jhovold", - "ref": "wip/sc8280xp-6.13-rc7", + "ref": "wip/sc8280xp-6.13", "repo": "linux", "type": "github" } @@ -264,11 +264,11 @@ "x13s-bt-linux-firmware": "x13s-bt-linux-firmware" }, "locked": { - "lastModified": 1737021191, - "narHash": "sha256-w4B4UHtCH3+gX8qTl2m6RURCB7OyKjSy1SMr/Q4aB0w=", + "lastModified": 1737753654, + "narHash": "sha256-y4KjuDsLZ9bNwF+7fmDBSDjhZSXQykewS0ncxNoeNvA=", "ref": "bump", - "rev": "00a940407a7ccc144d887e25c7568c1573c488ce", - "revCount": 134, + "rev": "fe236e55c5fcdb8fb194ade6dc62ab67f396537e", + "revCount": 135, "type": "git", "url": "https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git" }, @@ -308,11 +308,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1737299813, - "narHash": "sha256-Qw2PwmkXDK8sPQ5YQ/y/icbQ+TYgbxfjhgnkNJyT1X8=", + "lastModified": 1737672001, + "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "107d5ef05c0b1119749e381451389eded30fb0d5", + "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8", "type": "github" }, "original": { From 68e1dc9267b13ee4136f19609b47c0f520912f64 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Sun, 2 Feb 2025 13:17:55 +0100 Subject: [PATCH 4/5] feat(codium): add emojisense extension --- nix/home-manager/programs/vscode/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nix/home-manager/programs/vscode/default.nix b/nix/home-manager/programs/vscode/default.nix index fe7e190..3aa5b9a 100644 --- a/nix/home-manager/programs/vscode/default.nix +++ b/nix/home-manager/programs/vscode/default.nix @@ -55,6 +55,8 @@ in jeff-hykin.better-go-syntax blueglassblock.better-json5 + + bierner.emojisense ] ) ++ ( From 65145576a2e6df9607a74b9d8f75eb9caf8fd9a2 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Tue, 4 Feb 2025 11:00:52 +0100 Subject: [PATCH 5/5] firefox: add youtube-unhook and enable pipewire --- nix/home-manager/programs/firefox.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/nix/home-manager/programs/firefox.nix b/nix/home-manager/programs/firefox.nix index a24cdfe..1bffa89 100644 --- a/nix/home-manager/programs/firefox.nix +++ b/nix/home-manager/programs/firefox.nix @@ -8,7 +8,7 @@ let # Search extension names with below command: # nix flake show --json "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons" --all-systems | jq -r '.packages."x86_64-linux" | keys[]' | rg QUERY - ryceeAddons = with repoFlake.inputs.nur.legacyPackages.${pkgs.system}.repos.rycee.firefox-addons; [ + ryceeAddons = with pkgs.nur.repos.rycee.firefox-addons; [ ublock-origin # bypass-paywalls-clean (can't use, was creating popups) @@ -27,6 +27,8 @@ let vimium cookie-autodelete auto-tab-discard + + youtube-recommended-videos ]; customAddons = [ @@ -163,7 +165,8 @@ let "browser.translations.neverTranslateLanguages" = ["en" "de"]; "browser.translations.automaticallyPopup" = false; - + # enable pipewire (and libcamera) sources + "media.webrtc.camera.allow-pipewire" = true; }; userChrome = @@ -296,6 +299,14 @@ let in { + nixpkgs.overlays = [ + repoFlake.inputs.nur.overlay + ]; + + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + "youtube-recommended-videos" + ]; + programs.librewolf = { enable = false; };