primrose/.files
1
0
Fork 0
mirror of https://codeberg.org/leana8959/.files.git synced 2025-12-06 06:39:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request 'Upgrade to 25.05' (#12) from pre-25.05 into trunk

Browse source 
Reviewed-on: https://codeberg.org/leana8959/.files/pulls/12
This commit is contained in:
Plume 2025-05-22 23:37:25 +02:00
commit da99b0e9f2
26 changed files with 96 additions and 218 deletions
Download patch file Download diff file Expand all files Collapse all files

29
nix/configurations/tungsten/home/dev.nix
View file

@ -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;
# extensions = [
# pkgs.vscode-extensions.redhat.java
# pkgs.vscode-extensions.vscjava.vscode-java-pack
# ];
# };
}

6
nix/configurations/tungsten/home/firefox.nix
View file

@ -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];
};

5
nix/configurations/tungsten/home/misc.nix
View file

@ -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

2
nix/configurations/tungsten/home/programs.nix
View file

@ -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

6
nix/configurations/tungsten/nixos/gui.nix
View file

@ -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 = {

4
nix/configurations/tungsten/nixos/input.nix
View file

@ -14,10 +14,6 @@
};
users.users.leana.extraGroups = ["scanner"];
hardware.sane = {
enable = true;
brscan5.enable = true;
};
services.fprintd.enable = false;

9
nix/configurations/vanadium/home/dev.nix
View file

@ -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 = [
@ -38,7 +45,7 @@
programs.vscode = {
enable = true;
extensions = [
profiles.default.extensions = [
pkgs.vscode-extensions.redhat.java
pkgs.vscode-extensions.vscjava.vscode-java-pack
];

19
nix/configurations/vanadium/home/firefox.nix
View file

@ -20,17 +20,26 @@ in {
profiles = {
default = {
extensions = let
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 [
addons.languagetool
addons.sponsorblock
addons.return-youtube-dislikes
addons.shinigami-eyes
addons.consent-o-matic
addons.tree-style-tab
];
};
@ -42,7 +51,7 @@ in {
userChrome
;
extensions = let
extensions.packages = let
addons = nur.repos.rycee.firefox-addons;
in [addons.multi-account-containers];
@ -69,7 +78,7 @@ in {
userChrome
;
extensions = let
extensions.packages = let
addons = nur.repos.rycee.firefox-addons;
in [addons.tampermonkey];
};

6
nix/configurations/vanadium/home/misc.nix
View file

@ -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

17
nix/configurations/vanadium/home/programs.nix
View file

@ -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
@ -64,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
@ -77,9 +90,7 @@ in {
myPkgs.xbrightness
pkgs.dmenu
pkgs.xclip
pkgs.playerctl # talk to playerctld
pkgs.hacksaw
pkgs.shotgun
pkgs.maim
pkgs.xscreensaver # talk to xscreensaver
pkgs.xcolor

9
nix/configurations/vanadium/home/xmonad/xmonad.hs
View file

@ -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
@ -188,9 +185,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 )

6
nix/configurations/vanadium/nixos/gui.nix
View file

@ -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 = {

3
nix/configurations/vanadium/nixos/input.nix
View file

@ -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;

3
nix/configurations/vanadium/nixos/misc.nix
View file

@ -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"

19
nix/environments/creation.nix
View file

@ -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
];
}

15
nix/environments/fun.nix
View file

@ -1,15 +0,0 @@
{
buildEnv,
#
myPkgs,
pkgs,
}:
buildEnv {
name = "fun";
paths = [
myPkgs.prop-solveur
myPkgs.hbrainfuck
pkgs.lucky-commit
];
}

5
nix/environments/haskell.nix
View file

@ -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

11
nix/environments/nix.nix Normal file
View file

@ -0,0 +1,11 @@
{
buildEnv,
#
nixfmt-rfc-style,
}:
buildEnv {
name = "nix";
paths = [
nixfmt-rfc-style
];
}

15
nix/environments/nixpkgs.nix
View file

@ -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
];
}

17
nix/environments/rust.nix
View file

@ -1,17 +0,0 @@
{
buildEnv,
#
pkgs,
}:
buildEnv {
name = "rust";
paths = with pkgs; [
gcc
cargo
rustc
rustfmt
rust-analyzer
clippy
];
}

2
nix/homeModules/common/fcitx5/default.nix
View file

@ -11,7 +11,7 @@
];
};
xdg.configFile = lib.mkIf (config.i18n.inputMethod.enabled != null) {
xdg.configFile = lib.mkIf config.i18n.inputMethod.enable {
"fcitx5".source = "${./fcitx}";
};
}

9
nix/homeModules/common/firefox.nix
View file

@ -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 = {
@ -48,7 +43,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

2
nix/homeModules/common/gpg.nix
View file

@ -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 = [

45
nix/packages/by-name/ltex-ls-plus/package.nix
View file

@ -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;
};
}

2
nix/packages/by-name/tokei/package.nix
View file

@ -20,7 +20,7 @@ in
hash = "sha256-jCI9VM3y76RI65E5UGuAPuPkDRTMyi+ydx64JWHcGfE=";
};
cargoHash = "sha256-XvRO5AbPYZVRVxqFmKf2Xn4K9VvZyb3eyJLu/cGrPdI=";
cargoHash = "sha256-LzlyrKaRjUo6JnVLQnHidtI4OWa+GrhAc4D8RkL+nmQ=";
patches = [
./skel.patch

48
nix/sources.json
View file

@ -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/<owner>/<repo>/archive/<rev>.tar.gz",
"version": "v1.8.0"
"version": "v1.11.0"
},
"flake-compat": {
"branch": "master",
@ -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/<owner>/<repo>/archive/<rev>.tar.gz"
},
"hutils": {
@ -98,27 +98,15 @@
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.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_template": "https://github.com/<owner>/<repo>/archive/<rev>.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": "https://github.com/NixOS/nixpkgs/archive/2e1496bf8652ff4af4e4d4737277f71e4a4f5cb2.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixpkgs-unstable": {
@ -157,6 +145,18 @@
"url": "https://github.com/NixOS/nixpkgs/archive/f6cf0e77542dd938f002652dd54391b973f792de.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.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/<owner>/<repo>/archive/<rev>.tar.gz"
},
"pin-isabelle": {
"branch": "master",
"description": "Nix Packages collection & NixOS",