ephase/nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: ephase:926a90ebbca48cbacc4a1f9cc8b43390a981d804
Branches Tags
ephase:main
ephase:chore/upgrade
..
compare: ephase:efeb390933109e36cfb3074d8158bc102f65f18f
Branches Tags
ephase:main
ephase:chore/upgrade

No commits in common. "926a90ebbca48cbacc4a1f9cc8b43390a981d804" and "efeb390933109e36cfb3074d8158bc102f65f18f" have entirely different histories.
926a90ebbc ... efeb390933

9 changed files with 38 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

30
flake.lock generated
View file

@ -43,11 +43,11 @@
]
},
"locked": {
"lastModified": 1738667255,
"narHash": "sha256-sMMQb9NydZqQ/MvvtPp+Ny0W9P0Jk0moU7SrTBlO5Vo=",
"lastModified": 1735053786,
"narHash": "sha256-Gm+0DcbUS338vvkwyYWms5jsWlx8z8MeQBzcnIDuIkw=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "7abcf59a365430b36f84eaa452a466b11e469e33",
"rev": "35b98d20ca8f4ca1f6a2c30b8a2c8bb305a36d84",
"type": "github"
},
"original": {
@ -79,11 +79,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1738546358,
"narHash": "sha256-nLivjIygCiqLp5QcL7l56Tca/elVqM9FG1hGd9ZSsrg=",
"lastModified": 1734649271,
"narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c6e957d81b96751a3d5967a0fd73694f303cc914",
"rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
"type": "github"
},
"original": {
@ -94,11 +94,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1738546358,
"narHash": "sha256-nLivjIygCiqLp5QcL7l56Tca/elVqM9FG1hGd9ZSsrg=",
"lastModified": 1734649271,
"narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c6e957d81b96751a3d5967a0fd73694f303cc914",
"rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
"type": "github"
},
"original": {
@ -115,11 +115,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1738701110,
"narHash": "sha256-w/ip8o2X2DCkSEge8cAfCFgiL4tvQU38GcqaL7IYmwk=",
"lastModified": 1735317558,
"narHash": "sha256-L9XE69JY8kiJnh0ix6P/JpK2Jc2lI8ZMqtWkg/o4RRM=",
"owner": "nix-community",
"repo": "NUR",
"rev": "8063859e3fb5f86039fd08240a585b9b4826da9c",
"rev": "6e183e5c3a9d695d63b7eeb69605f6bc3f5d44df",
"type": "github"
},
"original": {
@ -144,11 +144,11 @@
]
},
"locked": {
"lastModified": 1738291974,
"narHash": "sha256-wkwYJc8cKmmQWUloyS9KwttBnja2ONRuJQDEsmef320=",
"lastModified": 1734546875,
"narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "4c1251904d8a08c86ac6bc0d72cc09975e89aef7",
"rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d",
"type": "github"
},
"original": {

4
hosts/luci/hardware-configuration.nix
View file

@ -59,6 +59,6 @@
libvdpau-va-gl
];
};
virtualisation.docker.enable = true;
users.extraGroups.docker.members = [ "ephase" ];
users.extraGroups.vboxusers.members = [ "ephase" ];
}

1
hosts/morty/home-config.nix
View file

@ -15,7 +15,6 @@
starship.enable = true;
utils.enable = true;
vifm.enable = true;
zellij.enable = true;
zsh.enable = true;
};
video = {

1
hosts/rick/includes/home-manager.nix
View file

@ -14,7 +14,6 @@ _:
export NO_AT_BRIDGE=1
export XDG_SESSION_TYPE=wayland
export XDG_CURRENT_DESKTOP=sway
export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/ssh-agent.socket
exec ~/.local/bin/sway.sh
fi
'';

10
modules/home-manager/cli/git/default.nix
View file

@ -35,21 +35,15 @@ in
userName = "${cfg.userName}";
userEmail = "${cfg.userEmail}";
aliases = {
co = "checkout";
fa = "fetch --all";
far = "!git fa; git rebase";
l = "log --pretty=format:'%C(red)%h%C(reset) -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(dim white)<%an>%Creset'";
la = "l --all";
lg = "log --graph --abbrev-commit --decorate --format=format:'%C(red)%h%C(reset) ┬ %C(cyan)%aD%C(reset) %C(green)(%ar)%C(reset)%C(yellow)%d%C(reset) %C(dim white) <%an>%C(reset)%n'' └─ %C(white)%s%C(reset)'";
lga = "lg --all";
l = "log --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";
lg = "log --graph --decorate --pretty=oneline --abbrev-commit";
pf = "push --force-with-lease";
rewrite = "!git commit --amend --no-edit && git push --force-with-lease";
st = "status -sb";
};
extraConfig = {
core = {
abbrev = 8;
};
push = {
autoSetupRemote = true;
default = "current";

24
modules/home-manager/cli/neovim/default.nix
View file

@ -10,13 +10,14 @@ let
url = "https://ftp.nluug.nl/vim/runtime/spell/fr.utf-8.sug";
sha256 = "0294bc32b42c90bbb286a89e23ca3773b7ef50eff1ab523b1513d6a25c6b3f58";
};
yaml-companion = pkgs.vimUtils.buildVimPlugin {
pname = "yaml-companion";
version = "main";
fromGitHub = rev: ref: repo:
pkgs.vimUtils.buildVimPlugin {
pname = "${pkgs.lib.strings.sanitizeDerivationName repo}";
version = ref;
src = builtins.fetchGit {
url = "https://github.com/someone-stole-my-name/yaml-companion.nvim.git";
rev = "131b0d67bd2e0f1a02e0daf2f3460482221ce3c0";
ref = "main";
url = "https://github.com/${repo}.git";
ref = ref;
rev = rev;
};
};
in
@ -196,12 +197,13 @@ in
type = "lua";
config = ( builtins.readFile ./files/whichkey.lua );
}
# yaml companion
{
plugin = yaml-companion.overrideAttrs {
dependencies = [
nvim-lspconfig
];
};
plugin = ( fromGitHub
"131b0d67bd2e0f1a02e0daf2f3460482221ce3c0"
"main"
"someone-stole-my-name/yaml-companion.nvim"
);
type = "lua";
}
vim-helm

6
modules/home-manager/cli/neovim/files/lualine.lua
View file

@ -7,12 +7,6 @@ require('lualine').setup {
disabled_filetypes = {},
always_divide_middle = true,
globalstatus = true,
-- reduce performance impact reducing refresh pace
refresh = {
statusline = 1500,
tabline = 1500,
winbar = 1500,
}
},
sections = {
lualine_a = {'mode'},

21
modules/home-manager/cli/neovim/files/options.lua
View file

@ -1,5 +1,4 @@
-- General Option
vim.opt.syntax = "off";
vim.g.mapleader = " "
vim.g.maplocalleader = " "
@ -10,17 +9,7 @@ vim.opt.clipboard = 'unnamedplus' --Use system clipboard
vim.opt.colorcolumn = '80'
vim.opt.directory = os.getenv("HOME") .. '/.local/tmp/nvim'
vim.opt.expandtab = true
-- Foldling code
-- Based on threesitter
vim.opt.foldmethod = "expr"
vim.opt.foldexpr = "v:lua.vim.treesitter.foldexpr()"
vim.opt.foldcolumn = "0"
vim.opt.foldtext = ""
vim.opt.foldlevel = 99 -- I don't wand code to be fold by default
vim.opt.foldlevelstart = 1
vim.opt.foldnestmax = 2 -- max nested fold, 2 seems to be quite sufficient
vim.opt.foldmethod = 'syntax'
vim.opt.gdefault = true -- search: all occurrences by default
vim.opt.hlsearch = true -- search: hightlight terms
vim.opt.ignorecase = true
@ -113,11 +102,3 @@ vim.api.nvim_set_keymap('n', '<leader>/', ':nohlsearch<CR>', opts)
vim.api.nvim_set_keymap('n', '<Leader>]', ':tabnext<CR>', opts)
vim.api.nvim_set_keymap('n', '<Leader>[', ':tabprev<CR>', opts)
vim.api.nvim_set_keymap('n', '<leader>l', ':set list!<CR>', {silent = true})
-- disable lsplog
-- This is not usefull on a daily basis and should positively impact performance
vim.lsp.set_log_level("off")
-- define a timeout for match parens
vim.g.matchparen_timeout = 2
vim.g.matchparen_insert_timeout = 2

5
modules/home-manager/web/firefox/conf/preferences.nix
View file

@ -36,14 +36,11 @@
"extensions.htmlaboutaddons.recommendations.enabled" = false;
"extensions.recommendations.themeRecommendationUrl" = "";
# Do not send FF build ID for site in startup page
# Do not senf FF buid ID for ste statup page
"browser.startup.homepage_override.mstone" = "ignore";
"browser.aboutHomeSnippets.updateUrl" = "";
# Restore session when restart
"browser.sessionstore.resume_session_once" = true;
# Disable translation
"browser.translations.enabled " = false;
}