ololduck
@ololduck@vit.am
127 following, 27 followers
if you've ever worked IT- settle a bet
| there is always a guy named Mike: | 0 |
| there are multiple Mikes: | 0 |
| have encountered a Mike-less workplace: | 0 |
If you suddenly needed £5000 cash could you get it? (let's say within 24 hours). #poll
| Yes easily: | 27 |
| Yes with some difficulty: | 20 |
| Maybe but I doubt it: | 8 |
| No definitely not: | 13 |
Closed
Banks are weird about cash actually. So even if you have it in the bank it might take more than 24 hours these days! But let's assume the bank isn't an arse about it
@Tattooed_Mummy Is it problematic for a bank to have 5 grand in the safe?
@AlienJay they are weird about how much you can take at once, ostensibly because of scams but I think it's also about money laundering, tax fraud etc etc etc. I don't even know if banks have vaults anymore
@Tattooed_Mummy Wow. So my money is regularly on my bank account. Nothing hidden. And they asking me questions because I wanna have my own money? That’s crazy.
Here in Germany they ask you questions in case you want to pay in on your bank account in cash and it’s over 10000€. This is because of money laundry and it’s understandable.
But I can just walk in, get out 10000€ from my account and walk out of the bank without being questioned about my own money.
@AlienJay yes they do that here when you pay in large amounts too. I had a quick Google and different banks have different rules, my own bank lets you withdraw any money you want assuming they have it in the bank. But some banks have limits.
@Tattooed_Mummy are you collecting details for who to extort/blackmail?
@Tattooed_Mummy For public consumption? Definitely "no". 😆
Le maximum est à trouver du côté de la pointe du Raz, à côté de Saint-Malo,Tandis que Paris, limitrophe de Reims, a eu 26°C cette nuit?
mechanical keyboard nerds: up to 35% off on Keychron's official website until June 26th!!
@bnjbvr Si tu veux, il me reste des patchs pour arrêter la cigarette. Peut-être que ça marche pour les claviers ?
@anthony c'est quels switches, les patches ?
@fabi1cazenave @bnjbvr C'est des switch tactile, tellement tactiles que c'est à base de "slaps with a large trout".
Little buddy I’m trying to work
This is based on an idea/software by @technomancy@hey.hagelb.org: https://search.technomancy.us/. Follow the links at the bottom of the page for nice articles detailing his motivations and reasoning,
There's still lots of work but i'm pretty proud of my UI (i'm still quite a noob with CSS, so when i do something a bit coherent i'm happy) and tag searching works honestly great for now. I'll need to see in the future what happens when the bookmark collection grows.
I'm happy!
@ololduck Have you seen Hister or ArchiveBox?
@ololduck yeah I thought that would be the main problem 😆 but it feels like those are three similar ideas, partially overlapping, maybe some combination would be great, interoperability. Rather than duplicating features and fracturing the effort.
@ololduck looks very sharp! nice work
consider also including a manifesto; that is one of my favorite features of mine =D
@ololduck
What crate do you use to embed the model?
Abbaye is a Static Site Generator (#SSG) for your #software releases, for those of us who can't or won't use a full-featured software forge.
Big release!
Some refactoring to make the code easier to maintain, some small bugfixes (mainly introduced by the new features :p).
But the star features of this release are:
[[builder]] category, name and comment keys in the configuration file.abbaye --verbose)abbaye self-update to get the latest version.Here's Abbaye's 0.8.0 page, as built with Abbaye itself: https://vit.am/~ololduck/abbaye/0.8.0/
Abbaye is a Static Site Generator (#SSG) for your #software releases, for those of us who can't or won't use a full-featured software forge.
This release simply fixes some minor issues and introduces #git branch/tag inclusion/exclusion when building the browsable repository as well as the https-cloneable one.
I had some work-in-progress branches on another project and wanted to publish a release for a small fix, and i saw that my work branches were still there, so… there you have it.
This release also includes an #AUR package but shhhhh! it's not 100% ready yet :D
Anyway, enjoy this release with abbaye self-update!
Here's Abbaye's 0.7.1 page, as built with Abbaye itself: https://vit.am/~ololduck/abbaye/0.7.1/
For the next release, i plan to add artifact categories so we can present artifacts in a more structured way. If you look at the "downloads" section, you'll see it's starting to be a bit crowded and unclear what does what.
Notes hebdomadaires #75: Un enfant de 10 ans prouve que les insectes ont une mémoire transgénérationnelle, Empathie, les gymbros améliorent accidentellement leurs performances cognitives, les couleurs Pantone des drapeaux LGBTQIA+, à quoi sert la police, Scritchy Scratchy, l’imposture du logiciel libre, et l’overdose de placebo.
Bon quand est-ce qu'on fout les patrons et actionnaires de Total, Airbus, etc en procès pour crime contre la planète ?
"Dès 1971, Total savait que ses activités pétrolières auraient des conséquences catastrophiques sur le climat."
Anyway, my blog can now (hopefully!) be reached via the #gemini protocol!
Okay, 2nd attempt!
Blog is now with gmi files ^^
gemini://uvokchee.de/all.gmi
and/or
gemini://uvokchee.de/index.gmi
(I don't know which works better for you)
@louisderrac « la formation de bulles informationnelles »
J'ai toujours été méfiant vis-à-vis de cette idée. Pas que les chambres d'écho n'existent pas, mais parce que ça idéalise le monde d'avant, vu comme un paradis citoyen où tout le monde partageait les mêmes références. Il y avait autant d'isolement dans les chambres d'écho avant, mais les intellectuels qui réduisaient le monde à leur bulle ne le voyaient pas. Les réseaux sociaux rendent ce problème explicite.
@louisderrac «
majoritairement des hommes, blancs et politiquement conservateurs »
Tiens, la classe sociale n'est pas mentionnée ? Il est vrai que, contrairement à la race, c'est un sujet tabou.
@bortzmeyer comme souvent, le numérique visibilise et amplifie plus qu'il ne crée des phénomènes nouveaux, c'est un de mes mantras. Mais force est de constater qu'avec l'hyperpersonnalisation de masse (oxymore qui définit les médias sociaux dominants pour moi), on ne fait plus culture commune dans un même espace (linguistique, générationnel, social).
@louisderrac « on ne fait plus culture commune dans un même espace » Oui, mais ça laisse entendre qu'avant on le faisait. J'ai de sérieux doutes.
are there any nice Git merge conflict resolution tools that work in the terminal? when i look at the text merge conflict I can never remember which code is which, and I really want to see them side by side
it feels like someone must have written some kind of nice tool in Rust
(edit: it seems like the answer is still just "vimdiff or the emacs equivalent", or "magit")
@b0rk I would be interested to know if any exist.
I think this is the _single_ example where I'm yeeting myself out of the terminal and use KDiff3 because it's so much easier than anything I've found to resolve merge conflicts...
@b0rk I use `delta` for diffs because of the great side-by-side view (and speed). Although I don't personally use it for merge conflicts, the docs do show an example: https://github.com/dandavison/delta#merge-conflicts
@b0rk this has looked good in screenshots and discussions from the author, but I haven't personally used it to be able to confirm it will meet your need: https://github.com/darrenburns/dv
@b0rk Vim has a builtin side-by-side diff tool, callable as 'vimdiff' for classic vim (`nvim -d` for neovim)! Having some familiarity with basic vim usage it advisable tho
@b0rk Maybe https://mergiraf.org/
@plaimbock i just tried mergiraf and the first time i tried it it gave me an incorrect solution to a merge conflict I had so I went back to the normal git merge algo I guess
@b0rk vimdiff and ediff can both be used from the terminal. Neither one of them is very enjoyable in 80x25, but on a larger (in particular, wider) terminal they are very usable. I use ediff routinely for this. This is easier from vc or magic (Emacs git modes), but can be done with readily-available scripts from outside Emacs. Git has direct support for vimdiff as a merge tool.
I sense that you're looking for a standalone tool equivalent to meld or similar; I don't know of one of those.
@b0rk vimdiff with conflictstyle = diff3 works well for me. From .gitconfig:
[merge]
tool = vimdiff
conflictstyle = diff3
@b0rk sure!
Just try: (1) magit's porcelain https://magit.vc/ in (2) "emacs -nw" along with (3) "git config --global merge.conflictstyle diff3"
A must-have!, let me know if you need more details.
@ErikMartinDorel ah yeah I am not going to use magit but it seems great for folks who use it!
@b0rk indeed... BTW a nice fact with emacs is that it smoothly runs in a tty setting, including some support for mouse in the terminal - cf. its (xterm-mouse-mode)
@b0rk Not directly an answer to your questions but I have found that using https://mergiraf.org/ can greatly reduce the number of conflicts I have to solve since it does the merge on a syntax tree level instead of a line based level.
@b0rk I've had some luck with delta https://github.com/dandavison/delta and lately have been giving lazygit https://github.com/jesseduffield/lazygit a look.
@b0rk there's sdiff, which can compare two files and produce a third one made out of left/right selections from each, but you'd need to script it up to make it work with git
@b0rk There’s a diff tool made for that (and more), it’s called "delta", which is a name impossible de google: https://dandavison.github.io/delta/ It integrates well with Git, with just some .gitconfig: https://dev.to/cloudx/delta-a-new-git-diff-tool-to-rock-your-productivity-2773
@b0rk I have been using xxdiff since forever (solaris days), please let me know if you find anything better
https://stackoverflow.com/questions/1234199/using-xxdiff-to-merge-in-linux#1236114
@b0rk I'm sure you've gotten a ton of answers, and this has probably been said, but the answer to complex merges is not to have them.
I know that sounds arrogant, but as a rough metaphor, I firmly believe that merge difficult is at least quadratic in the size of the diff, so it's far less work to do smaller merges more frequently, and to be clear, I don't mean just merging the main branch into your branch, but making sure your ongoing changes, to the extent possible, are also in the main branch. You don't have to be *done* with those changes, but if they aren't visible to others, you'll inevitably get more and more and more complicated conflicts.
What does frequently mean: well, two weeks is *way* too long, a few days is pretty good and although I never personally worked in a true continuous integration model, I am pretty sure that merges should become mostly a non-issue.
Regarding specific tooling, my experience is dated, but as an emacs user I agree the magit is simply the best tool I worked with for manipulating diffs. In particular, the ability the *split* individual diff hunks into smaller pieces, and then apply those incrementally really helps pick away at the "edges" of the change that area easier, leaving you with less in the way of the harder choices and often making them clearer.
Again emacs specific, but `diff-mode` supports this sort of diff editing as well, without having to buy into all of magit.
@DaleHagglund yeah i would give this advice too and I almost never do big merges but sadly as you know, Things Happen
@ololduck whenever you follow, reply, like etc a user or toot from another instance, the communication that happens in the background to facilitate that is the 'federation' that 'just happens'
so as an example, aiui, once you follow an off-instance user, your instance sends a notice that you want to follow that user, and starts to get notified of new posts by that user in future, so that they can be pulled in and presented to you in your local feed
@ololduck searching hashtags will only work for content that your instance would otherwise have seen, so if you're on a single user instance, you'll only see results for hashtags for posts that were already in your feed as that is the totality of the posts your instance knows about.
OTOH when you post with a hashtag, that post is visible to people searching that tag on all instances where at least one of their users already follows you, as your posts are federated to their instance already.
Have a good one!
@ololduck for really small instances there is the option / notion of feed "relays" so that you inherit a donor instance's 'firehose' of global content without having to actively follow a bunch of people, which gives you an enriched 'starter pack' of global activity based on what *that* instance sees in it's global timeline.
@ololduck https://wisechecker.com/mastodon-hashtag-federation-why-some-tags-are-sparse/ seems a reasonable write up in fuller detail
@ololduck Fedi.tips is pretty thorough, see eg
https://fedi.tips/why-arent-all-mastodon-and-fediverse-posts-and-accounts-automatically-visible-from-all-servers/
https://fedi.tips/why-does-someones-account-page-look-completely-blank-is-it-really-blank/
and probably the detail you want:
https://fedi.tips/which-posts-and-accounts-can-i-see-from-my-server/
General reminder among the entire #AUR thing.
If you depend on AUR packages, make sure they are maintained. Maintain them yourself if you need to, either as a local clone or in the AUR.
If you find yourself maintaining AUR packages and depending on a *lot* of things from the AUR (10+ packages). Ask yourself "huh, maybe I should become a package maintainer in the official repositories?".
Abbaye is a Static Site Generator (SSG) for your software releases, for those of us who can't or won't use a full-featured software forge.
Phew, this version has been in the works for a while, and I'm glad to finally release it.
The big highlight of this release is a brand new repository browser that allows you to look at the code of what you would (maybe) download. That's something that was missing compared to most other software release browsers.
You can now browse:
refs (branches, tags, etc.) of the repository;ref;ref.Note: The code browser is only generated for branch "tips" (i.e. the latest commit on the branch) and for tags (i.e. the latest commit on the tag).
All of this still as html files without any javascript.
And with the addition of the updater in the last release, all of this is a simple abbaye self-update away!
Here's Abbaye's 0.7.0 page, as built with Abbaye itself: https://vit.am/~ololduck/abbaye/0.7.0/
Voilà c'était mes 2 centimes, merci et au revoir.
Abbaye is a Static Site Generator (SSG) for your software releases, for those of us who can't or won't use a full-featured software forge.
Big usability features in this release! We got:
cargo builder, building different targets _also_ is in parallel!);self-update command to update abbaye to the latest version, based on Abbaye's own rss feed;Comment j'écris mes notes hebdomadaires: Comment je collecte et publie mes notes hebdomadaires.
@bnjbvr intéressant ! Pour ma part, c'est beaucoup moins sophistiqué que toi 😅 j'ai un template sur mon nextcloud, que je remplis au fur et à mesure de mes découvertes. Ça commence d'ailleurs souvent le lundi matin avec le Khrys'presso de Framasoft. Après, mes prises de notes sont rarement à chaud, mais si je m'interromps pour me souvenir, je note juste le truc et une phrase genre "podcast N : sympa et rigolo" et plus tard je reviens dessus pour en dire un peu plus. 1/2
Pour ma part c'était un souhait de rester un peu "roots" et manuel, de pas me laisser aller à mes pulsions de tout automatiser.
Généralement j'ai une note en brouillon dans le dépôt git de mon site sous Zola et j'y note au fur et a mesure les articles lus (je lis très peu d'articles sur un terminal autre que mon ordi desktop)
Et après je fais un pouet pour dire que j'ai posté une nouvelle note hebdo :D
Avec double langue si j'ai eu la foi de traduire la note en anglais.
Abbaye is a Static Site Generator for your software releases.
In this version (and the previous one i did not make an announcement for):
static directory exists, it will be copied at the root of the site, so you can now serve static assets too.[site.opengraph] section of your config.abbaye dump-schema to get the JSON schema of the abbaye.toml config file.I've been on the fence about hosting my own #fediverse account for a while now, mainly because of the insane hardware requirements.
I've considered pleroma/akkoma for a while, but i don't know the first thing about elixir and their docs are not the most clear. I've been really tempted by #GoToSocial, but #snac's easy install & general simplicity made me take the plunge.
Anyway. Having multiple light(er) Fediverse software is not really an issue, as long as they speak the same language behind the scenes.