kopatz/nix-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Kropatz/dotfiles

Browse Source
This commit is contained in:
Kopatz
2024-04-07 11:27:08 +02:00
parent 6a74af0e1b 18855a38d7
commit 041cb16250
17 changed files with 82 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.config/nvim/init.lua
View File

@@ -100,6 +100,9 @@ require('lazy').setup({
-- Adds a number of user-friendly snippets
'rafamadriz/friendly-snippets',
-- Add filepath completion,
'FelipeLema/cmp-async-path',
},
},
@@ -552,6 +555,7 @@ cmp.setup {
sources = {
{ name = 'nvim_lsp' },
{ name = 'luasnip' },
{ name = 'async_path' },
},
}

7
.config/nvim/lua/custom/plugins/align.lua Normal file
View File

@@ -0,0 +1,7 @@
return {
'echasnovski/mini.align',
version = '*',
config = function()
require("mini.align").setup()
end,
}

24
flake.lock generated
View File

@@ -8,11 +8,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1707830867,
"narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=",
"lastModified": 1712079060,
"narHash": "sha256-/JdiT9t+zzjChc5qQiF+jhrVhRt8figYH29rZO7pFe4=",
"owner": "ryantm",
"repo": "agenix",
"rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6",
"rev": "1381a759b205dff7a6818733118d02253340fd5e",
"type": "github"
},
"original": {
@@ -121,11 +121,11 @@
]
},
"locked": {
"lastModified": 1711604890,
"narHash": "sha256-vbI/gxRTq/gHW1Q8z6D/7JG/qGNl3JTimUDX+MwnC3A=",
"lastModified": 1712212014,
"narHash": "sha256-s+lbaf3nLRn1++/X2eXwY9mYCA/m9l8AvyG8beeOaXE=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "3142bdcc470e1e291e1fbe942fd69e06bd00c5df",
"rev": "7e91f2a0ba4b62b88591279d54f741a13e36245b",
"type": "github"
},
"original": {
@@ -246,11 +246,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1711523803,
"narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=",
"lastModified": 1712122226,
"narHash": "sha256-pmgwKs8Thu1WETMqCrWUm0CkN1nmCKX3b51+EXsAZyY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2726f127c15a4cc9810843b96cad73c7eb39e443",
"rev": "08b9151ed40350725eb40b1fe96b0b86304a654b",
"type": "github"
},
"original": {
@@ -261,11 +261,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1711460390,
"narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=",
"lastModified": 1711668574,
"narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "44733514b72e732bd49f5511bd0203dea9b9a434",
"rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659",
"type": "github"
},
"original": {

9
home-manager/hyprland-settings.nix
View File

@@ -248,17 +248,18 @@
submap = notes
# below
bind = $mainMod, B, exec, ${wl-paste} | xargs -I {} ${pdfgrep} -B 15 -h -i "{}" ~/Nextcloud/fh/cdc/test/*.pdf | sed 's/[ \t]*$//' | ${wl-copy}
bind = $mainMod, B, exec, ${wl-paste} | xargs -I {} ${pdfgrep} -B 15 -h -i "{}" ~/Nextcloud/fh/pentest/folien/*.pdf | sed 's/[ \t]*$//' | ${wl-copy}
# above
bind = $mainMod, A, exec, ${wl-paste} | xargs -I {} ${pdfgrep} -A 15 -h -i "{}" ~/Nextcloud/fh/cdc/test/*.pdf | sed 's/[ \t]*$//' | ${wl-copy}
bind = $mainMod, A, exec, ${wl-paste} | xargs -I {} ${pdfgrep} -A 15 -h -i "{}" ~/Nextcloud/fh/pentest/folien/*.pdf | sed 's/[ \t]*$//' | ${wl-copy}
# context
bind = $mainMod, C, exec, ${wl-paste} | xargs -I {} ${pdfgrep} -C 15 -h -i "{}" ~/Nextcloud/fh/cdc/test/*.pdf | sed 's/[ \t]*$//' | ${wl-copy}
bind = $mainMod, C, exec, ${wl-paste} | xargs -I {} ${pdfgrep} -C 15 -h -i "{}" ~/Nextcloud/fh/pentest/folien/*.pdf | sed 's/[ \t]*$//' | ${wl-copy}
# trim
bind = $mainMod, T, exec, ${wl-paste} | sed 's/[ \t]*$//' | sed 's/^[ \t]*//' | sed '/^[[:space:]]*$/d' | ${wl-copy}
bind = $mainMod, N, exec, ${dunstify} "$(${wl-paste})"
bind = $mainMod, D, exec, ${dunstctl} close-all
# notes
bind = $mainMod, 1, exec, cat ~/Nextcloud/test.txt | ${wl-copy}
bind = $mainMod, 1, exec, ${wl-paste} | xargs -I {} ${pdfgrep} -C 15 -h -i "{}" ~/Nextcloud/fh/pentest/folien/EHTT_ecampus.pdf| sed 's/[ \t]*$//' | ${wl-copy}
bind = $mainMod, 2, exec, cat ~/Nextcloud/test.txt | ${wl-copy}
bind = $mainMod, 3, exec, cat ~/Nextcloud/test.txt | ${wl-copy}
bind = $mainMod, 4, exec, cat ~/Nextcloud/test.txt | ${wl-copy}

4
home-manager/syncthing.nix Normal file
View File

@@ -0,0 +1,4 @@
{ pkgs, ... }:
{
services.syncthing.enable = true;
}

1
modules/collections/desktop.nix
View File

@@ -30,6 +30,7 @@
../support/ntfs.nix
../tmpfs.nix
../virt-manager.nix
../static-ip.nix
../wireshark.nix
#../fh/forensik.nix
#../graphical/hyprland.nix

1
modules/collections/server.nix
View File

@@ -14,6 +14,7 @@
../services/samba.nix
../services/ssh.nix
../services/step-ca.nix
#../services/syncthing.nix
../services/wireguard.nix
### Other Modules ###
#../games/palworld.nix

1
modules/firewall.nix
View File

@@ -4,5 +4,6 @@ let
in
{
networking.firewall.enable = true;
networking.firewall.allowedUDPPorts = [ 5000 ];
networking.firewall.allowedUDPPortRanges = allowedUDPPortRanges;
}

3
modules/graphical/shared.nix
View File

@@ -57,7 +57,8 @@ in
qbittorrent
brightnessctl
wacomtablet
libsForQt5.kolourpaint
wl-clipboard
unstable.kdePackages.kolourpaint
unstable.kdePackages.kcalc
];
}

38
modules/services/syncthing.nix Normal file
View File

@@ -0,0 +1,38 @@
{ config, pkgs, lib, vars, ... }:
let
basePath = "/mnt/1tbssd/syncthing";
in
{
age.secrets.syncthing-key = {
file = ../../secrets/syncthing-key.age;
owner = "syncthing";
group = "syncthing";
};
age.secrets.syncthing-cert = {
file = ../../secrets/syncthing-cert.age;
owner = "syncthing";
group = "syncthing";
};
services.syncthing = {
enable = true;
dataDir = basePath;
openDefaultPorts = true;
cert = "/run/agenix/syncthing-cert";
key = "/run/agenix/syncthing-key";
guiAddress = "0.0.0.0:8384";
settings = {
options.urAccepted = -1;
options.relaysEnabled = false;
devices.kop-pc.id = "2IEILKO-R6UVES4-N27PZRT-YLPOPR3-LTD5SXA-C65FWF3-RYD2B2Y-PEZLTAR";
devices.kop-pc.adresses = [ "tcp://192.168.0.11:51820"];
folders."~/sync" = {
id = "sync";
devices = [ "kop-pc" ];
};
};
};
networking.firewall.allowedTCPPorts = [ 8384 ];
}

4
modules/static-ip.nix
View File

@@ -8,10 +8,6 @@ in
networking = {
defaultGateway = "192.168.0.1";
useDHCP = false;
firewall = {
enable = true;
allowedUDPPorts = [ 5000 ];
};
nameservers = [
dns
"1.1.1.1"

2
pkgs/tetrio-desktop/package.nix
View File

@@ -16,7 +16,7 @@
, libpulseaudio
, systemd
, callPackage
, withTetrioPlus ? true
, withTetrioPlus ? false
, tetrio-plus ? callPackage ./tetrio-plus.nix { }
, ...
}:

2
secrets/secrets.nix
View File

@@ -22,4 +22,6 @@ in
"kavita.age".publicKeys = [ nix-test-vm server kop ];
"step-ca-pw.age".publicKeys = [ nix-test-vm server kop ];
"step-ca-key.age".publicKeys = [ nix-test-vm server kop ];
"syncthing-key.age".publicKeys = [ server kop ];
"syncthing-cert.age".publicKeys = [ server kop ];
}

BIN
secrets/syncthing-cert.age Normal file
View File

Binary file not shown.

BIN
secrets/syncthing-key.age Normal file
View File

Binary file not shown.

3
systems/pc/userdata.nix
View File

@@ -1,5 +1,8 @@
{
interface = "enp42s0";
ipv4 = "192.168.0.11";
dns = "192.168.0.6";
# IOMMU Group 16 2b:00.0 VGA compatible controller [0300]: NVIDIA Corporation GA102 [GeForce RTX 3090] [10de:2204] (rev a1)
# IOMMU Group 16 2b:00.1 Audio device [0403]: NVIDIA Corporation GA102 High Definition Audio Controller [10de:1aef] (rev a1)
gpu_vga = "10de:2204";

1
users/kopatz/home.nix
View File

@@ -23,6 +23,7 @@
../../home-manager/kitty.nix
../../home-manager/rofi.nix
../../home-manager/kde-path.nix
#../../home-manager/syncthing.nix
inputs.nix-colors.homeManagerModule
];