Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1cad2253b3 | |||
091e23932d
|
|||
|
c1bebc9df1
|
|||
|
7d79e9d8ae
|
|||
|
ebd650e854
|
|||
|
5becaf1588
|
|||
|
447c95c22d
|
@ -3,7 +3,7 @@ run-name: iso building
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- 'master'
|
||||
- 'iso'
|
||||
|
||||
jobs:
|
||||
test:
|
||||
|
||||
42
flake.lock
generated
42
flake.lock
generated
@ -5,11 +5,11 @@
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1768575137,
|
||||
"narHash": "sha256-e0SsKnkSnq+UwZNS9ZyPJjTjabzq9TRc1hqeDnvOF1Q=",
|
||||
"lastModified": 1771587924,
|
||||
"narHash": "sha256-eVYOGmF8nQBhudJyU6lHdgJI87kvGz8JyCq5/Vi9Mjk=",
|
||||
"owner": "catppuccin",
|
||||
"repo": "nix",
|
||||
"rev": "48e67b4ad22072f1ae30b0ed8e1cb020cf06c611",
|
||||
"rev": "b0c65edbf31c2ad3d84438d82c2310f2c28373f3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -26,11 +26,11 @@
|
||||
},
|
||||
"locked": {
|
||||
"dir": "pkgs/firefox-addons",
|
||||
"lastModified": 1768622624,
|
||||
"narHash": "sha256-Em6PP667PeXbEjidbV2LnNwmUYohbrSFvVPLYLUDHms=",
|
||||
"lastModified": 1771669320,
|
||||
"narHash": "sha256-LqmgIBpjpMQKkHKCSGJkluMVFFoBdkUhJnu+Cq+jgGc=",
|
||||
"owner": "rycee",
|
||||
"repo": "nur-expressions",
|
||||
"rev": "8061c6d9199dc6cc0727d4241959eea28f2fa0a6",
|
||||
"rev": "496abb3aef244b896bf7cdd65e071cf624f16338",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
@ -47,11 +47,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1768598210,
|
||||
"narHash": "sha256-kkgA32s/f4jaa4UG+2f8C225Qvclxnqs76mf8zvTVPg=",
|
||||
"lastModified": 1771647911,
|
||||
"narHash": "sha256-18liNHHwOmcaKCpOptE3wLW97fm5v7RTLiZBecX7km0=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "c47b2cc64a629f8e075de52e4742de688f930dc6",
|
||||
"rev": "436b27742c996b75e2baf8e835e3b3eae0c9fbd4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -62,11 +62,11 @@
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1768584846,
|
||||
"narHash": "sha256-IRPmIOV2tPwxbhP/I9M5AmwhTC0lMPtoPStC+8T6xl0=",
|
||||
"lastModified": 1771423359,
|
||||
"narHash": "sha256-yRKJ7gpVmXbX2ZcA8nFi6CMPkJXZGjie2unsiMzj3Ig=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "cce68f4a54fa4e3d633358364477f5cc1d782440",
|
||||
"rev": "740a22363033e9f1bb6270fbfb5a9574067af15b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -78,11 +78,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1768305791,
|
||||
"narHash": "sha256-AIdl6WAn9aymeaH/NvBj0H9qM+XuAuYbGMZaP0zcXAQ=",
|
||||
"lastModified": 1771369470,
|
||||
"narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "1412caf7bf9e660f2f962917c14b1ea1c3bc695e",
|
||||
"rev": "0182a361324364ae3f436a63005877674cf45efb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -94,11 +94,11 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1768564909,
|
||||
"narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
|
||||
"lastModified": 1771369470,
|
||||
"narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f",
|
||||
"rev": "0182a361324364ae3f436a63005877674cf45efb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -125,11 +125,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1768481291,
|
||||
"narHash": "sha256-NjKtkJraCZEnLHAJxLTI+BfdU//9coAz9p5TqveZwPU=",
|
||||
"lastModified": 1771524872,
|
||||
"narHash": "sha256-eksVUcUsfS9mQx4D9DrYu88u9w70bAf+n6KmTDuIGEE=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "e085e303dfcce21adcb5fec535d65aacb066f101",
|
||||
"rev": "e85540ffe97322dc1fea14dd11cdc2f59d540ac7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@ -90,7 +90,7 @@
|
||||
|
||||
|
||||
homeConfigurations = {
|
||||
vbox = homeConfig { flakeName = "vbox";};
|
||||
default = homeConfig { flakeName = "default";};
|
||||
ft = homeConfig { flakeName = "ft"; username = "tomoron"; homeDir = "/home/tomoron"; sops = false;};
|
||||
laptop = homeConfig { flakeName = "laptop"; };
|
||||
desktop = homeConfig { flakeName = "desktop"; };
|
||||
|
||||
@ -6,13 +6,14 @@
|
||||
};
|
||||
|
||||
home.sessionVariables.BROWSER = "yazi";
|
||||
programs.bash.bashrcExtra = ''
|
||||
function y() {
|
||||
local tmp="$(mktemp -t "yazi-cwd.XXXXXX")" cwd
|
||||
yazi "$@" --cwd-file="$tmp"
|
||||
IFS= read -r -d "" cwd < "$tmp"
|
||||
[ -n "$cwd" ] && [ "$cwd" != "$PWD" ] && builtin cd -- "$cwd"
|
||||
rm -f -- "$tmp"
|
||||
}
|
||||
'';
|
||||
programs.yazi.shellWrapperName = "y";
|
||||
# programs.bash.bashrcExtra = ''
|
||||
# function y() {
|
||||
# local tmp="$(mktemp -t "yazi-cwd.XXXXXX")" cwd
|
||||
# yazi "$@" --cwd-file="$tmp"
|
||||
# IFS= read -r -d "" cwd < "$tmp"
|
||||
# [ -n "$cwd" ] && [ "$cwd" != "$PWD" ] && builtin cd -- "$cwd"
|
||||
# rm -f -- "$tmp"
|
||||
# }
|
||||
# '';
|
||||
}
|
||||
|
||||
@ -46,7 +46,7 @@ in
|
||||
text = (lib.strings.concatStrings [''
|
||||
auto=true
|
||||
root=${config.mods.sync.homeFolder}
|
||||
root=ssh://tom@free.tmoron.fr:1880/${config.mods.sync.destFolder}
|
||||
root=ssh://tom@d.tmoron.fr:1880/${config.mods.sync.destFolder}
|
||||
''
|
||||
(lib.strings.concatMapStrings (x: "\npath=" + x) (( if config.mods.sync.defaultSynced then defPathLst else [] ) ++ config.mods.sync.syncedAdditions ))
|
||||
(if !(isNull config.mods.sync.customHostName) then "\nclientHostName=${config.mods.sync.customHostName}" else "")
|
||||
|
||||
@ -20,13 +20,57 @@
|
||||
nixd
|
||||
nodejs_24
|
||||
glsl_analyzer
|
||||
(pkgs.python3.withPackages (ps: with ps; [
|
||||
python-lsp-server
|
||||
pylsp-mypy
|
||||
python-lsp-ruff
|
||||
pycodestyle
|
||||
]))
|
||||
];
|
||||
|
||||
# programs.neovim.extraLuaConfig = ''
|
||||
# vim.lsp.config('pylsp', {})
|
||||
# '';
|
||||
|
||||
programs.neovim.initLua= ''
|
||||
local coq = require "coq"
|
||||
|
||||
vim.lsp.config('clangd', coq.lsp_ensure_capabilities({}))
|
||||
vim.lsp.enable('clangd')
|
||||
|
||||
vim.lsp.config('nixd', coq.lsp_ensure_capabilities({}))
|
||||
vim.lsp.enable('nixd')
|
||||
|
||||
vim.lsp.config('glsl_analyzer', coq.lsp_ensure_capabilities({}))
|
||||
vim.lsp.enable('glsl_analyzer')
|
||||
|
||||
vim.lsp.config('pylsp', coq.lsp_ensure_capabilities({
|
||||
settings = {
|
||||
pylsp = {
|
||||
plugins = {
|
||||
pycodestyle = {
|
||||
ignore = {'E501'},
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}))
|
||||
vim.lsp.enable('pylsp')
|
||||
|
||||
vim.diagnostic.config({
|
||||
virtual_lines = {
|
||||
current_line = true
|
||||
}
|
||||
})
|
||||
|
||||
'';
|
||||
|
||||
programs.neovim.extraConfig = ''
|
||||
set number
|
||||
set ai
|
||||
autocmd BufWinLeave *.* mkview
|
||||
autocmd BufWinEnter *.* silent! loadview
|
||||
autocmd VimEnter * COQnow --shut-up
|
||||
set tabstop=4
|
||||
set scrolloff=10
|
||||
set smartindent
|
||||
@ -62,13 +106,13 @@
|
||||
Plug 'lambdalisue/fern-renderer-nerdfont.vim'
|
||||
Plug 'lambdalisue/fern-git-status.vim'
|
||||
Plug 'lambdalisue/fern.vim'
|
||||
Plug 'ms-jpq/coq_nvim', { 'branch': 'coq' }
|
||||
Plug 'ms-jpq/coq.artifacts', { 'branch': 'artifacts' }
|
||||
Plug 'ms-jpq/coq.thirdparty', { 'branch': '3p' }
|
||||
call plug#end()
|
||||
|
||||
colorscheme catppuccin-mocha
|
||||
|
||||
lua require'lspconfig'.clangd.setup{}
|
||||
lua require'lspconfig'.nixd.setup{}
|
||||
lua require'lspconfig'.glsl_analyzer.setup{}
|
||||
set signcolumn=auto
|
||||
|
||||
nnoremap <leader>ff <cmd>Telescope find_files<cr>
|
||||
@ -80,18 +124,19 @@
|
||||
let g:user42 = 'tomoron'
|
||||
let g:mail42 = 'tomoron@student.42angouleme.fr'
|
||||
let g:fern#renderer = "nerdfont"
|
||||
|
||||
'';
|
||||
|
||||
home.file = {
|
||||
#install plug.vim
|
||||
".local/share/nvim/site/autoload/plug.vim".source = "${builtins.fetchGit {
|
||||
".local/share/nvim/site/autoload/plug.vim".source = "${fetchGit {
|
||||
url = "https://github.com/junegunn/vim-plug";
|
||||
rev = "d80f495fabff8446972b8695ba251ca636a047b0";
|
||||
ref = "master";
|
||||
}}/plug.vim";
|
||||
|
||||
#install stdheader 42
|
||||
".config/nvim/plugin/stdheader.vim".source = "${builtins.fetchGit {
|
||||
".config/nvim/plugin/stdheader.vim".source = "${fetchGit {
|
||||
url = "https://github.com/42Paris/42header";
|
||||
rev = "e6e6b191871545e0d43f1aad817070bc806b8fa7";
|
||||
ref = "master";
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
|
||||
# +#+#+#+#+#+ +#+ #
|
||||
# Created: 2025/02/09 22:01:56 by tomoron #+# #+# #
|
||||
# Updated: 2025/11/22 22:07:00 by tomoron ### ########.fr #
|
||||
# Updated: 2026/02/06 23:43:40 by tomoron ### ########.fr #
|
||||
# #
|
||||
# **************************************************************************** #
|
||||
|
||||
@ -34,7 +34,6 @@
|
||||
unison
|
||||
brightnessctl
|
||||
playerctl
|
||||
python3
|
||||
vlc
|
||||
nix-index
|
||||
yubikey-manager
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
|
||||
# +#+#+#+#+#+ +#+ #
|
||||
# Created: 2025/12/30 20:37:07 by tomoron #+# #+# #
|
||||
# Updated: 2026/01/19 12:02:07 by tomoron ### ########.fr #
|
||||
# Updated: 2026/02/21 13:54:43 by tomoron ### ########.fr #
|
||||
# #
|
||||
# **************************************************************************** #
|
||||
|
||||
@ -15,7 +15,6 @@
|
||||
{
|
||||
programs.nix-ld.enable = true;
|
||||
programs.nix-ld.libraries = with pkgs; [
|
||||
# List by default
|
||||
zlib
|
||||
zstd
|
||||
stdenv.cc.cc
|
||||
@ -31,28 +30,24 @@
|
||||
xz
|
||||
systemd
|
||||
|
||||
# My own additions
|
||||
xorg.libXcomposite
|
||||
xorg.libXtst
|
||||
xorg.libXrandr
|
||||
xorg.libXext
|
||||
xorg.libX11
|
||||
xorg.libXfixes
|
||||
libxcomposite
|
||||
libxtst
|
||||
libxrandr
|
||||
libxext
|
||||
libx11
|
||||
libxfixes
|
||||
libGL
|
||||
libva
|
||||
pipewire
|
||||
xorg.libxcb
|
||||
xorg.libXdamage
|
||||
xorg.libxshmfence
|
||||
xorg.libXxf86vm
|
||||
libxcb
|
||||
libxdamage
|
||||
libxshmfence
|
||||
libxxf86vm
|
||||
libelf
|
||||
|
||||
# Required
|
||||
glib
|
||||
gtk2
|
||||
|
||||
# Inspired by steam
|
||||
# https://github.com/NixOS/nixpkgs/blob/master/pkgs/by-name/st/steam/package.nix#L36-L85
|
||||
networkmanager
|
||||
vulkan-loader
|
||||
libgbm
|
||||
@ -61,16 +56,14 @@
|
||||
coreutils
|
||||
pciutils
|
||||
zenity
|
||||
# glibc_multi.bin # Seems to cause issue in ARM
|
||||
|
||||
# # Without these it silently fails
|
||||
xorg.libXinerama
|
||||
xorg.libXcursor
|
||||
xorg.libXrender
|
||||
xorg.libXScrnSaver
|
||||
xorg.libXi
|
||||
xorg.libSM
|
||||
xorg.libICE
|
||||
libxinerama
|
||||
libxcursor
|
||||
libxrender
|
||||
libxscrnsaver
|
||||
libxi
|
||||
libsm
|
||||
libice
|
||||
gnome2.GConf
|
||||
nspr
|
||||
nss
|
||||
@ -80,7 +73,6 @@
|
||||
libusb1
|
||||
dbus-glib
|
||||
ffmpeg
|
||||
# Only libraries are needed from those two
|
||||
libudev0-shim
|
||||
|
||||
# needed to run unity
|
||||
@ -88,16 +80,9 @@
|
||||
icu
|
||||
libnotify
|
||||
gsettings-desktop-schemas
|
||||
# https://github.com/NixOS/nixpkgs/issues/72282
|
||||
# https://github.com/NixOS/nixpkgs/blob/2e87260fafdd3d18aa1719246fd704b35e55b0f2/pkgs/applications/misc/joplin-desktop/default.nix#L16
|
||||
# log in /home/leo/.config/unity3d/Editor.log
|
||||
# it will segfault when opening files if you don’t do:
|
||||
# export XDG_DATA_DIRS=/nix/store/0nfsywbk0qml4faa7sk3sdfmbd85b7ra-gsettings-desktop-schemas-43.0/share/gsettings-schemas/gsettings-desktop-schemas-43.0:/nix/store/rkscn1raa3x850zq7jp9q3j5ghcf6zi2-gtk+3-3.24.35/share/gsettings-schemas/gtk+3-3.24.35/:$XDG_DATA_DIRS
|
||||
# other issue: (Unity:377230): GLib-GIO-CRITICAL **: 21:09:04.706: g_dbus_proxy_call_sync_internal: assertion 'G_IS_DBUS_PROXY (proxy)' failed
|
||||
|
||||
# Verified games requirements
|
||||
xorg.libXt
|
||||
xorg.libXmu
|
||||
libxt
|
||||
libxmu
|
||||
libogg
|
||||
libvorbis
|
||||
SDL
|
||||
@ -131,10 +116,9 @@
|
||||
libgcrypt
|
||||
libvpx
|
||||
librsvg
|
||||
xorg.libXft
|
||||
libxft
|
||||
libvdpau
|
||||
# ...
|
||||
# Some more libraries that I needed to run programs
|
||||
|
||||
pango
|
||||
cairo
|
||||
atk
|
||||
@ -150,9 +134,10 @@
|
||||
libxcrypt-legacy # For natron
|
||||
libGLU # For natron
|
||||
|
||||
# Appimages need fuse, e.g. https://musescore.org/fr/download/musescore-x86_64.AppImage
|
||||
fuse
|
||||
e2fsprogs
|
||||
|
||||
webkitgtk_4_1
|
||||
libsoup_3
|
||||
];
|
||||
}
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
|
||||
# +#+#+#+#+#+ +#+ #
|
||||
# Created: 2025/09/06 00:56:57 by tomoron #+# #+# #
|
||||
# Updated: 2026/01/29 13:16:59 by tomoron ### ########.fr #
|
||||
# Updated: 2026/02/03 14:40:35 by tomoron ### ########.fr #
|
||||
# #
|
||||
# **************************************************************************** #
|
||||
|
||||
@ -47,7 +47,6 @@
|
||||
networking.networkmanager.enable = false;
|
||||
|
||||
specialisation.vfio_ready.configuration = {
|
||||
boot.kernel.sysctl."vm.nr_hugepages" = 5120;
|
||||
boot.extraModulePackages = with config.boot.kernelPackages; [ kvmfr ];
|
||||
boot.kernelModules = [ "kvmfr" ];
|
||||
boot.extraModprobeConfig = ''
|
||||
@ -141,4 +140,6 @@
|
||||
|
||||
services.flatpak.enable = true;
|
||||
|
||||
|
||||
services.k3s.enable = true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user