v/infrastructure
1
0
Fork 0
Code Issues 13 Pull requests 1 Actions Packages Projects Releases Activity

updates

Browse source
This commit is contained in:
Vivian 2022-12-06 14:28:03 +01:00
parent 9197c566d2
commit 9165a7ba39
6 changed files with 178 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

112
flake.lock
View file

@ -74,11 +74,11 @@
"stable": "stable"
},
"locked": {
"lastModified": 1669885076,
"narHash": "sha256-ipOEkJbly4VA5ZFLRI7wczc6ebZqLacJ2iXnl5IQR34=",
"lastModified": 1669917327,
"narHash": "sha256-YYjaNOUJZaM5t35GbWtfX825TlI9LAksbfdhaCYWmfY=",
"owner": "zhaofengli",
"repo": "colmena",
"rev": "d597bdf4b3edcf4b4743fbe00bad47c860af64a5",
"rev": "64c46fa0169233d4faed70c52583cd3183c7f5aa",
"type": "github"
},
"original": {
@ -378,11 +378,11 @@
"utils": "utils_2"
},
"locked": {
"lastModified": 1669825171,
"narHash": "sha256-HxlZHSiRGXnWAFbIJMeujqBe2KgACYx5XDRY0EA9P+4=",
"lastModified": 1670280307,
"narHash": "sha256-3x+0whP1nCz5adQMIsBA3L9fI/ABOpRUJdbw0AmxBnU=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "478610aa37c8339eacabfa03f07dacf5574edd47",
"rev": "2af0d07678fc15612345e0dd55337550dcf6465f",
"type": "github"
},
"original": {
@ -393,15 +393,17 @@
},
"hyprland": {
"inputs": {
"hyprland-protocols": "hyprland-protocols",
"nixpkgs": "nixpkgs",
"wlroots": "wlroots"
"wlroots": "wlroots",
"xdph": "xdph"
},
"locked": {
"lastModified": 1669902005,
"narHash": "sha256-fSndLtXyHvzP0xG1t+wVNLMnuQaZKmEogXx0CHdf81E=",
"lastModified": 1670331430,
"narHash": "sha256-UdXvsPJEu2ktOZwfGrVoR8gl9jHnE60CEZRvsEvNJBw=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "39a4f82460effec877d14a8efac7952f543323be",
"rev": "7ed401e5e0779e851667c2e5d220c24e9a5b8737",
"type": "github"
},
"original": {
@ -410,6 +412,38 @@
"type": "github"
}
},
"hyprland-protocols": {
"flake": false,
"locked": {
"lastModified": 1670258048,
"narHash": "sha256-Lm2sXnDVZNE+taHqsqVibvPmSdu65VHvXI507KVX4lg=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "0dcff94fc10df2bbb66d3e1b5a1d6cfd3ada5515",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-protocols",
"type": "github"
}
},
"hyprland-protocols_2": {
"flake": false,
"locked": {
"lastModified": 1670185345,
"narHash": "sha256-hxWGqlPecqEsE6nOHDV29KFBKePbY2Ipeac6lrChMKY=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "4623a404c091e64743ba310199bb380ec52f1936",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-protocols",
"type": "github"
}
},
"hyprpaper": {
"inputs": {
"nixpkgs": [
@ -492,11 +526,11 @@
"utils": "utils_4"
},
"locked": {
"lastModified": 1669857900,
"narHash": "sha256-iR2lzvMURAKq1+h7OORDedL4EKzdWdMTg/VGqZR+sh0=",
"lastModified": 1670289122,
"narHash": "sha256-xdKDX9EWGqTgApkypMk8CmGq4e2niY4ZT+swXNDpbW8=",
"owner": "jyooru",
"repo": "nix-minecraft-servers",
"rev": "3d0c09b4c244674a18fe44063713589599278d18",
"rev": "f9528054a98195df5c93674edadc1a9632c5f659",
"type": "github"
},
"original": {
@ -630,11 +664,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1669650994,
"narHash": "sha256-uwASLUfedIQ5q01TtMwZDEV2HCZr5nVPZjzVgCG+D5I=",
"lastModified": 1670174919,
"narHash": "sha256-XdQr3BUnrvVLRFunLWrZORhwYHDG0+9jUUe0Jv1pths=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "7883883d135ce5b7eae5dce4bfa12262b85c1c46",
"rev": "9d87bc030a0bf3f00e953dbf095a7d8e852dab6b",
"type": "github"
},
"original": {
@ -646,11 +680,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1668765800,
"narHash": "sha256-rC40+/W6Hio7b/RsY8SvQPKNx4WqNcTgfYv8cUMAvJk=",
"lastModified": 1670064435,
"narHash": "sha256-+ELoY30UN+Pl3Yn7RWRPabykwebsVK/kYE9JsIsUMxQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "52b2ac8ae18bbad4374ff0dd5aeee0fdf1aea739",
"rev": "61a8a98e6d557e6dd7ed0cdb54c3a3e3bbc5e25c",
"type": "github"
},
"original": {
@ -677,11 +711,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1669791787,
"narHash": "sha256-KBfoA2fOI5+wCrm7PR+j7jHqXeTkVRPQ0m5fcKchyuU=",
"lastModified": 1670152712,
"narHash": "sha256-LJttwIvJqsZIj8u1LxVRv82vwUtkzVqQVi7Wb8gxPS4=",
"owner": "NULLx76",
"repo": "nixpkgs",
"rev": "e76c78d20685a043d23f5f9e0ccd2203997f1fb1",
"rev": "14ddeaebcbe9a25748221d1d7ecdf98e20e2325e",
"type": "github"
},
"original": {
@ -731,11 +765,11 @@
"nmdSrc": "nmdSrc"
},
"locked": {
"lastModified": 1669907754,
"narHash": "sha256-mKpEOsBfYSxM8N4Q1V+/HBf7s6PfiDrHrT7cTqhyFdA=",
"lastModified": 1670208577,
"narHash": "sha256-hDa+hqAWlTaEvT5iCyy2hLPHS9uybbSkeSlqyvXJjKM=",
"owner": "pta2002",
"repo": "nixvim",
"rev": "27bf782ed8794daa99a4f63334d8cb678808694d",
"rev": "472e10f069c57da281ef178b28423f7f6b2529c2",
"type": "github"
},
"original": {
@ -1062,11 +1096,11 @@
"flake": false,
"locked": {
"host": "gitlab.freedesktop.org",
"lastModified": 1668785720,
"narHash": "sha256-CX+PYJP2PxZWL380WzyMNsrfRgIb/78brdwvDg/zj28=",
"lastModified": 1669925104,
"narHash": "sha256-xMHfW+/G9MieN/5tXHUA5/ztE8dkE093cNFTEUgcwxI=",
"owner": "wlroots",
"repo": "wlroots",
"rev": "4ff46e6cf9463e594605928feeb7c55cf323b5e7",
"rev": "c8eb24d30e18c165728b8788a10716611c3b633d",
"type": "gitlab"
},
"original": {
@ -1075,6 +1109,28 @@
"repo": "wlroots",
"type": "gitlab"
}
},
"xdph": {
"inputs": {
"hyprland-protocols": "hyprland-protocols_2",
"nixpkgs": [
"hyprland",
"nixpkgs"
]
},
"locked": {
"lastModified": 1670202338,
"narHash": "sha256-StTfshdAoSxO+t0wRbq1I3YESLFIQWFjGJse5ICV8rk=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "af840a9e0947a79a37a95a9f62062653721e43fa",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"type": "github"
}
}
},
"root": "root",

2
nixos/hosts/olympus/nginx/configuration.nix
View file

@ -39,7 +39,7 @@ in {
recommendedProxySettings = true;
recommendedTlsSettings = true;
recommendedOptimisation = true;
clientMaxBodySize = "100m";
clientMaxBodySize = "500m";
package = pkgs.nginxMainline.override {
modules = with pkgs.nginxModules; [ brotli ];

2
nixos/hosts/thalassa/aoife/home/.gitignore vendored
View file

@ -1 +1 @@
jonathan_dconf
*_dconf_dump

3
nixos/hosts/thalassa/aoife/home/dconf.nix
View file

@ -33,8 +33,9 @@ with lib.hm.gvariant;
"org/gnome/desktop/interface" = { color-scheme = "prefer-dark"; };
"org/gnome/desktop/wm/preferences" = {
auto-raise = true;
auto-raise = false;
num-workspaces = 6;
focus-mode = "sloppy";
};
"org/gnome/desktop/wm/keybindings" = {

2
nixos/hosts/thalassa/aoife/home/default.nix
View file

@ -11,7 +11,7 @@ in {
home.homeDirectory = "/home/victor";
home.stateVersion = "23.05";
imports = [ ./dconf.nix ./theme.nix ];
imports = [ ./dconf.nix ./theme.nix ./neovim.nix ];
home.packages = with pkgs; [
btop

89
nixos/hosts/thalassa/aoife/home/neovim.nix Normal file
View file

@ -0,0 +1,89 @@
{ inputs, pkgs, lib, ... }: {
imports = [ inputs.nixvim.homeManagerModules.nixvim ];
programs.nixvim = {
enable = true;
package = pkgs.neovim-unwrapped;
globals = { mapleader = " "; };
maps.normal = {
"<leader>ff" = "<cmd>lua require('telescope.builtin').find_files()<cr>";
"<leader>fg" = "<cmd>lua require('telescope.builtin').live_grep()<cr>";
};
extraPlugins = with pkgs.vimPlugins; [ catppuccin-nvim luasnip ];
colorscheme = "catppuccin-frappe";
plugins = {
nix.enable = true;
treesitter = {
enable = true;
nixGrammars = false;
ensureInstalled = [ ];
};
surround.enable = true;
fugitive.enable = true;
lualine = {
enable = true;
theme = "catppuccin";
};
telescope = {
enable = true;
extensions.fzf-native.enable = true;
extensions.fzf-native.fuzzy = true;
};
lsp = {
enable = true;
servers.rust-analyzer.enable = true;
servers.rnix-lsp.enable = true;
servers.pyright.enable = true;
servers.elixirls.enable = true;
};
nvim-cmp = {
enable = true;
auto_enable_sources = true;
sources = [
{ name = "nvim_lsp"; }
{ name = "cmp-latex-symbols"; }
{
name = "luasnip";
option = { show_autosnippets = true; };
}
{ name = "cmp-spell"; }
{ name = "cmp-rg"; }
{ name = "path"; }
{ name = "buffer"; }
];
snippet.expand = ''
function(args)
require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
end
'';
mappingPresets = [ "insert" "cmdline" ];
mapping = {
"<CR>" = "cmp.mapping.confirm({ select = true })";
"<Tab>" = {
modes = [ "i" "s" ];
action = ''
function(fallback)
local luasnip = require('luasnip')
if cmp.visible() then
cmp.select_next_item()
elseif luasnip.expandable() then
luasnip.expand()
elseif luasnip.expand_or_jumpable() then
luasnip.expand_or_jump()
elseif check_backspace() then
fallback()
else
fallback()
end
end
'';
};
};
};
};
};
}