chore: merge main into infra #255

Merged

b12f merged 18 commits from chore/infra-merge-main into infra 2023-09-13 11:29:20 +00:00

Conversation 0 Commits 18 Files changed 17 +219 -642

teutat3s commented 2023-09-13 11:18:29 +00:00

Owner

Copy link

Update flake inputs and sync fixes from main branch

Update flake inputs and sync fixes from `main` branch

teutat3s added 18 commits 2023-09-13 11:18:31 +00:00

feat: use nnn and treesitter ... 41c2d668f7

vifm is removed in favour of nnn, with the keybindings in nvim being
changed. TODO: improve the colorscheme of `nnn` to match `ls`.

All nvim plugins that were responsible for language syntax highlighting
are removed in favour of treesitter[1], a syntax highlighter that parses
AST instead of being regex-based. This is still experimental, but my
tests so far have not encountered any issues.

1) https://github.com/nvim-treesitter/nvim-treesitter

fix: load schemastore for nvim e36709613c

Bump flake inputs nixos + latest in lockfile ... fd74f59c39

• Updated input 'latest':
    'github:nixos/nixpkgs/645ff62e09d294a30de823cb568e9c6d68e92606' (2023-07-01)
  → 'github:nixos/nixpkgs/2de8efefb6ce7f5e4e75bdf57376a96555986841' (2023-07-12)
• Updated input 'nixos':
    'github:nixos/nixpkgs/b72aa95f7f096382bff3aea5f8fde645bca07422' (2023-06-30)
  → 'github:nixos/nixpkgs/fcc147b1e9358a8386b2c4368bd928e1f63a7df2' (2023-07-13)

Fix merge conflict leftovers 9271e8d037

neovim: add syntax highlighting for ini, lua, ... 1fe6d34f6e

bash, make, ninja, diff, php

Sort nvim-treesitter.withPlugins alphabetically

feat: add back vim-gutentags to nvim d951e821b3

feat: add line length indicators to gitmessage 9bade4eb64

Merge pull request 'feat: use nnn and treesitter' (#235) from feat/nnn into main ... 8f4f5687f2

Reviewed-on: #235
Reviewed-by: teutat3s <teutates@mailbox.org>

nvfetcher: use version 0.6.1.0 from latest instead of flake 2d27b9c315

graphical: fix network-manager-applet service description 5a05079e17

Bump nvfetcher 88404be55b

flake: update nixos + latest inputs ... 5acbaa3dd5

• Updated input 'latest':
    'github:nixos/nixpkgs/2de8efefb6ce7f5e4e75bdf57376a96555986841' (2023-07-12)
  → 'github:nixos/nixpkgs/5df4d78d54f7a34e9ea1f84a22b4fd9baebc68d0' (2023-07-20)
• Updated input 'nixos':
    'github:nixos/nixpkgs/fcc147b1e9358a8386b2c4368bd928e1f63a7df2' (2023-07-13)
  → 'github:nixos/nixpkgs/08700de174bc6235043cb4263b643b721d936bdb' (2023-07-18)

Merge pull request 'nvfetcher: use version 0.6.1.0 from latest instead of flake' (#249) from main-nvfetcher-override into main ... fcf960a70f

Reviewed-on: #249

Bump flake inputs in lock file ... 110e0aefad

• Updated input 'latest':
    'github:nixos/nixpkgs/5df4d78d54f7a34e9ea1f84a22b4fd9baebc68d0' (2023-07-20)
  → 'github:nixos/nixpkgs/3a2786eea085f040a66ecde1bc3ddc7099f6dbeb' (2023-09-11)
• Updated input 'nixos':
    'github:nixos/nixpkgs/08700de174bc6235043cb4263b643b721d936bdb' (2023-07-18)
  → 'github:nixos/nixpkgs/e5f018cf150e29aac26c61dac0790ea023c46b24' (2023-09-12)
• Updated input 'darwin':
    'github:LnL7/nix-darwin/b06bab83bdf285ea0ae3c8e145a081eb95959047' (2023-07-02)
  → 'github:LnL7/nix-darwin/4496ab26628c5f43d2a5c577a06683c753e32fe2' (2023-09-12)
• Updated input 'deploy':
    'github:serokell/deploy-rs/724463b5a94daa810abfc64a4f87faef4e00f984' (2023-06-14)
  → 'github:serokell/deploy-rs/31c32fb2959103a796e07bbe47e0a5e287c343a8' (2023-09-12)
• Updated input 'home':
    'github:nix-community/home-manager/07c347bb50994691d7b0095f45ebd8838cf6bc38' (2023-06-27)
  → 'github:nix-community/home-manager/9787dffff5d315c9593d3f9fb0f9bf2097e1b57b' (2023-09-11)
• Updated input 'nixos-hardware':
    'github:nixos/nixos-hardware/429f232fe1dc398c5afea19a51aad6931ee0fb89' (2023-06-15)
  → 'github:nixos/nixos-hardware/3ccd87fcdae4732fe33773cefa4375c641a057e7' (2023-09-13)

Fix nvfetcher by using forked nixpkgs ... dfd80c0e95

See upstream issue: https://github.com/NixOS/nixpkgs/issues/249962

Use docker version 24 d83389b1dd

Merge pull request 'Bump flake inputs in lock file' (#254) from feat/main-bump-flake-lock into main ... 4a7b5f3bb2

Reviewed-on: #254

Merge branch 'main' into chore/infra-merge-main 12307872d6

b12f approved these changes 2023-09-13 11:29:13 +00:00

b12f merged commit df50f9ff2d into infra 2023-09-13 11:29:20 +00:00

b12f deleted branch chore/infra-merge-main 2023-09-13 11:29:20 +00:00

b12f referenced this pull request from a commit 2023-09-13 11:29:20 +00:00

Merge pull request 'chore: merge main into infra' (#255) from chore/infra-merge-main into infra

Sign in to join this conversation.

Reviewers

No reviewers

b12f

Labels

Clear labels   

bug

Something is not working

  

duplicate

This issue or pull request already exists

  

enhancement

New feature

  

help wanted

Need some help

  

invalid

Something is wrong

  

question

More information is needed

  

wontfix

This won't be fixed

No labels

bug

duplicate

enhancement

help wanted

invalid

question

wontfix

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

2 participants

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: pub-solar/os#255

No description provided.