many changes
This commit is contained in:
@@ -31,7 +31,7 @@ in {
|
||||
./cachix.nix
|
||||
./users
|
||||
|
||||
./modules/steam.nix
|
||||
# ./modules/steam.nix
|
||||
|
||||
./hardware-configuration.nix
|
||||
|
||||
@@ -41,6 +41,8 @@ in {
|
||||
(import ./utils/overlays/packages.nix)
|
||||
];
|
||||
|
||||
services.gvfs.enable = true;
|
||||
|
||||
fonts.packages = with pkgs; [
|
||||
git
|
||||
git-lfs
|
||||
@@ -52,6 +54,7 @@ in {
|
||||
zsh-completions
|
||||
zsh-syntax-highlighting
|
||||
zsh-history-substring-search
|
||||
creality-print
|
||||
];
|
||||
|
||||
programs.zsh = {
|
||||
@@ -172,7 +175,6 @@ in {
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
bento
|
||||
creality-print
|
||||
docker-compose
|
||||
drone-cli
|
||||
git-filter-repo
|
||||
@@ -184,7 +186,7 @@ in {
|
||||
wineWowPackages.stable
|
||||
wineWowPackages.fonts
|
||||
winetricks
|
||||
ykfde
|
||||
# ykfde
|
||||
];
|
||||
|
||||
environment.variables = {
|
||||
|
||||
@@ -5,8 +5,8 @@ self: super: {
|
||||
version = "1.0.0";
|
||||
src = super.fetchgit {
|
||||
url = "https://git.cloonar.com/Cloonar/chatgpt.vim.git";
|
||||
rev = "162ab2d82054897ac0d371d7047811abcd510ab5";
|
||||
sha256 = "sha256-0BvVCGXO4GAUumv36+/9/S8pGMKCl/V3rxEKeiKW5xo=";
|
||||
rev = "59540981edeebd7faf9894e2ba40cbe4fb02f31c";
|
||||
sha256 = "sha256-uBfdR8ezwrcPJeCs+hAnz0w7nE9N8rfqST/SuGlcoTs=";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -42,7 +42,7 @@ vim.opt.titlestring = "%<%F%=%l/%L - nvim" -- what the title of the window will
|
||||
vim.opt.undodir = vim.fn.stdpath "cache" .. "/undo"
|
||||
vim.opt.undofile = true -- enable persistent undo
|
||||
vim.opt.updatetime = 300 -- faster completion
|
||||
vim.opt.writebackup = false -- if a file is being edited by another program (or was written to file while editing with another program) it is not allowed to be edited
|
||||
vim.opt.writebackup = false -- if a file is being edited by another program it is not allowed to be edited
|
||||
vim.opt.expandtab = true -- convert tabs to spaces
|
||||
vim.opt.shiftwidth = 2 -- the number of spaces inserted for each indentation
|
||||
vim.opt.tabstop = 2 -- insert 2 spaces for a tab
|
||||
@@ -50,9 +50,38 @@ vim.opt.cursorline = true -- highlight the current line
|
||||
vim.opt.number = true -- set numbered lines
|
||||
vim.opt.relativenumber = false -- set relative numbered lines
|
||||
vim.opt.numberwidth = 4 -- set number column width to 2 {default 4}
|
||||
vim.opt.signcolumn = "yes" -- always show the sign column otherwise it would shift the text each time
|
||||
vim.opt.signcolumn = "yes" -- always show the sign column otherwise text shifts each time
|
||||
vim.opt.wrap = false -- display lines as one long line
|
||||
vim.opt.spell = false
|
||||
vim.opt.spelllang = "en"
|
||||
vim.opt.scrolloff = 8 -- is one of my fav
|
||||
vim.opt.scrolloff = 8 -- keep 8 lines above/below the cursor
|
||||
vim.opt.sidescrolloff = 8
|
||||
|
||||
-- Automatically disable heavy features for very large files
|
||||
local largefile_group = vim.api.nvim_create_augroup("LargeFile", { clear = true })
|
||||
vim.api.nvim_create_autocmd("BufReadPre", {
|
||||
group = largefile_group,
|
||||
pattern = "*",
|
||||
callback = function(args)
|
||||
local max_filesize = 1 * 1024 * 1024 -- 1 MB in bytes
|
||||
local file = vim.fn.expand("<afile>")
|
||||
if vim.fn.getfsize(file) > max_filesize then
|
||||
-- Turn off syntax highlighting
|
||||
vim.cmd("syntax off")
|
||||
-- Disable Treesitter's highlight for this buffer
|
||||
pcall(vim.cmd, "TSBufDisable highlight")
|
||||
|
||||
-- Optionally disable LSP for this buffer
|
||||
for _, client in pairs(vim.lsp.get_active_clients()) do
|
||||
if client ~= nil and client.attached_buffers[args.buf] then
|
||||
client.detach(args.buf)
|
||||
end
|
||||
end
|
||||
|
||||
-- You can also disable or reduce other settings if needed, e.g.:
|
||||
vim.opt.foldmethod = "manual"
|
||||
vim.opt.wrap = false
|
||||
vim.opt.hlsearch = false
|
||||
end
|
||||
end,
|
||||
})
|
||||
|
||||
17
hosts/nb/modules/sway/bitwarden.nix
Normal file
17
hosts/nb/modules/sway/bitwarden.nix
Normal file
@@ -0,0 +1,17 @@
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
bitwarden
|
||||
bitwarden-cli
|
||||
];
|
||||
|
||||
environment.shellAliases = {
|
||||
bw-epicenter = "BITWARDENCLI_APPDATA_DIR=~/.config/bitwarden-cli-epicenter ${pkgs.bitwarden-cli}/bin/bw";
|
||||
bw-cloonar = "BITWARDENCLI_APPDATA_DIR=~/.config/bitwarden-cli-cloonar ${pkgs.bitwarden-cli}/bin/bw";
|
||||
};
|
||||
|
||||
environment.shellInit = ''
|
||||
mkdir -p ~/.config/bitwarden-cli-epicenter ~/.config/bitwarden-cli-cloonar
|
||||
'';
|
||||
}
|
||||
@@ -28,9 +28,6 @@ let
|
||||
apache-ds-pin = import (builtins.fetchTarball {
|
||||
url = "https://github.com/NixOS/nixpkgs/archive/9aec01027f7ea2bca07bb51d5ed83e78088871c1.tar.gz";
|
||||
}) {};
|
||||
# ddev-pin = import (builtins.fetchTarball {
|
||||
# url = "https://github.com/NixOS/nixpkgs/archive/34a626458d686f1b58139620a8b2793e9e123bba.tar.gz";
|
||||
# }) {};
|
||||
in {
|
||||
imports = [
|
||||
./social.nix
|
||||
@@ -38,6 +35,7 @@ in {
|
||||
# ./parsec.nix
|
||||
# ./rustdesk.nix
|
||||
./thunderbird.nix
|
||||
./bitwarden.nix
|
||||
];
|
||||
|
||||
environment.variables.XCURSOR_SIZE = "24";
|
||||
@@ -78,11 +76,11 @@ in {
|
||||
alsa-utils
|
||||
audacity
|
||||
apache-ds-pin.apache-directory-studio
|
||||
bitwarden
|
||||
bitwarden-cli
|
||||
rofi-rbw-wayland
|
||||
# cryptomator
|
||||
# TODO: remove at 25.05
|
||||
unstable.cryptomator
|
||||
fontforge
|
||||
hypnotix
|
||||
|
||||
code-cursor
|
||||
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
/home/dominik/projects/cloonar/chatgpt.vim
|
||||
/home/dominik/projects/cloonar/gitea.nvim
|
||||
/home/dominik/projects/cloonar/glazewm
|
||||
/home/dominik/projects/cloonar/phishguard
|
||||
/home/dominik/projects/cloonar/phishguard-frontend
|
||||
/home/dominik/projects/cloonar/typo3-basic
|
||||
/home/dominik/projects/cloonar/renovate-config
|
||||
/home/dominik/projects/cloonar/bento
|
||||
@@ -27,5 +30,7 @@
|
||||
/home/dominik/projects/epicenter.works/spenden.akvorrat.at
|
||||
/home/dominik/projects/epicenter.works/dearmep-website
|
||||
/home/dominik/projects/epicenter.works/padexporter
|
||||
/home/dominik/projects/epicenter.works/ansible-pull
|
||||
/home/dominik/projects/cloonar/lena-schilling-website
|
||||
/home/dominik/projects/cloonar/imperfect-perfect.com
|
||||
/home/dominik/projects/cloonar/yaapi
|
||||
|
||||
@@ -317,6 +317,12 @@ in
|
||||
# https://git-scm.com/book/en/v2/Git-Tools-Rerere
|
||||
rerere.enabled = true;
|
||||
};
|
||||
extraConfig = {
|
||||
"url.gitea@git.cloonar.com:" = {
|
||||
insteadOf = "https://git.cloonar.com/";
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
programs.thunderbird = {
|
||||
@@ -542,6 +548,9 @@ in
|
||||
git clone gitea@git.cloonar.com:Cloonar/chatgpt.vim.git ${persistHome}/cloonar/chatgpt.vim 2>/dev/null
|
||||
git clone gitea@git.cloonar.com:Cloonar/gitea.nvim.git ${persistHome}/cloonar/gitea.nvim 2>/dev/null
|
||||
git clone gitea@git.cloonar.com:myhidden.life/web.git ${persistHome}/projects/myhidden.life/myhidden.life-web 2>/dev/null
|
||||
git clone git@github.com:dpolakovics/glazewm.git ${persistHome}/cloonar/glazewm 2>/dev/null
|
||||
git clone gitea@git.cloonar.com:Cloonar/phishguard.git ${persistHome}/projects/cloonar/phishguard 2>/dev/null
|
||||
git clone gitea@git.cloonar.com:Cloonar/phishguard-frontend.git ${persistHome}/projects/cloonar/phishguard-frontend 2>/dev/null
|
||||
|
||||
git clone gitea@git.cloonar.com:dominik.polakovics/typo3-basic.git ${persistHome}/cloonar/typo3-basic 2>/dev/null
|
||||
git clone gitea@git.cloonar.com:renovate/renovate-config.git ${persistHome}/cloonar/renovate-config 2>/dev/null
|
||||
@@ -561,6 +570,7 @@ in
|
||||
git clone gitea@git.cloonar.com:hilgenberg/website.git ${persistHome}/projects/cloonar/hilgenberg-website 2>/dev/null
|
||||
git clone gitea@git.cloonar.com:Cloonar/korean-skin.care.git ${persistHome}/projects/cloonar/korean-skin.care 2>/dev/null
|
||||
git clone gitea@git.cloonar.com:Cloonar/lena-schilling-website.git ${persistHome}/projects/cloonar/lena-schilling-website 2>/dev/null
|
||||
git clone gitea@git.cloonar.com:Cloonar/imperfect-perfect.com.git ${persistHome}/projects/cloonar/imperfect-perfect.com 2>/dev/null
|
||||
|
||||
|
||||
git clone gitea@git.cloonar.com:socialgrow.tech/sgt-api.git ${persistHome}/projects/socialgrow.tech/sgt-api 2>/dev/null
|
||||
@@ -574,6 +584,7 @@ in
|
||||
git clone git@github.com:AKVorrat/spenden.akvorrat.at.git ${persistHome}/projects/epicenter.works/spenden.akvorrat.at 2>/dev/null
|
||||
git clone git@github.com:AKVorrat/dearmep-website.git ${persistHome}/projects/epicenter.works/dearmep-website 2>/dev/null
|
||||
git clone git@github.com:AKVorrat/padexporter.git ${persistHome}/projects/epicenter.works/padexporter 2>/dev/null
|
||||
git clone git@github.com:AKVorrat/ansible-config.git ${persistHome}/projects/epicenter.works/ansible-pull 2>/dev/null
|
||||
set -eu
|
||||
'';
|
||||
|
||||
|
||||
Reference in New Issue
Block a user