Nix/System
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: Nix:7a2000c13b73094db6c2ca96ca0b355707c49467
Branches Tags
Nix:trunk
..
compare: Nix:b136c7988ef9e65038ced50bba10afb06b0174b7
Branches Tags
Nix:trunk

No commits in common. "7a2000c13b73094db6c2ca96ca0b355707c49467" and "b136c7988ef9e65038ced50bba10afb06b0174b7" have entirely different histories.
7a2000c13b ... b136c7988e

7 changed files with 52 additions and 150 deletions
Show stats Expand all files Collapse all files

48
devshells/idris2.nix
View file

@ -1,48 +0,0 @@
{ withSystem, inputs, ... }:
{
perSystem =
{
config,
pkgs,
lib,
inputs',
...
}:
{
devShells.idris2 =
let
rakudo_env = pkgs.buildEnv {
name = "rakudo-env";
paths = with pkgs; [
rakudo
zef
];
pathsToLink = [
"/bin"
"/lib"
"/share"
];
};
libPackages = with pkgs; [ readline70 ];
in
pkgs.mkShell {
buildInputs =
with pkgs;
[
# Idris toolchain
inputs'.nixpkgs-unstable.legacyPackages.idris2Packages.pack
inputs'.nixpkgs-unstable.legacyPackages.idris2
pkg-config
gmp
gnumake
chez
rlwrap
rakudo_env
]
++ libPackages;
shellHook = ''
export LD_LIBRARY_PATH=${lib.makeLibraryPath libPackages}
'';
};
};
}

41
devshells/raku.nix
View file

@ -1,41 +0,0 @@
{ withSystem, inputs, ... }:
{
perSystem =
{
config,
pkgs,
lib,
inputs',
...
}:
{
devShells.raku =
let
rakudo_env = pkgs.buildEnv {
name = "rakudo-env";
paths = with pkgs; [
rakudo
zef
];
pathsToLink = [
"/bin"
"/lib"
"/share"
];
};
libPackages = with pkgs; [ readline70 ];
in
pkgs.mkShell {
buildInputs =
with pkgs;
[
# Raku toolchain
rakudo_env
]
++ libPackages;
shellHook = ''
export LD_LIBRARY_PATH=${lib.makeLibraryPath libPackages}
'';
};
};
}

17
devshells/rust.nix
View file

@ -3,8 +3,21 @@
perSystem = perSystem =
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
devShells.rust = pkgs.mkShell { devshells.rust = {
buildInputs = with pkgs; [ env = [
{
name = "RUSTC_WRAPPER";
value = "${pkgs.sccache}/bin/sccache";
}
];
commands = [
# {
# help = "print hello";
# name = "hello";
# command = "echo hello";
# }
];
packages = with pkgs; [
# Rust toolchain # Rust toolchain
clang clang
rustup rustup

56
flake.lock generated
View file

@ -21,11 +21,11 @@
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1733328505, "lastModified": 1696426674,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -39,11 +39,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1733312601, "lastModified": 1730504689,
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "rev": "506278e768c2a08bec68eb62932193e341f55c90",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -75,11 +75,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1726560853,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -110,11 +110,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734366194, "lastModified": 1732466619,
"narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", "narHash": "sha256-T1e5oceypZu3Q8vzICjv1X/sGs9XfJRMW5OuXHgpB3c=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", "rev": "f3111f62a23451114433888902a55cf0692b408d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -166,11 +166,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1733854371, "lastModified": 1731682434,
"narHash": "sha256-K9qGHniYBbjqVcEiwXyiofj/IFf78L5F0/FCf+CKyr0=", "narHash": "sha256-HnZFPB7akVIy0KuPq/tEkiB+Brt1qi0DUIDzR8z25qI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "dee4425dcee3149475ead0cb6a616b8a028c5888", "rev": "a6b9cf0b7805e2c50829020a73e7bde683fd36dd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -198,23 +198,23 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1733096140, "lastModified": 1730504152,
"narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=",
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
} }
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1734649271, "lastModified": 1732758367,
"narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "rev": "fa42b5a5f401aab8a32bd33c9a4de0738180dc59",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -226,11 +226,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1733384649, "lastModified": 1729973466,
"narHash": "sha256-K5DJ2LpPqht7K76bsxetI+YHhGGRyVteTPRQaIIKJpw=", "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "190c31a89e5eec80dd6604d7f9e5af3802a58a13", "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -242,11 +242,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1735141468, "lastModified": 1732824227,
"narHash": "sha256-VIAjBr1qGcEbmhLwQJD6TABppPMggzOvqFsqkDoMsAY=", "narHash": "sha256-fYNXgpu1AEeLyd3fQt4Ym0tcVP7cdJ8wRoqJ+CtTRyY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4005c3ff7505313cbc21081776ad0ce5dfd7a3ce", "rev": "c71ad5c34d51dcbda4c15f44ea4e4aa6bb6ac1e9",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View file

@ -25,8 +25,6 @@
./nixos/machines/wsl/configuration.nix ./nixos/machines/wsl/configuration.nix
./home-manager/machines/wsl/home.nix ./home-manager/machines/wsl/home.nix
./devshells/rust.nix ./devshells/rust.nix
./devshells/idris2.nix
./devshells/raku.nix
]; ];
systems = [ systems = [
"x86_64-linux" "x86_64-linux"

15
home-manager/modules/programs/emacs.nix
View file

@ -30,7 +30,7 @@ in
# For spelling # For spelling
myAspell myAspell
# For nix # For nix
nil # rnix-lsp
manix manix
nix-doc nix-doc
# For email # For email
@ -38,9 +38,6 @@ in
meson meson
pkg-config pkg-config
glib glib
# Ripgrep for projectile
ripgrep
fd
# Desktop file for org-protocol # Desktop file for org-protocol
(makeDesktopItem { (makeDesktopItem {
name = "org-protocol"; name = "org-protocol";
@ -56,20 +53,12 @@ in
programs.emacs = { programs.emacs = {
enable = true; enable = true;
package = emacsPackage'; package = emacsPackage';
extraPackages = extraPackages = epkgs: [
epkgs: with pkgs; [
epkgs.mu4e epkgs.mu4e
epkgs.vterm epkgs.vterm
epkgs.pdf-tools epkgs.pdf-tools
epkgs.emacsql epkgs.emacsql
epkgs.emacsql-sqlite epkgs.emacsql-sqlite
(tree-sitter.withPlugins (
grammars: with grammars; [
tree-sitter-nix
tree-sitter-rust
tree-sitter-toml
]
))
]; ];
}; };
} }

11
home-manager/modules/programs/neovim.nix
View file

@ -31,9 +31,7 @@
} }
vim-surround vim-surround
vim-commentary vim-commentary
{ nvim-treesitter.withAllGrammars
plugin = nvim-treesitter.withAllGrammars;
}
nvim-nu nvim-nu
null-ls-nvim null-ls-nvim
vim-fugitive vim-fugitive
@ -41,11 +39,6 @@
extraLuaConfig = '' extraLuaConfig = ''
vim.o.termguicolors = true vim.o.termguicolors = true
require'nu'.setup{} require'nu'.setup{}
require'nvim-treesitter.configs'.setup {
highlight = {
enable = true,
},
}
''; '';
extraConfig = '' extraConfig = ''
" Show relative line numbers " Show relative line numbers
@ -56,8 +49,6 @@
set shiftwidth=4 set shiftwidth=4
" Keep 4 lines off the edge of the screen when scrolling " Keep 4 lines off the edge of the screen when scrolling
set scrolloff=4 set scrolloff=4
" Djot setup
au BufNewFile,BufRead *.dj set filetype=djot
''; '';
withPython3 = true; withPython3 = true;
}; };