ololduck
@ololduck@vit.am
133 following, 29 followers
So uhm has anyone here ever moved abroad by themselves? And by any chance to a much smaller town?
I feel like I'm about to commit social su*cide 🥲 #moveabroad
@Gina I moved from a 10mm city to a 5k town across an ocean. Does that qualify?
@lalalasombra absolutely! How did that go? How long did you end up staying?
@Gina Stayed for 7 years and am moving again sometime next month. Won’t be moving countries again though 😅
@Gina not abroad but might have as well been, I moved to Kampen and lived there for a year, and even though I travelled out of Kampen a lot I felt super miserable for all the time I was there. Make sure the place (city or town) you move to is one you feel connected with spiritually and you feel good there
@Gina where are you considering moving?
@ariadne from Amsterdam, the Netherlands to a small coastal town on the costa brava in Spain, about 30 min from Girona and 1.5 hrs from Barcelona.
@Gina @ariadne Cycling and hiking near Girona should be huge. The both communities usually are very nice and open. Outdoor climbing people are extremely lovely, but not sure how big climbing in Girona and nearby.
Also, the airport is close and flights are sanely priced, so different european events are in the reach.
Overall, may require some effort, but I bet you won't become socially isolated.
P.S. I'm abroad for 4 years.
The internet moves with you. And the daily business will lead you to regularly meet the same baker, fishmonger, café owner, cashier, someone walking a dog, ...
@Gina do you speak Spanish or Catalan? I'd say it's easier to make friends over there than in the Netherlands but English is not super common outside of the bigger cities (maybe except for tourist/expat overrun towns like Lloret, Malgrat, etc. and I wouldn't want to live there).
@Rovellat I speak a bit of Spanish, but definitely need to improve to have fluent conversations. Catalan is a whole different story.
I did order my food in Spanish just now, so I got that going for me I guess 🥲
@Gina Check if your Town Hall organizes Catalan/Spanish courses or practice groups. Many do and it's a good way to meet new people!
Also maybe see if there's road cycling/mountain biking groups if you like that. They usually meet on the weekends to tour and stop somewhere for breakfast or lunch. It's a great way to do sport, make friends and discover places to eat.
But yeah Girona is a small and quiet city, more so coming from Amsterdam. :)
Bona Sort!
@Gina I moved from Los Angeles to rural west Donegal. But since I play trad fiddle and had visited here for years, I already had a social network in the area.
If you don't already have group-oriented hobbies like choirs or similar, you should adopt some.
@hyc I just found out I can take helicopter lessons here, so who knows what sort of social network comes from that 😂
No but seriously, I'll need to find some bouldering/yoga/tech people.
@Gina yeah, whatever you're into, finding comrades there will make all the difference. A small community like this can get very lonely if you don't know anyone or the local pastimes.
Yes. It was shocking at the beginning. I was lonely. Than I met colleagues who integrated me in their social life and I understood that social life and rhythms are often different. We have to figure out the local usances.
@Gina yeah, three times. You'll meet new people in time. But you'll leave everything behind. If there's much you value more than the weather, it's probably better not to move.
@Gina the hardest days are the first ones, until your get you balance, your space, your comfort zone, your happiness.
It will come, with time, for me personally I don't care were I'm at, i just need my wife, my daughters, my cats.
Miss them every day.
@PMFL my cats are currently waiting at my front door for me 😭😭
True, #pookieandwessie will have to come with. And then I need to find community somewhere.
@Gina Not to pry, Gina, but the country and state and maybe the county all contribute context needed for an accurate answer to the "is this new place a social vacuum?" question.
@ottomate true, I would move from Amsterdam, The Netherlands to a small town on the costa brava in the north-east of Spain. 30 min from Girona and 1.5 hrs from Barcelona.
I moved from Copenhagen (c.1Mn) to Venice (60k) almost twenty years ago.
Already knew the language and Italian culture well, which helped.
Never hung out with other Danes or foreigners. My friends are almost all locals.
Got married, so I'm stuck. Still here.
@Gina I've only moved up in size. 15k Dutch village to 50k Norwegian city to 12+ million London. It's still not easy. Knowing folks in places helps.
@Gina Yup, both to the UK as well as to Spain and to both smaller and larger places.
In Spain I did get some acquaintances easily enough, but not the deep friendships I was used to. Felt like they kept part of themselves "family-only".
To meet people, it helps to join a local sportsteam and/or to start doing some voluntary work in the local community. Or to get a job locally ;-)
@Gina Yes, from Munich to Zurich, so though technically what you describe I don't think it's what you were looking for. Also 19.5 years ago.
@Gina I have never, but small towns can be more or less welcome to new people. I don't think there's a rule for it. I'd say it depends on how extrover you are.
anyway, too much variables. Sorry, I guess it didn't help much! 🤪
@Gina I have. But... I'm a guy, it was over 20 years ago, it has the same language and (broadly) culture, and the town I ended up in is 20X the size of the one I grew up in.
Not sure I'm the ideal person to ask, but happy to give advice if its useful and to give encouragement. It's a big deal. 😊
@Gina i think u’ll be fine :). just try to occupy urself and stay safe. might be interesting to explore the city and see whats there!
im very curious why u’re moving to spain (if ur fine explaining, no problem if not)
for me, i was thinking to move to a place with a lower cost of living once i achieve F.I.R.E. and spain was on that list. dunno where i would end up tho tbh. achieving F.I.R.E. seems so far away
@Logical_Error this! I didn't mention this, but obviously saving up and investing is also a concern. The aim is a slightly lower cost of living and a basic form of FIRE, which seems surprisingly challenging in Spain.
In all honesty, it was between Spain and Italy because they have the lowest taxes (Beckham law and Regime Impatriati), moving to France would cost me tens of thousands. But, if housing is a lot cheaper in France it's worth considering again.
There are still some medium/small cities in france near the sea that have low-ish rent/cost of living. You just have to look way north of the mediteranean sea. I'm currently in Douarnenez, in britanny and pay 560€/Month for 80m².
Considering the weather we had this summer, i'd say you would be happy if you liked the heat. Maybe look for rentals on the north coast of britanny?
@Gina moved to spain. from big city to town (gran pueblo, as they say here). august is the worst with everyone on vacation and everything closed. in september normal life resumes. i met people via workshos in the library or the casa de cultura or language course.
but yeah, building friendships is more with people who moved here. locals often have their family and their cuadrilla.
Hey nerdy friends, which distro is the most stable and competent in a professionnel environnement (understand : configure network things and stuff) while also have I3 like features?
@thomasorus https://manjaro.org/products/download/x86
Community Edition i3
@neauoire Do you know what's the deal between i3 and sway? Unsure about which one I should take.
@thomasorus I don't really have any experience with sway, sorry. I've always only ever used i3.
Randos will barge into this thread with opinions about how one or the other is terrible and whatever. Don't give them any mind. Try the community edition, if you're not happy with it, move on, but I doubt you'll be dissastifed.
Another step closer to release!
The official website is now live at https://littlefedi.org/ with documentation and project details.
Take a look and let me know what you think!
@stefano
> The official website is now live at https://littlefedi.org/
I just skimmed a bit of the overview. This sounds amazing
How is LittleFedi similar and different from Epicyon, for example, which has broadly similar goals, as it was designed to add ActivityPub support to LibreServer.
Also, is any of the code auto-generated, or is it all handrolled the old-fashioned way?
@strypey @bob "In a period where it is fashionable to boast about the dozens of AI agents doing things on your behalf, we are the Little Computer People.
We are people who love doing things with our computer, who treat it as an instrument of creativity, of expression, of life. Of friendship, of play, of letting off steam, of sharing."
Epicyon is great, and more similar to snac. littleFedi has a different purpose - being complete, while still being minimal and self-host able also on low end SBC
No auto-generated code then. What a breath of fresh air!
@stefano
> being complete, while still being minimal and self-host able also on low end SBC
... sounds like Epicyon to me. LibreServer too is designed for DYI hosting, on any consumer hardware with a permanent net connection (with or without a fixed IP). What am I missing?
@stefano the site looks kinda like ai made
@dalem why?
@kjv @dalem @wideshut it's "modern web design". That's why the LLMs are using it - because it's what people want now. So it's become one of those "it's a LLM" signature. Personally, my idea of web site is a little different, but I didn't do that.
It reminds me the em dash. I've been using them for many years, but I had to stop otherwise people will think it's AI stuff.
Not AI slop. Just my own genuine, bad production 😆
@stefano @dalem "<x> <thing1>, <x> <thing2>, <x> <thing3>" in the text reads as an LLM-tell these days (eg "No runtime to keep current, no database server to babysit, no container stack, no build pipeline"). Because, of course, LLMs were trained on text authored by people that used this construction.
@stefano Nice looking project. And great that you, just like snac, care about the option for people to be able use minimal and small hardware as server and also think about others who may have slow Internet connection or prefer minimal. 
@stefano Bookmarked.
I will be following with interest as the idea of having my own instance running on one of my Raspberry Pi 5s is something I have been thinking about for a while.
Or a more private non-federated set up so my offspring can use it to chat with their local group of friends.
Ra (Freyja) (it/its)𒀭𒈹𒍠𒊩 (cringe EU-brained military girl) [we/us; q=1.2; use_third_person=true; details_link=<none>, it/its; q=1.0, she/her; q=0.9; they/them; q=0.1, */*; q=0.0] » 🌐
@freya@social.highenergymagic.net
@stefano aww, I'm guessing this requires go >1.18? cause I'd love to run one of these on my Sun Ultra 45, but gccgo only targets go1.18
Damn, this might become my go-to if I ever properly poke at ActivityPub dev again. It looks super good, and I'm a sucker for a single-binary webapp!
@ducky.ws if you meanwhile want to test it, I can send you an invite code for the "test" instance
Oooh, that'd be brilliant! You'd have to send a code to my fedi: @wafrn.ducky.ws@bsky.brid.gy (@ducky@app.wafrn.net)
@andi I haven't created it but I've been involved in the project and accepted to join the team.
Snac is great and I think it's the right way to produce software: minimal, without any specific dependencies and lightweight.
littleFedi is a little different. It aims to be good on low end hardware but it's more bloated, as it is in go and depends on some libraries. Still, I think it's doing great on low power hardware. It also aims to have a broader support of features, despite staying minimal, so it's more like a "young Mastodon" than snac.
And the blog feature can be really appreciated.
So snac is still (and will be) my first choice for projects and to stay minimal. littleFedi will be another great choice for other things. All in all, they help to avoid monoculture so they're great.
@stefano@bsd.cafe I like the layout of the site and colours. Still going through it as there is a lot to take in :>
Kudos and thank you for making all this.
"Pages are rendered on the server. Posting, reading, settings and moderation all work with scripting off, and the composer keeps its plain textarea fallback."
Come to my arms! 😁
@stefano I don’t have a use case for it, but I love the ethos, growability (for lack of a better word) and operations focus. I’d love to see more software like this.
FACEBOOK IS TOXIC. META IS AWFUL.
WHY CONTINUE FEEDING IT? 💎
Nearly everyone complains about Facebook and Meta.
The algorithms are toxic.
The advertising is invasive.
The outrage is manufactured.
CHILDREN ARE BEING HARMED.
Privacy is disappearing.
And then millions of people open Facebook or Instagram.
Again.
And again.
I genuinely do not understand it.
If you believe these companies are damaging children, manipulating attention, and making billions from human vulnerability, why are you still giving them your presence?
Especially the parents.
If Facebook and Instagram are unhealthy for your children, what exactly are you modeling by remaining there yourself?
“We know this place is harmful, darling, but Mummy and Daddy have photographs to look at.”
I left Meta years ago.
I didn’t die.
My friends did not evaporate.
Civilization continued.
There is email.
There are phones.
THERE IS THE OPEN WEB.
There is even the terrifying possibility of seeing another human being, god forbid, in person.
Meta survives because people who complain about it continue supplying exactly what it needs:
Their attention.
Their relationships.
Their outrage.
THEIR CHILDREN.
You do not have to wait for Zuckerberg to become a better person.
You can simply leave today.
The door swings both ways.
#Facebook #Meta #Instagram #SocialMedia #Algorithms #BigTech #DigitalWellbeing #OnlineSafety #ChildSafety #Privacy #AttentionEconomy #TechEthics #SocialMediaAddiction #Zuckerberg #DeleteFacebook
Exactly.
We’ve somehow confused communication with the corporations that mediate it.
Email still works.
SMS still works.
The open web still works.
The Fediverse works.
But people now ask, “How will I contact you?” when what they really mean is, “Which closed platform are you still trapped inside?”
That dependency is the problem.
#Facebook #Meta #SocialMedia #OpenWeb #Fediverse #Mastodon #SMS #Email #DigitalIndependence #BigTech
@Robinzz3 Bingo. It’s amazing how I’m on almost every open platform you can imagine, and yet, nobody can seem to locate me. It is ridiculous. I personally don’t understand how people tolerate the modern Facebook user interface. Every time I am forced to go there because the company or the individual doesn’t have a web site, and I’m forced to navigate their crappy UI, it gives me a migraine. I’ll never understand why people tolerate it nor leave. I have been toying around with the idea of forcing everybody into more open ways of communicating, like, if they want to communicate with me, I don’t meet them where they are at, they need to send me a message on amor open communication Avenue
Yes, exactly.
I think the answer may simply be to stop maintaining accounts on closed platforms just to make ourselves easy to reach.
I’m happy to communicate.
Email me.
Text me.
Find me on the Fediverse.
Use the open web.
But I don’t think we should have to keep feeding Facebook, Messenger, WhatsApp or any other closed system simply because somebody else refuses to use anything else.
That isn’t lack of communication.
It’s choosing the terms of communication.
#OpenWeb #Fediverse #Facebook #Meta #DigitalIndependence #SocialMedia
@Robinzz3 @WeirdWriter
*popping in to the chat* my problem is that many local businesses and even the local council use Facebook for announcements. If I'm not there i miss warnings of powercuts, changes to timings of local events etc etc
It's not about contacting me, it's about knowledge only shared there that I need
Yes, that’s a real problem.
If a council, utility, or local business puts important public information only on Facebook, then people are effectively being forced onto a private corporate platform just to know what is happening in their own community.
That information should also be available on an ordinary website, by email, SMS, RSS, or other open channels.
Leaving Meta shouldn’t mean opting out of civic life.
@Tattooed_Mummy @Robinzz3 Yeah it’s super frustrating. I hate it, but I had to reactivate my account for this very reason
Pour #Kresus, on va migrer de système de forum. On utilise #Discourse à l'heure actuelle, mais c'est vraiment trop lourd pour mon petit VPS. Je pensais passer à #Flarum, qui a l'air simple, modulaire et rapide ; des opinions ? des recommendations d'autres systèmes ?
Autre question : est-ce qu'on migre les posts à votre avis ? ou est-ce qu'on garde une simple archive HTML statique ? (simple au point de ne pas avoir de recherche)
Si on migre les posts, est-ce qu'on re-créé des utilisateur·ices fantômes ? ou est-ce que c'est un unique utilisateur `archive-discourse` qui reposte tout ?
reboosts et réponses et opinions et conseils appréciés 
@bnjbvr Tiens-nous au courant de la solution que tu retiendras STP. Le sujet m’intéresse vivement. ^^
@bnjbvr quel est l'intérêt / le plus de garder les posts ? Quels sont les inconvénients de les supprimer ?
@Natouille Bah, y a des conversations qui ont littéralement commencé hier et qui disparaissent du coup du jour au lendemain. Je me dis que les gens motivé·es reviendront s'inscrire et reposter, mais ça me semble un peu rude quand même ?
(Et puis plein de gens cherchent dans le forum des réponses aux problèmes sur lesquels iels sont également tombé·es.)
Mais pour tout ça… bah une archive statique ça suffit pas mal héhé
@bnjbvr whether or not to migrate your existing content probably depends on the quality and quantity of them. If they cause good traffic, then they're probably worth keeping. In the end it's a strategic choice only the owner can really decide on.
ps. Love that you're checking out Flarum 🥳
If you have any questions, let me know.
@bnjbvr salut, il y a un outils permettant la migration Discours vers Flarum v2
@McFlyPartages ah chouette ! Il s'avère que j'ai installé la v1 haha, la v2 est encore en beta de ce que je vois 👀
@bnjbvr J'envisage la même chose pour une asso. Du coup si tu peux partager comment tu as migré (quand ce sera fait) , alors ça m’intéresse, merci ;)
@bnjbvr j'ai pas d'avis sur le système de destination mais j'ai découvert Nitro Porter, pour convertir les posts d'une plate-forme à l'autre.
Y'a pas de "source" Discourse mais peut-être est-ce l'occasion d'utiliser leur backeng générique API pour en créer et le reverser à la communauté (ça sent pas le truc léger à faire).
@thom4 Ça a l'air très chouette mais j'ai un peu la flemme de passer des heures à faire une migration propre, tout en me disant que ça me semble compliqué de migrer les users (leurs mots de passe notamment ? ils sont sûrement hashés, et peu de chance que ce soit hashé de la même manière partout ). Même au delà de l'aspect technique, y a un truc chouette de se dire que je respecte le consentement de celleux qui veulent vraiment revenir s'inscrire :)
@bnjbvr j'avais regardé avec envie flarum 2.0 mais ça fait plus d'un an. La dynamique m'a semblé absente.
@usul écoute le projet a l'air méga actif (écrit par un bandeur de l'IA, certes, mais méga actif)
Du coup, pour commencer, j'ai effectué la version « simple » :
- archive statique de l'ancien Discourse : https://discourse.kresus.org/
- nouveau forum sous Flarum, vierge de tous utilisateur·ices et sujets mais à la même adresse https://community.kresus.org/
Et si besoin, j'ai aussi un gros fichier JSON qui contient tous les posts du forum (extrait par l'outil aussi), et encore les fichiers de DB de Discourse. Mais honnêtement ça me va. Pas besoin de plus que ça, les sujets importants reviendront 😌
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".
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.