jalil/configuration.nix
1
1
Fork 0
Code Issues 2 Pull requests 2 Projects Activity Actions

Compare commits

base: jalil:615cf82b524b2b5025d29f00e556fa03ee7b515d
Branches Tags
jalil:main
jalil:push-xstqnkxmwxvm
jalil:push-zwplyztqqsnl
...
compare: jalil:cd4fb19335dc4add8cf215cbef45b421aae98f33
Branches Tags
jalil:main
jalil:push-xstqnkxmwxvm
jalil:push-zwplyztqqsnl

3 commits
615cf82b52 ... cd4fb19335

Author SHA1 Message Date
Jalil David Salamé Messina
cd4fb19335
feat: switch to fish as an interactive shell
All checks were successful
/ check (push) Successful in 8s
Details
/ check-renovaterc (push) Successful in 4s
Details
/ build-packages (push) Successful in 14s
Details
/ build-vm (push) Successful in 2s
Details
/ report-size (push) Successful in 4s
Details 
Now that it is written in Rust I am interested!
 2025-03-24 21:16:23 +01:00
Renovate Bot
6bf3851d5a
fix(deps): update rust crate log to v0.4.27
All checks were successful
/ check (push) Successful in 9s
Details
/ check-renovaterc (push) Successful in 3s
Details
/ build-packages (push) Successful in 13s
Details
/ build-vm (push) Successful in 2s
Details
/ report-size (push) Successful in 5s
Details 
| datasource | package | from   | to     |
| ---------- | ------- | ------ | ------ |
| crate      | log     | 0.4.26 | 0.4.27 |
 2025-03-24 10:50:11 +01:00
Renovate Bot
d089abd113
chore(deps): lock file maintenance
All checks were successful
/ check (push) Successful in 9s
Details
/ check-renovaterc (push) Successful in 3s
Details
/ build-packages (push) Successful in 14s
Details
/ build-vm (push) Successful in 1s
Details
/ report-size (push) Successful in 4s
Details
2025-03-24 00:00:10 +01:00
8 changed files with 129 additions and 151 deletions
Show stats Expand all files Collapse all files

2
flake-modules/example-vm.nix
View file

@ -12,7 +12,7 @@ in
modules = [ modules = [
inputs.self.nixosModules.default inputs.self.nixosModules.default
../example-vm # import vm configuration ../example-vm # import vm configuration
{ nix.registry.nixpkgs.flake = inputs.nixpkgs; } { nix.registry.nixpkgs.flake = inputs.nixpkgs; } # pin nixpkgs to the one used by the system
]; ];
}; };

12
flake.lock generated
View file

@ -319,11 +319,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1742456341, "lastModified": 1742606399,
"narHash": "sha256-yvdnTnROddjHxoQqrakUQWDZSzVchczfsuuMOxg476c=", "narHash": "sha256-NAxwF5cjgh8o5aylhePXWNQETCWYaTpNvdO2bMfINpQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7344a3b78128f7b1765dba89060b015fb75431a7", "rev": "0740f6f238767d4caf9afe774d3e88105766dfc6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -342,11 +342,11 @@
"nuschtosSearch": [] "nuschtosSearch": []
}, },
"locked": { "locked": {
"lastModified": 1742559284, "lastModified": 1742732006,
"narHash": "sha256-PSSjCCqpJPkCagkkdLODBVVonGxgwU5dN2CYlFPNVNw=", "narHash": "sha256-ZIBMfPNb/hfoFf79MRnhDXGKl0yGhjlYEpy3+/jbxFI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "c980271267ef146a6c30394c611a97e077471cf2", "rev": "7776e37b67e7875c3cd56d9d20fd050798071706",
"type": "github" "type": "github"
}, },
"original": { "original": {

15
modules/hm/default.nix
View file

@ -58,6 +58,11 @@ in
git = true; git = true;
icons = "auto"; icons = "auto";
}; };
# Shell
fish = {
enable = true;
preferAbbrs = true; # when defining an alias, prefer instead to define an abbreviation
};
# GnuPG # GnuPG
gpg = { gpg = {
enable = true; enable = true;
@ -75,16 +80,6 @@ in
ssh.enable = true; ssh.enable = true;
# cd replacement # cd replacement
zoxide.enable = true; zoxide.enable = true;
# Shell
zsh = {
enable = true;
autosuggestion.enable = true;
enableCompletion = true;
autocd = true;
dotDir = ".config/zsh";
history.path = "${config.xdg.dataHome}/zsh/zsh_history";
syntaxHighlighting.enable = true;
};
}; };
services = { services = {

8
modules/hm/gui/default.nix
View file

@ -129,13 +129,13 @@ in
# PDF reader # PDF reader
zathura.enable = true; zathura.enable = true;
# Auto start sway # Auto start sway
zsh.loginExtra = fish.loginShellInit =
lib.optionalString cfg.sway.autostart # sh lib.optionalString cfg.sway.autostart # fish
'' ''
# Start Sway on login to TTY 1 # Start Sway on login to TTY 1
if [ "$TTY" = /dev/tty1 ]; then if test "$(tty)" = /dev/tty1
exec sway exec sway
fi end
''; '';
}; };
services = { services = {

14
modules/nixos/default.nix
View file

@ -35,6 +35,17 @@ in
]; ];
programs = { programs = {
# Launch fish if shell is interactive (from https://wiki.nixos.org/wiki/Fish)
bash.interactiveShellInit = # bash
''
if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
then
shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
fi
'';
# Default shell
fish.enable = true;
# Shell prompt # Shell prompt
starship = { starship = {
enable = true; enable = true;
@ -58,8 +69,6 @@ in
(import ./starship-shorter-text.nix) (import ./starship-shorter-text.nix)
]; ];
}; };
# Default shell
zsh.enable = true;
}; };
environment.etc = keysFromGithub; environment.etc = keysFromGithub;
@ -74,7 +83,6 @@ in
builtins.attrNames keysFromGithub builtins.attrNames keysFromGithub
); );
}; };
users.defaultUserShell = pkgs.zsh;
# Open ports for spotifyd # Open ports for spotifyd
networking.firewall = { networking.firewall = {
allowedUDPPorts = [ 5353 ]; allowedUDPPorts = [ 5353 ];

4
modules/nixvim/dev-plugins.nix
View file

@ -21,6 +21,7 @@ let
"typos_lsp" "typos_lsp"
# "typst_lsp" # Not using it # "typst_lsp" # Not using it
"zls" "zls"
"fish_lsp"
]; ];
in in
{ {
@ -95,6 +96,7 @@ in
pkgs.stylua pkgs.stylua
pkgs.taplo pkgs.taplo
pkgs.yamlfmt pkgs.yamlfmt
pkgs.fish
]; ];
plugins.conform-nvim = { plugins.conform-nvim = {
enable = true; enable = true;
@ -111,6 +113,7 @@ in
toml = [ "taplo" ]; toml = [ "taplo" ];
yaml = [ "yamlfmt" ]; yaml = [ "yamlfmt" ];
zig = [ "zigfmt" ]; zig = [ "zigfmt" ];
fish = [ "fish_indent" ];
}; };
}; };
}; };
@ -127,7 +130,6 @@ in
# latex = [ "chktex" ]; # Not in use # latex = [ "chktex" ]; # Not in use
nix = [ "statix" ]; nix = [ "statix" ];
sh = [ "dash" ]; sh = [ "dash" ];
zsh = [ "zsh" ];
}; };
}; };
} }

213
modules/nixvim/plugins.nix
View file

@ -4,129 +4,102 @@ let
in in
{ {
config.plugins = { config.plugins = {
cmp = { cmp =
enable = true; let
cmdline = { srcWithIndex = groupIndex: name: { inherit name groupIndex; };
"/" = { in
mapping = {
mkRaw enable = true;
# lua cmdline = {
'' "/" = {
cmp.mapping.preset.cmdline() mapping =
''; mkRaw
sources = [ # lua
{ name = "rg"; } ''
{ name = "buffer"; } cmp.mapping.preset.cmdline()
]; '';
sources = [
{ name = "rg"; }
{ name = "buffer"; }
];
};
":" = {
mapping =
mkRaw
# lua
"cmp.mapping.preset.cmdline()";
sources = [
{ name = "path"; }
{ name = "cmdline"; }
];
};
}; };
":" = { settings = {
mapping = # Snippets
mkRaw snippet.expand =
# lua
''
cmp.mapping.preset.cmdline()
'';
sources = [
{ name = "path"; }
{ name = "cmdline"; }
];
};
};
settings = {
# Snippets
snippet.expand =
# lua
''
function(args) require('luasnip').lsp_expand(args.body) end
'';
# Completion Sources
sources = [
{
name = "buffer";
groupIndex = 3;
}
{
name = "calc";
groupIndex = 2;
}
{
name = "conventionalcommits";
groupIndex = 1;
}
{
name = "crates";
groupIndex = 1;
}
{
name = "luasnip";
groupIndex = 1;
}
{
name = "nvim_lsp";
groupIndex = 1;
}
{
name = "nvim_lsp_document_symbol";
groupIndex = 1;
}
{
name = "nvim_lsp_signature_help";
groupIndex = 1;
}
{
name = "path";
groupIndex = 2;
}
{
name = "spell";
groupIndex = 2;
}
{
name = "treesitter";
groupIndex = 2;
}
];
mapping =
mkRaw
# lua # lua
'' "function(args) require('luasnip').lsp_expand(args.body) end";
cmp.mapping.preset.insert({ # Completion Sources
["<C-n>"] = function(fallback) sources = [
if cmp.visible() then # very specific (not noisy)
cmp.select_next_item() (srcWithIndex 1 "calc")
elseif require("luasnip").expand_or_jumpable() then (srcWithIndex 1 "crates")
require("luasnip").expand_or_jump() (srcWithIndex 1 "fish")
elseif has_words_before() then (srcWithIndex 1 "luasnip")
cmp.complete() (srcWithIndex 1 "nvim_lsp")
else # Generally ok
fallback() (srcWithIndex 2 "conventionalcommits")
end (srcWithIndex 2 "nvim_lsp_document_symbol")
end, (srcWithIndex 2 "nvim_lsp_signature_help")
["<C-p>"] = function(fallback) # Noisy
if cmp.visible() then (srcWithIndex 2 "path")
cmp.select_prev_item() (srcWithIndex 3 "spell")
elseif require("luasnip").jumpable(-1) then (srcWithIndex 3 "treesitter")
require("luasnip").jump(-1) # Very noisy
else (srcWithIndex 4 "buffer")
fallback() ];
end mapping =
end, mkRaw
["<C-u>"] = cmp.mapping(function(fallback) # lua
if require("luasnip").choice_active() then ''
require("luasnip").next_choice() cmp.mapping.preset.insert({
else ["<C-n>"] = function(fallback)
fallback() if cmp.visible() then
end cmp.select_next_item()
end), elseif require("luasnip").expand_or_jumpable() then
["<C-b>"] = cmp.mapping.scroll_docs(-4), require("luasnip").expand_or_jump()
["<C-f>"] = cmp.mapping.scroll_docs(4), elseif has_words_before() then
["<C-Space>"] = cmp.mapping.complete { }, cmp.complete()
["<C-e>"] = cmp.mapping.close(), else
["<CR>"] = cmp.mapping.confirm { select = true }, fallback()
}) end
''; end,
["<C-p>"] = function(fallback)
if cmp.visible() then
cmp.select_prev_item()
elseif require("luasnip").jumpable(-1) then
require("luasnip").jump(-1)
else
fallback()
end
end,
["<C-u>"] = cmp.mapping(function(fallback)
if require("luasnip").choice_active() then
require("luasnip").next_choice()
else
fallback()
end
end),
["<C-b>"] = cmp.mapping.scroll_docs(-4),
["<C-f>"] = cmp.mapping.scroll_docs(4),
["<C-Space>"] = cmp.mapping.complete { },
["<C-e>"] = cmp.mapping.close(),
["<CR>"] = cmp.mapping.confirm { select = true },
})
'';
};
}; };
}; cmp-fish.enable = true;
gitsigns.enable = true; gitsigns.enable = true;
lualine = { lualine = {
enable = true; enable = true;

12
scripts/jpassmenu/Cargo.lock generated
View file

@ -293,9 +293,9 @@ checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
[[package]] [[package]]
name = "jiff" name = "jiff"
version = "0.2.4" version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d699bc6dfc879fb1bf9bdff0d4c56f0884fc6f0d0eb0fba397a6d00cd9a6b85e" checksum = "c102670231191d07d37a35af3eb77f1f0dbf7a71be51a962dcd57ea607be7260"
dependencies = [ dependencies = [
"jiff-static", "jiff-static",
"log", "log",
@ -306,9 +306,9 @@ dependencies = [
[[package]] [[package]]
name = "jiff-static" name = "jiff-static"
version = "0.2.4" version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d16e75759ee0aa64c57a56acbf43916987b20c77373cb7e808979e02b93c9f9" checksum = "4cdde31a9d349f1b1f51a0b3714a5940ac022976f4b49485fc04be052b183b4c"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -341,9 +341,9 @@ checksum = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413"
[[package]] [[package]]
name = "log" name = "log"
version = "0.4.26" version = "0.4.27"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e" checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
[[package]] [[package]]
name = "memchr" name = "memchr"