From 319195e3e11d46c635d90368dadc85c6acb4a114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Mon, 19 May 2025 10:04:21 +0200 Subject: [PATCH 01/23] niv: bump inputs to 25.05 --- nix/sources.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nix/sources.json b/nix/sources.json index 84f1ce4d..fcfcbb89 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -50,15 +50,15 @@ "type": "git" }, "home-manager": { - "branch": "release-24.11", + "branch": "release-25.05", "description": "Manage a user environment using Nix [maintainer=@rycee] ", "homepage": "https://nix-community.github.io/home-manager/", "owner": "nix-community", "repo": "home-manager", - "rev": "0948aeedc296f964140d9429223c7e4a0702a1ff", - "sha256": "156hc11bb6xiypj65q6gzkhw1gw31dwv6dfh6rnv20hgig1sbfld", + "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33", + "sha256": "1iqfq5lz3102cp3ryqqqs2hr2bdmwn0mdajprh1ls5h5nsfkigs1", "type": "tarball", - "url": "https://github.com/nix-community/home-manager/archive/0948aeedc296f964140d9429223c7e4a0702a1ff.tar.gz", + "url": "https://github.com/nix-community/home-manager/archive/d0bbd221482c2713cccb80220f3c9d16a6e20a33.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "hutils": { @@ -98,15 +98,15 @@ "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs": { - "branch": "nixos-24.11", + "branch": "nixos-25.05", "description": "Nix Packages collection", "homepage": null, "owner": "NixOS", "repo": "nixpkgs", - "rev": "5d736263df906c5da72ab0f372427814de2f52f8", - "sha256": "1cvxfj03xhakyrrz8bh4499vz5d35ay92575irrbmydcxixsrf3w", + "rev": "2e1496bf8652ff4af4e4d4737277f71e4a4f5cb2", + "sha256": "0afb9y45zp2ikbzpbicy72l4dh9n0mgank8kqmyqxb8ib7s6qmsx", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5d736263df906c5da72ab0f372427814de2f52f8.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/2e1496bf8652ff4af4e4d4737277f71e4a4f5cb2.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "pin-iosevka": { From 2c0f15201830ae2680f3288693647397fded63d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Mon, 19 May 2025 10:07:01 +0200 Subject: [PATCH 02/23] hm: use programs.firefox.profiles..extensions.packages --- nix/configurations/tungsten/home/firefox.nix | 6 +++--- nix/configurations/vanadium/home/firefox.nix | 6 +++--- nix/homeModules/common/firefox.nix | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/nix/configurations/tungsten/home/firefox.nix b/nix/configurations/tungsten/home/firefox.nix index 4eacc0b8..50823048 100644 --- a/nix/configurations/tungsten/home/firefox.nix +++ b/nix/configurations/tungsten/home/firefox.nix @@ -20,7 +20,7 @@ in { profiles = { default = { - extensions = let + extensions.packages = let addons = nur.repos.rycee.firefox-addons; in [ addons.languagetool @@ -40,7 +40,7 @@ in { userChrome ; - extensions = let + extensions.packages = let addons = nur.repos.rycee.firefox-addons; in [addons.multi-account-containers]; @@ -67,7 +67,7 @@ in { userChrome ; - extensions = let + extensions.packages = let addons = nur.repos.rycee.firefox-addons; in [addons.tampermonkey]; }; diff --git a/nix/configurations/vanadium/home/firefox.nix b/nix/configurations/vanadium/home/firefox.nix index caac3537..977e9956 100644 --- a/nix/configurations/vanadium/home/firefox.nix +++ b/nix/configurations/vanadium/home/firefox.nix @@ -20,7 +20,7 @@ in { profiles = { default = { - extensions = let + extensions.packages = let addons = nur.repos.rycee.firefox-addons; in [ addons.languagetool @@ -42,7 +42,7 @@ in { userChrome ; - extensions = let + extensions.packages = let addons = nur.repos.rycee.firefox-addons; in [addons.multi-account-containers]; @@ -69,7 +69,7 @@ in { userChrome ; - extensions = let + extensions.packages = let addons = nur.repos.rycee.firefox-addons; in [addons.tampermonkey]; }; diff --git a/nix/homeModules/common/firefox.nix b/nix/homeModules/common/firefox.nix index 30ea18a6..0bf955d4 100644 --- a/nix/homeModules/common/firefox.nix +++ b/nix/homeModules/common/firefox.nix @@ -48,7 +48,7 @@ in { "full-screen-api.ignore-widgets" = true; # limit fullscreen mode to window }; - extensions = let + extensions.packages = let addons = nur.repos.rycee.firefox-addons; in [ addons.ublock-origin From 66f85c7d7e199136359ef1794455ba62f7beed30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Mon, 19 May 2025 10:08:09 +0200 Subject: [PATCH 03/23] nix/xmonad: upstream is bumped to 0.18.1 --- nix/configurations/tungsten/nixos/gui.nix | 6 +----- nix/configurations/vanadium/nixos/gui.nix | 6 +----- nix/environments/haskell.nix | 5 +---- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/nix/configurations/tungsten/nixos/gui.nix b/nix/configurations/tungsten/nixos/gui.nix index f2c413ae..4dca22d5 100644 --- a/nix/configurations/tungsten/nixos/gui.nix +++ b/nix/configurations/tungsten/nixos/gui.nix @@ -1,11 +1,7 @@ {pkgs, ...}: { services.xserver.windowManager.xmonad = { enable = true; - extraPackages = hs: [ - # https://github.com/ValveSoftware/steam-for-linux/issues/9376 - # opt into 0.18.1 specifically - hs.xmonad-contrib_0_18_1 - ]; + enableContribAndExtras = true; }; services.xserver = { diff --git a/nix/configurations/vanadium/nixos/gui.nix b/nix/configurations/vanadium/nixos/gui.nix index f2c413ae..4dca22d5 100644 --- a/nix/configurations/vanadium/nixos/gui.nix +++ b/nix/configurations/vanadium/nixos/gui.nix @@ -1,11 +1,7 @@ {pkgs, ...}: { services.xserver.windowManager.xmonad = { enable = true; - extraPackages = hs: [ - # https://github.com/ValveSoftware/steam-for-linux/issues/9376 - # opt into 0.18.1 specifically - hs.xmonad-contrib_0_18_1 - ]; + enableContribAndExtras = true; }; services.xserver = { diff --git a/nix/environments/haskell.nix b/nix/environments/haskell.nix index c92ca7e0..e068c355 100644 --- a/nix/environments/haskell.nix +++ b/nix/environments/haskell.nix @@ -10,10 +10,7 @@ buildEnv { # XMonad # (haskellPackages.ghcWithPackages (self: [ - # https://github.com/ValveSoftware/steam-for-linux/issues/9376 - # opt into 0.18.1 specifically - self.xmonad-contrib_0_18_1 - + self.xmonad-contrib self.xmonad-extras ])) haskell-language-server From b6359b0a6118e63e74aea2d0692563cca8acbf0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Tue, 20 May 2025 11:07:54 +0200 Subject: [PATCH 04/23] replace hacksaw/shotgun with maim --- nix/configurations/tungsten/home/programs.nix | 2 -- nix/configurations/vanadium/home/programs.nix | 3 +-- nix/configurations/vanadium/home/xmonad/xmonad.hs | 6 +++--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/nix/configurations/tungsten/home/programs.nix b/nix/configurations/tungsten/home/programs.nix index c74f53fc..d0b37625 100644 --- a/nix/configurations/tungsten/home/programs.nix +++ b/nix/configurations/tungsten/home/programs.nix @@ -91,8 +91,6 @@ in { pkgs.dmenu pkgs.xclip pkgs.playerctl # talk to playerctld - pkgs.hacksaw - pkgs.shotgun pkgs.xscreensaver # talk to xscreensaver pkgs.xcolor diff --git a/nix/configurations/vanadium/home/programs.nix b/nix/configurations/vanadium/home/programs.nix index b3178b13..ef965cd9 100644 --- a/nix/configurations/vanadium/home/programs.nix +++ b/nix/configurations/vanadium/home/programs.nix @@ -78,8 +78,7 @@ in { pkgs.dmenu pkgs.xclip pkgs.playerctl # talk to playerctld - pkgs.hacksaw - pkgs.shotgun + pkgs.maim pkgs.xscreensaver # talk to xscreensaver pkgs.xcolor diff --git a/nix/configurations/vanadium/home/xmonad/xmonad.hs b/nix/configurations/vanadium/home/xmonad/xmonad.hs index e65d2fe1..aa6eba3c 100644 --- a/nix/configurations/vanadium/home/xmonad/xmonad.hs +++ b/nix/configurations/vanadium/home/xmonad/xmonad.hs @@ -188,9 +188,9 @@ main = xmonad -- Screenshots ++ (let - fullscreen = "shotgun -s - | xclip -in -selection clipboard -t image/png" - withSelection = "shotgun -g $(hacksaw -c \"#875fff\" -g 3) - | xclip -in -selection clipboard -t image/png" - toFloat = "shotgun -g $(hacksaw -c \"#875fff\" -g 3) - | feh --auto-zoom -" + fullscreen = "maim | xclip -in -selection clipboard" + withSelection = "maim -s -b 5 -o | xclip -in -selection clipboard -t image/png" + toFloat = "maim -s -b 5 -o | feh --auto-zoom -" in [ ((0, xK_Print), spawn fullscreen ) , ((superMask .|. shiftMask, xK_3 ), spawn fullscreen ) From 08402826bb76815d6416070d9254b2d2aef296f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Mon, 19 May 2025 10:09:50 +0200 Subject: [PATCH 05/23] hm/gpg-agent: use gpg-agent.pinentry.package --- nix/homeModules/common/gpg.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/homeModules/common/gpg.nix b/nix/homeModules/common/gpg.nix index d9bde6c9..0140180f 100644 --- a/nix/homeModules/common/gpg.nix +++ b/nix/homeModules/common/gpg.nix @@ -1,7 +1,7 @@ {pkgs, ...}: { services = { gpg-agent.defaultCacheTtl = 1209600; - gpg-agent.pinentryPackage = pkgs.pinentry-tty; + gpg-agent.pinentry.package = pkgs.pinentry-tty; }; programs.gpg.publicKeys = [ From 449025bdb3d78a7e30d49f05d31a84a94a8cf0d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Mon, 19 May 2025 10:10:41 +0200 Subject: [PATCH 06/23] hm: use programs.vscode.profiles.default.extensions --- nix/configurations/tungsten/home/dev.nix | 2 +- nix/configurations/vanadium/home/dev.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nix/configurations/tungsten/home/dev.nix b/nix/configurations/tungsten/home/dev.nix index 485bb37e..a600273d 100644 --- a/nix/configurations/tungsten/home/dev.nix +++ b/nix/configurations/tungsten/home/dev.nix @@ -50,7 +50,7 @@ # programs.vscode = { # enable = true; - # extensions = [ + # profiles.default.extensions = [ # pkgs.vscode-extensions.redhat.java # pkgs.vscode-extensions.vscjava.vscode-java-pack # ]; diff --git a/nix/configurations/vanadium/home/dev.nix b/nix/configurations/vanadium/home/dev.nix index dd278342..914abd7a 100644 --- a/nix/configurations/vanadium/home/dev.nix +++ b/nix/configurations/vanadium/home/dev.nix @@ -38,7 +38,7 @@ programs.vscode = { enable = true; - extensions = [ + profiles.default.extensions = [ pkgs.vscode-extensions.redhat.java pkgs.vscode-extensions.vscjava.vscode-java-pack ]; From 1d5bfa01dd1ae54bc43f746a752bb2902da5f7b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Mon, 19 May 2025 10:13:44 +0200 Subject: [PATCH 07/23] vanadium: 6.12 kernel is mainline LTS now --- nix/configurations/vanadium/nixos/misc.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nix/configurations/vanadium/nixos/misc.nix b/nix/configurations/vanadium/nixos/misc.nix index 27a57908..db83b159 100644 --- a/nix/configurations/vanadium/nixos/misc.nix +++ b/nix/configurations/vanadium/nixos/misc.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{ system.stateVersion = "24.11"; boot.loader = { @@ -9,7 +9,6 @@ efi.canTouchEfiVariables = true; }; - boot.kernelPackages = pkgs.linuxPackages_6_12; boot.kernelParams = [ # https://community.frame.work/t/stability-issues-random-crashes-reboots-and-boot-freezes/62675/4 "pcie_aspm=off" From 22dbd0089f1e511455044bc6d7972bcc837df9d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Mon, 19 May 2025 10:16:16 +0200 Subject: [PATCH 08/23] i18n: use i18n.inputMethod.{enable,type} --- nix/configurations/tungsten/home/misc.nix | 5 ++++- nix/configurations/vanadium/home/misc.nix | 6 ++++-- nix/homeModules/common/fcitx5/default.nix | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/nix/configurations/tungsten/home/misc.nix b/nix/configurations/tungsten/home/misc.nix index c3bcbe1a..3b8cd6b0 100644 --- a/nix/configurations/tungsten/home/misc.nix +++ b/nix/configurations/tungsten/home/misc.nix @@ -44,7 +44,10 @@ ; }; xresources.properties."Xft.dpi" = 92; - i18n.inputMethod.enabled = "fcitx5"; + i18n.inputMethod = { + enable = true; + type = "fcitx5"; + }; # Disable the blueman pop up persistently # https://github.com/blueman-project/blueman/issues/1556#issuecomment-882857426 diff --git a/nix/configurations/vanadium/home/misc.nix b/nix/configurations/vanadium/home/misc.nix index cd8a1a36..19bf3148 100644 --- a/nix/configurations/vanadium/home/misc.nix +++ b/nix/configurations/vanadium/home/misc.nix @@ -28,7 +28,6 @@ pkgs.last-resort ]; - home.file = { ".xscreensaver".source = "${./xscreensaver/.xscreensaver}"; }; @@ -47,7 +46,10 @@ ; }; xresources.properties."Xft.dpi" = 150; - i18n.inputMethod.enabled = "fcitx5"; + i18n.inputMethod = { + enable = true; + type = "fcitx5"; + }; # Disable the blueman pop up persistently # https://github.com/blueman-project/blueman/issues/1556#issuecomment-882857426 diff --git a/nix/homeModules/common/fcitx5/default.nix b/nix/homeModules/common/fcitx5/default.nix index 0777d773..6d698fbd 100644 --- a/nix/homeModules/common/fcitx5/default.nix +++ b/nix/homeModules/common/fcitx5/default.nix @@ -11,7 +11,7 @@ ]; }; - xdg.configFile = lib.mkIf (config.i18n.inputMethod.enabled != null) { + xdg.configFile = lib.mkIf config.i18n.inputMethod.enable { "fcitx5".source = "${./fcitx}"; }; } From f4fb56457d0e9c4323911978104794bf197e28ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Mon, 19 May 2025 10:31:13 +0200 Subject: [PATCH 09/23] sane: disable brscan5 for now --- nix/configurations/tungsten/nixos/input.nix | 4 ---- nix/configurations/vanadium/nixos/input.nix | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/nix/configurations/tungsten/nixos/input.nix b/nix/configurations/tungsten/nixos/input.nix index a5537932..5bcfbe2f 100644 --- a/nix/configurations/tungsten/nixos/input.nix +++ b/nix/configurations/tungsten/nixos/input.nix @@ -14,10 +14,6 @@ }; users.users.leana.extraGroups = ["scanner"]; - hardware.sane = { - enable = true; - brscan5.enable = true; - }; services.fprintd.enable = false; diff --git a/nix/configurations/vanadium/nixos/input.nix b/nix/configurations/vanadium/nixos/input.nix index 30cbc716..6d283126 100644 --- a/nix/configurations/vanadium/nixos/input.nix +++ b/nix/configurations/vanadium/nixos/input.nix @@ -16,7 +16,8 @@ me.extraGroups = ["scanner"]; hardware.sane = { enable = true; - brscan5.enable = true; + # TODO: wait for upstream + # brscan5.enable = true; }; services.fprintd.enable = false; From d8d988190565091f748f8c60a1e099b2ac9c276a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 22 May 2025 17:35:07 +0200 Subject: [PATCH 10/23] ltex-ls-plus: merged in upstream --- nix/configurations/tungsten/home/dev.nix | 29 ------------ nix/packages/by-name/ltex-ls-plus/package.nix | 45 ------------------- 2 files changed, 74 deletions(-) delete mode 100644 nix/packages/by-name/ltex-ls-plus/package.nix diff --git a/nix/configurations/tungsten/home/dev.nix b/nix/configurations/tungsten/home/dev.nix index a600273d..4ede0395 100644 --- a/nix/configurations/tungsten/home/dev.nix +++ b/nix/configurations/tungsten/home/dev.nix @@ -4,33 +4,12 @@ config, ... }: { - # home.packages = [ - # # preview markdown - # pkgs.python3Packages.grip - # - # pkgs.gh - # ]; - programs.neovim.extraPackages = [ # lua pkgs.lua-language-server pkgs.stylua pkgs.nil # nix - # pkgs.yaml-language-server # yaml - # - # pkgs.pyright # python - # - # pkgs.marksman # markdown - # pkgs.taplo # toml - # pkgs.lemminx # xml - # # pkgs.texlab # latex - # - # # fish - # pkgs.fish-lsp - # - # # spellchecking - # pkgs.myPkgs.ltex-ls-plus ]; programs.git = { @@ -47,12 +26,4 @@ }; programs.gpg.enable = true; - - # programs.vscode = { - # enable = true; - # profiles.default.extensions = [ - # pkgs.vscode-extensions.redhat.java - # pkgs.vscode-extensions.vscjava.vscode-java-pack - # ]; - # }; } diff --git a/nix/packages/by-name/ltex-ls-plus/package.nix b/nix/packages/by-name/ltex-ls-plus/package.nix deleted file mode 100644 index 1b813806..00000000 --- a/nix/packages/by-name/ltex-ls-plus/package.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - lib, - stdenvNoCC, - fetchurl, - makeBinaryWrapper, - jre_headless, - jvmOptions ? [], -}: -stdenvNoCC.mkDerivation rec { - pname = "ltex-ls-plus"; - version = "18.4.0"; - - src = fetchurl { - url = "https://github.com/ltex-plus/ltex-ls-plus/releases/download/${version}/ltex-ls-plus-${version}.tar.gz"; - sha256 = "sha256-BkVPLtyF62keDDEnET8zF7g0FqDz6UkDWI6BM8W2qMQ="; - }; - - nativeBuildInputs = [makeBinaryWrapper]; - - installPhase = let - java_opts = lib.optionalString (jvmOptions != []) ''--set JAVA_OPTS "${toString jvmOptions}"''; - in '' - runHook preInstall - - mkdir -p $out - cp -rfv bin/ lib/ $out - rm -fv $out/bin/.lsp-cli.json $out/bin/*.bat - for file in $out/bin/{ltex-ls-plus,ltex-cli-plus}; do - wrapProgram $file --set JAVA_HOME "${jre_headless}" ${java_opts} - done - - runHook postInstall - ''; - - meta = let - inherit (lib) licenses maintainers; - in { - homepage = "https://ltex-plus.github.io/ltex-plus/"; - description = "LSP language server for LanguageTool"; - license = licenses.mpl20; - mainProgram = "ltex-cli-plus"; - maintainers = [maintainers.FirelightFlagboy]; - inherit (jre_headless.meta) platforms; - }; -} From 09760a1e6151163b4b7772e304a22e0e8d25d8a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Mon, 19 May 2025 10:35:38 +0200 Subject: [PATCH 11/23] tokei: update vendor hash --- nix/packages/by-name/tokei/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/packages/by-name/tokei/package.nix b/nix/packages/by-name/tokei/package.nix index 19c1c007..7af4eebe 100644 --- a/nix/packages/by-name/tokei/package.nix +++ b/nix/packages/by-name/tokei/package.nix @@ -20,7 +20,7 @@ in hash = "sha256-jCI9VM3y76RI65E5UGuAPuPkDRTMyi+ydx64JWHcGfE="; }; - cargoHash = "sha256-XvRO5AbPYZVRVxqFmKf2Xn4K9VvZyb3eyJLu/cGrPdI="; + cargoHash = "sha256-LzlyrKaRjUo6JnVLQnHidtI4OWa+GrhAc4D8RkL+nmQ="; patches = [ ./skel.patch From 52db66d7bf638f460d1a58d9ab2cad7980a3462b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Tue, 20 May 2025 11:09:33 +0200 Subject: [PATCH 12/23] playerctl: the package is now exported by the service option --- nix/configurations/vanadium/home/programs.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nix/configurations/vanadium/home/programs.nix b/nix/configurations/vanadium/home/programs.nix index ef965cd9..839a751c 100644 --- a/nix/configurations/vanadium/home/programs.nix +++ b/nix/configurations/vanadium/home/programs.nix @@ -77,7 +77,6 @@ in { myPkgs.xbrightness pkgs.dmenu pkgs.xclip - pkgs.playerctl # talk to playerctld pkgs.maim pkgs.xscreensaver # talk to xscreensaver pkgs.xcolor From 59ce50c848ef93837884921d05491239494aa744 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Tue, 20 May 2025 18:33:19 +0200 Subject: [PATCH 13/23] niv: update disko to 1.11 --- nix/sources.json | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/nix/sources.json b/nix/sources.json index fcfcbb89..5280ac24 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -24,12 +24,12 @@ "homepage": "", "owner": "nix-community", "repo": "disko", - "rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de", - "sha256": "0mwnd7vfyd2wqbrvlpjgxng83fp97lg1ihzzx9ipbj5c9l0bjgjm", + "rev": "0141aabed359f063de7413f80d906e1d98c0c123", + "sha256": "13brimg7z7k9y36n4jc1pssqyw94nd8qvgfjv53z66lv4xkhin92", "type": "tarball", - "url": "https://github.com/nix-community/disko/archive/0d8c6ad4a43906d14abd5c60e0ffe7b587b213de.tar.gz", + "url": "https://github.com/nix-community/disko/archive/0141aabed359f063de7413f80d906e1d98c0c123.tar.gz", "url_template": "https://github.com///archive/.tar.gz", - "version": "v1.8.0" + "version": "v1.11.0" }, "flake-compat": { "branch": "master", @@ -109,18 +109,6 @@ "url": "https://github.com/NixOS/nixpkgs/archive/2e1496bf8652ff4af4e4d4737277f71e4a4f5cb2.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, - "pin-iosevka": { - "branch": "nixos-24.11", - "description": "Nix Packages collection & NixOS", - "homepage": "", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "030ba1976b7c0e1a67d9716b17308ccdab5b381e", - "sha256": "14rpk53mia7j0hr4yaf5m3b2d4lzjx8qi2rszxjhqq00pxzzr64w", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/030ba1976b7c0e1a67d9716b17308ccdab5b381e.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, "nixpkgs-unstable": { "branch": "nixos-unstable", "description": "Nix Packages collection & NixOS", @@ -157,6 +145,18 @@ "url": "https://github.com/NixOS/nixpkgs/archive/f6cf0e77542dd938f002652dd54391b973f792de.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, + "pin-iosevka": { + "branch": "nixos-24.11", + "description": "Nix Packages collection & NixOS", + "homepage": "", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "030ba1976b7c0e1a67d9716b17308ccdab5b381e", + "sha256": "14rpk53mia7j0hr4yaf5m3b2d4lzjx8qi2rszxjhqq00pxzzr64w", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/030ba1976b7c0e1a67d9716b17308ccdab5b381e.tar.gz", + "url_template": "https://github.com///archive/.tar.gz" + }, "pin-isabelle": { "branch": "master", "description": "Nix Packages collection & NixOS", From c40df87e84c43f89e2dc7a0d7a4c33495835944f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Tue, 20 May 2025 19:44:53 +0200 Subject: [PATCH 14/23] xmonad: remove digikam hack --- nix/configurations/vanadium/home/xmonad/xmonad.hs | 3 --- 1 file changed, 3 deletions(-) diff --git a/nix/configurations/vanadium/home/xmonad/xmonad.hs b/nix/configurations/vanadium/home/xmonad/xmonad.hs index aa6eba3c..e1c9ced5 100644 --- a/nix/configurations/vanadium/home/xmonad/xmonad.hs +++ b/nix/configurations/vanadium/home/xmonad/xmonad.hs @@ -84,9 +84,6 @@ main = xmonad spawn "feh --no-fehbg --bg-fill ~/.wallpaper &" -- wallpaper io $ do - putEnv "QT_SCALE_FACTOR=1.25" -- Fix problem where digikam is too small - -- https://bugs.kde.org/show_bug.cgi?id=427662 - putEnv "GLFW_IM_MODULE=ibus" -- Make sure kitty knows how to talk to fcitx putEnv "MOZ_USE_XINPUT2=1" -- Force touchpad for firefox From a2c9c7b84677ec081cf5bf26d537209879f5d340 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Wed, 21 May 2025 18:30:22 +0200 Subject: [PATCH 15/23] vanadium: -languagetool --- nix/configurations/vanadium/home/firefox.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nix/configurations/vanadium/home/firefox.nix b/nix/configurations/vanadium/home/firefox.nix index 977e9956..03c53af9 100644 --- a/nix/configurations/vanadium/home/firefox.nix +++ b/nix/configurations/vanadium/home/firefox.nix @@ -23,8 +23,6 @@ in { extensions.packages = let addons = nur.repos.rycee.firefox-addons; in [ - addons.languagetool - addons.sponsorblock addons.return-youtube-dislikes From 22e452a872bddd59f33a2d51b6a8b30bda2ec611 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Wed, 21 May 2025 18:29:56 +0200 Subject: [PATCH 16/23] vanadium: +tree-style-tab --- nix/configurations/vanadium/home/firefox.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nix/configurations/vanadium/home/firefox.nix b/nix/configurations/vanadium/home/firefox.nix index 03c53af9..2dc02959 100644 --- a/nix/configurations/vanadium/home/firefox.nix +++ b/nix/configurations/vanadium/home/firefox.nix @@ -29,6 +29,8 @@ in { addons.shinigami-eyes addons.consent-o-matic + + addons.tree-style-tab ]; }; From 3c0c1bfb32c14f470749669af60f8d28106bd2c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Wed, 21 May 2025 18:45:25 +0200 Subject: [PATCH 17/23] vanadium: add tree-style-tab userChrome configuration --- nix/configurations/vanadium/home/firefox.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nix/configurations/vanadium/home/firefox.nix b/nix/configurations/vanadium/home/firefox.nix index 2dc02959..99eb4afc 100644 --- a/nix/configurations/vanadium/home/firefox.nix +++ b/nix/configurations/vanadium/home/firefox.nix @@ -20,6 +20,15 @@ in { profiles = { default = { + userChrome = '' + /* Only works in Firefox if layout.css.has-selector.enabled is set to true in about:config . */ + html#main-window body:has(#sidebar-box[sidebarcommand=treestyletab_piro_sakura_ne_jp-sidebar-action][checked=true]:not([hidden=true])) #TabsToolbar { + visibility: collapse !important; + } + ''; + settings = { + "layout.css.has-selector.enabled" = true; + }; extensions.packages = let addons = nur.repos.rycee.firefox-addons; in [ From 441c076da0c43789294e59b6cee0bf99ee767031 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 22 May 2025 00:56:46 +0200 Subject: [PATCH 18/23] firefox: update settings --- nix/homeModules/common/firefox.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nix/homeModules/common/firefox.nix b/nix/homeModules/common/firefox.nix index 0bf955d4..6463e087 100644 --- a/nix/homeModules/common/firefox.nix +++ b/nix/homeModules/common/firefox.nix @@ -8,7 +8,7 @@ in { # https://mozilla.github.io/policy-templates policies = { HardwareAcceleration = true; - DisableFirefoxScreenshots = true; + DisableFirefoxScreenshots = false; DisablePocket = true; DisplayMenuBar = "never"; DisplayBookmarksToolbar = "never"; @@ -31,11 +31,6 @@ in { DNSOverHTTPS = { Enabled = true; }; - EnableTrackingProtection = { - Value = true; - Cryptomining = true; - Fingerprinting = true; - }; }; profiles.default = { From 0f623dd97573bfa66253f4a20545c98aa343dfdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 22 May 2025 23:27:25 +0200 Subject: [PATCH 19/23] Revert "environments/rust: +clippy" This reverts commit 714d516cf89b50c92c56d87f8f088369161d73c5. --- nix/environments/rust.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nix/environments/rust.nix b/nix/environments/rust.nix index 7623099c..45afe645 100644 --- a/nix/environments/rust.nix +++ b/nix/environments/rust.nix @@ -12,6 +12,5 @@ buildEnv { rustc rustfmt rust-analyzer - clippy ]; } From 8bcd7f71b47e8d3df23d174307ae66047fa88fc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 22 May 2025 23:27:26 +0200 Subject: [PATCH 20/23] Revert "environments/rust: init" This reverts commit 6af093062ad5f225439d29f6a6c3944eadeb088f. --- nix/environments/rust.nix | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 nix/environments/rust.nix diff --git a/nix/environments/rust.nix b/nix/environments/rust.nix deleted file mode 100644 index 45afe645..00000000 --- a/nix/environments/rust.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - buildEnv, - # - pkgs, -}: -buildEnv { - name = "rust"; - paths = with pkgs; [ - gcc - - cargo - rustc - rustfmt - rust-analyzer - ]; -} From f7653470469d5258b3b883483a4d384113a8d79b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 22 May 2025 23:28:49 +0200 Subject: [PATCH 21/23] Revert "vanadium: move lol packages to environment" This reverts commit b11520994f19f555280ad6d1ef7668ab27c272a6. --- nix/configurations/vanadium/home/programs.nix | 5 +++++ nix/environments/fun.nix | 15 --------------- 2 files changed, 5 insertions(+), 15 deletions(-) delete mode 100644 nix/environments/fun.nix diff --git a/nix/configurations/vanadium/home/programs.nix b/nix/configurations/vanadium/home/programs.nix index 839a751c..7d4db6bf 100644 --- a/nix/configurations/vanadium/home/programs.nix +++ b/nix/configurations/vanadium/home/programs.nix @@ -22,6 +22,11 @@ in { pkgs.poppler_utils # pdfseparate, pdfunite myPkgs.easyscan + # fun + myPkgs.prop-solveur + myPkgs.hbrainfuck + pkgs.lucky-commit + # pretty tui tools pkgs.du-dust pkgs.tldr diff --git a/nix/environments/fun.nix b/nix/environments/fun.nix deleted file mode 100644 index 0c0eebbe..00000000 --- a/nix/environments/fun.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - buildEnv, - # - myPkgs, - pkgs, -}: -buildEnv { - name = "fun"; - - paths = [ - myPkgs.prop-solveur - myPkgs.hbrainfuck - pkgs.lucky-commit - ]; -} From 6a0cd9a48ac4c71335a2041802ea921eff4bda16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 22 May 2025 23:28:53 +0200 Subject: [PATCH 22/23] Revert "vanadium: move media creation packages to environment" This reverts commit 054fc70776857c8566ac3ef3011f9d5c8c991aad. --- nix/configurations/vanadium/home/programs.nix | 8 ++++++++ nix/environments/creation.nix | 19 ------------------- 2 files changed, 8 insertions(+), 19 deletions(-) delete mode 100644 nix/environments/creation.nix diff --git a/nix/configurations/vanadium/home/programs.nix b/nix/configurations/vanadium/home/programs.nix index 7d4db6bf..a6905496 100644 --- a/nix/configurations/vanadium/home/programs.nix +++ b/nix/configurations/vanadium/home/programs.nix @@ -69,11 +69,19 @@ in { home.packages = [ # productivity / media pkgs.evolution + pkgs.libreoffice + pkgs.iamb pkgs.calibre + pkgs.rawtherapee pkgs.digikam + pkgs.gimp pkgs.vlc pkgs.nautilus pkgs.sushi # space bar previewer + pkgs.blender + pkgs.inkscape + pkgs.aseprite + pkgs.xournalpp # social pkgs.iamb diff --git a/nix/environments/creation.nix b/nix/environments/creation.nix deleted file mode 100644 index 70c31582..00000000 --- a/nix/environments/creation.nix +++ /dev/null @@ -1,19 +0,0 @@ -# -# Some media creation tools that I don't use often -# -{ - buildEnv, - # - pkgs, -}: -buildEnv { - name = "media-creation"; - paths = [ - pkgs.gimp - pkgs.inkscape - pkgs.aseprite - pkgs.blender - pkgs.xournalpp - pkgs.libreoffice - ]; -} From 0832b63b89e9aa305f3075c000860ddabefdcf38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 22 May 2025 23:28:55 +0200 Subject: [PATCH 23/23] Revert "vanadium: move nixpkgs contribution packages to environment" This reverts commit 419355f51f39c2724d5b7421dbb1fa30c50a8b62. --- nix/configurations/vanadium/home/dev.nix | 7 +++++++ nix/environments/nix.nix | 11 +++++++++++ nix/environments/nixpkgs.nix | 15 --------------- 3 files changed, 18 insertions(+), 15 deletions(-) create mode 100644 nix/environments/nix.nix delete mode 100644 nix/environments/nixpkgs.nix diff --git a/nix/configurations/vanadium/home/dev.nix b/nix/configurations/vanadium/home/dev.nix index 914abd7a..71800101 100644 --- a/nix/configurations/vanadium/home/dev.nix +++ b/nix/configurations/vanadium/home/dev.nix @@ -7,6 +7,13 @@ home.packages = [ # preview markdown pkgs.python3Packages.grip + + # For nix contribution + pkgs.gh + pkgs.nixfmt-rfc-style + pkgs.nix-doc + pkgs.nixpkgs-review + pkgs.shellcheck ]; programs.neovim.extraPackages = [ diff --git a/nix/environments/nix.nix b/nix/environments/nix.nix new file mode 100644 index 00000000..c14a07ed --- /dev/null +++ b/nix/environments/nix.nix @@ -0,0 +1,11 @@ +{ + buildEnv, + # + nixfmt-rfc-style, +}: +buildEnv { + name = "nix"; + paths = [ + nixfmt-rfc-style + ]; +} diff --git a/nix/environments/nixpkgs.nix b/nix/environments/nixpkgs.nix deleted file mode 100644 index bbd93e51..00000000 --- a/nix/environments/nixpkgs.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - buildEnv, - # - pkgs, -}: -buildEnv { - name = "nixpkgs-contribution"; - paths = [ - pkgs.gh - pkgs.nixfmt-rfc-style - pkgs.nix-doc - pkgs.nixpkgs-review - pkgs.shellcheck - ]; -}