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-02-29 15:36:16 +01:00
parent 586fe72bed c05d4da79c
commit 5efc6eeec2
8 changed files with 66 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
flake.lock generated
View File

@@ -8,11 +8,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1703433843, "lastModified": 1707830867,
"narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=", "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "417caa847f9383e111d1397039c9d4337d024bf0", "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -24,11 +24,11 @@
"base16-schemes": { "base16-schemes": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1689473676, "lastModified": 1696158499,
"narHash": "sha256-L0RhUr9+W5EPWBpLcmkKpUeCEWRs/kLzVMF3Vao2ZU0=", "narHash": "sha256-5yIHgDTPjoX/3oDEfLSQ0eJZdFL1SaCfb9d6M0RmOTM=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "base16-schemes", "repo": "base16-schemes",
"rev": "d95123ca6377cd849cfdce92c0a24406b0c6a789", "rev": "a9112eaae86d9dd8ee6bb9445b664fba2f94037a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -80,11 +80,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1701680307, "lastModified": 1705309234,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -121,11 +121,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1703367386, "lastModified": 1706981411,
"narHash": "sha256-FMbm48UGrBfOWGt8+opuS+uLBLQlRfhiYXhHNcYMS5k=", "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d5824a76bc6bb93d1dce9ebbbcb09a9b6abcc224", "rev": "652fda4ca6dafeb090943422c34ae9145787af37",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -141,11 +141,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1695388192, "lastModified": 1707825078,
"narHash": "sha256-2jelpE7xK+4M7jZNyWL7QYOYegQLYBDQS5bvdo8XRUQ=", "narHash": "sha256-hTfge2J2W+42SZ7VHXkf4kjU+qzFqPeC9k66jAUBMHk=",
"owner": "misterio77", "owner": "misterio77",
"repo": "nix-colors", "repo": "nix-colors",
"rev": "37227f274b34a3b51649166deb94ce7fec2c6a4c", "rev": "b01f024090d2c4fc3152cd0cf12027a7b8453ba1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -156,11 +156,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1703879120, "lastModified": 1709147990,
"narHash": "sha256-oMJ5xtDswlBWxs0DT/aYKEUIhjEpGZJ9GbIxOclYP8I=", "narHash": "sha256-vpXMWoaCtMYJ7lisJedCRhQG9BSsInEyZnnG5GfY9tQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "22ae59fec26591ef72ce4ccb5538c42c5f090fe3", "rev": "33a97b5814d36ddd65ad678ad07ce43b1a67f159",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -179,11 +179,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1703991017, "lastModified": 1709211223,
"narHash": "sha256-5wlJYAktFeHJlQt9VubO0FjaLe+96A/N3Die5Ym5Y/E=", "narHash": "sha256-1cjd+yXbTlnCwNwEDjn289rJ2f0er5M8pOig4PxniEM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "c1c843e5059d942092d9bb9dc93768e5d2d79bdc", "rev": "3257ad7f173b0314c8a42fec450fa6556495b97c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -210,11 +210,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1694911725, "lastModified": 1697935651,
"narHash": "sha256-8YqI+YU1DGclEjHsnrrGfqsQg3Wyga1DfTbJrN3Ud0c=", "narHash": "sha256-qOfWjQ2JQSQL15KLh6D7xQhx0qgZlYZTYlcEiRuAMMw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "819180647f428a3826bfc917a54449da1e532ce0", "rev": "e1e11fdbb01113d85c7f41cada9d2847660e3902",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -225,11 +225,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1703637592, "lastModified": 1709150264,
"narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=", "narHash": "sha256-HofykKuisObPUfj0E9CJVfaMhawXkYx3G8UIFR/XQ38=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8", "rev": "9099616b93301d5cf84274b184a3a5ec69e94e08",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -240,11 +240,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1703467016, "lastModified": 1709128929,
"narHash": "sha256-/5A/dNPhbQx/Oa2d+Get174eNI3LERQ7u6WTWOlR1eQ=", "narHash": "sha256-GWrv9a+AgGhG4/eI/CyVVIIygia7cEy68Huv3P8oyaw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d02d818f22c777aa4e854efc3242ec451e5d462a", "rev": "c8e74c2f83fe12b4e5a8bd1abbc090575b0f7611",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
flake.nix
View File

@@ -98,6 +98,7 @@
./modules/graphical/audio.nix ./modules/graphical/audio.nix
./modules/graphical/games.nix ./modules/graphical/games.nix
./modules/graphical/ime.nix ./modules/graphical/ime.nix
./modules/graphical/code.nix
./modules/graphical/shared.nix ./modules/graphical/shared.nix
./modules/hardware/nvidia.nix ./modules/hardware/nvidia.nix
./modules/hardware/ssd.nix ./modules/hardware/ssd.nix
@@ -141,11 +142,14 @@
./modules/graphical/audio.nix ./modules/graphical/audio.nix
./modules/graphical/games.nix ./modules/graphical/games.nix
./modules/graphical/ime.nix ./modules/graphical/ime.nix
./modules/graphical/code.nix
./modules/graphical/shared.nix ./modules/graphical/shared.nix
./modules/fh/forensik.nix
./systems/laptop/configuration.nix ./systems/laptop/configuration.nix
./modules/cli-tools.nix ./modules/cli-tools.nix
./modules/virt-manager.nix ./modules/virt-manager.nix
./modules/vmware-host.nix ./modules/vmware-host.nix
./modules/nix/ld.nix
./modules/ssh.nix ./modules/ssh.nix
./modules/wireshark.nix ./modules/wireshark.nix
#./modules/static-ip.nix #./modules/static-ip.nix

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

@@ -198,8 +198,8 @@
"$mainMod, mouse_down, workspace, e+1" "$mainMod, mouse_down, workspace, e+1"
"$mainMod, mouse_up, workspace, e-1" "$mainMod, mouse_up, workspace, e-1"
"ALT, Tab, cyclenext," # "ALT, Tab, cyclenext,"
"ALT, Tab, bringactivetotop," # "ALT, Tab, bringactivetotop,"
]; ];
bindm = [ bindm = [
@@ -241,18 +241,19 @@
wl-paste = "${pkgs.wl-clipboard}/bin/wl-paste"; wl-paste = "${pkgs.wl-clipboard}/bin/wl-paste";
dunstify = "${pkgs.dunst}/bin/dunstify"; dunstify = "${pkgs.dunst}/bin/dunstify";
dunstctl = "${pkgs.dunst}/bin/dunstctl"; dunstctl = "${pkgs.dunst}/bin/dunstctl";
pdfgrep = "${pkgs.pdfgrep}/bin/pdfgrep";
in '' in ''
bind = $mainMod, A, submap, notes bind = $mainMod, A, submap, notes
submap = notes submap = notes
# below # below
bind = $mainMod, B, exec, ${wl-paste} | grep -B 15 -i -f - ~/Nextcloud/test.txt | sed 's/[ \t]*$//' | ${wl-copy} bind = $mainMod, B, exec, ${wl-paste} | xargs -I {} ${pdfgrep} -B 15 -h -i "{}" ~/Nextcloud/fh/cdc/test/*.pdf | sed 's/[ \t]*$//' | ${wl-copy}
# above # above
bind = $mainMod, A, exec, ${wl-paste} | grep -A 15 -i -f - ~/Nextcloud/test.txt | sed 's/[ \t]*$//' | ${wl-copy} bind = $mainMod, A, exec, ${wl-paste} | xargs -I {} ${pdfgrep} -A 15 -h -i "{}" ~/Nextcloud/fh/cdc/test/*.pdf | sed 's/[ \t]*$//' | ${wl-copy}
# context # context
bind = $mainMod, C, exec, ${wl-paste} | grep -C 15 -i -f - ~/Nextcloud/test.txt | sed 's/[ \t]*$//' | ${wl-copy} bind = $mainMod, C, exec, ${wl-paste} | xargs -I {} ${pdfgrep} -C 15 -h -i "{}" ~/Nextcloud/fh/cdc/test/*.pdf | sed 's/[ \t]*$//' | ${wl-copy}
# trim # trim
bind = $mainMod, T, exec, ${wl-paste} | sed 's/[ \t]*$//' | sed 's/^[ \t]*//' | ${wl-copy} 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, N, exec, ${dunstify} "$(${wl-paste})"
bind = $mainMod, D, exec, ${dunstctl} close-all bind = $mainMod, D, exec, ${dunstctl} close-all
# notes # notes

2
modules/cli-tools.nix
View File

@@ -18,5 +18,7 @@
nethogs nethogs
dig dig
smartmontools smartmontools
bc
xxd
]; ];
} }

8
modules/fh/forensik.nix Normal file
View File

@@ -0,0 +1,8 @@
{ pkgs, ...} :
{
environment.systemPackages = with pkgs; [
regripper
foremost
binwalk
];
}

14
modules/graphical/code.nix Normal file
View File

@@ -0,0 +1,14 @@
{ config, pkgs, inputs, lib, ... }:
{
environment.systemPackages = with pkgs; [
kate
jetbrains.idea-ultimate
insomnia
];
#environment.sessionVariables = {
# DOTNET_ROOT = "${pkgs.dotnet-sdk_7}";
#};
}

11
modules/graphical/shared.nix
View File

@@ -43,12 +43,8 @@ in
# List packages installed in system profile. To search, run: # List packages installed in system profile. To search, run:
# $ nix search wget # $ nix search wget
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
kate
keepassxc keepassxc
jetbrains.idea-ultimate
jetbrains.rider
xfce.thunar xfce.thunar
insomnia
remmina remmina
nextcloud-client nextcloud-client
thunderbird thunderbird
@@ -61,7 +57,6 @@ in
mangohud mangohud
screenshot screenshot
anki anki
obs-studio
mpv mpv
p7zip p7zip
qbittorrent qbittorrent
@@ -70,10 +65,4 @@ in
libsForQt5.kolourpaint libsForQt5.kolourpaint
wl-clipboard wl-clipboard
]; ];
#environment.sessionVariables = {
# DOTNET_ROOT = "${pkgs.dotnet-sdk_7}";
#};
} }

2
modules/nextcloud.nix
View File

@@ -48,7 +48,7 @@ in
config.extraTrustedDomains = [ wireguardIp "nextcloud.home.arpa" ]; config.extraTrustedDomains = [ wireguardIp "nextcloud.home.arpa" ];
home = "/mnt/250ssd/nextcloud"; home = "/mnt/250ssd/nextcloud";
extraApps = with config.services.nextcloud.package.packages.apps; { extraApps = with config.services.nextcloud.package.packages.apps; {
inherit keeweb onlyoffice calendar mail; inherit onlyoffice calendar mail;
spreed = pkgs.fetchNextcloudApp rec { spreed = pkgs.fetchNextcloudApp rec {
url = "https://github.com/nextcloud-releases/spreed/releases/download/v17.1.1/spreed-v17.1.1.tar.gz"; url = "https://github.com/nextcloud-releases/spreed/releases/download/v17.1.1/spreed-v17.1.1.tar.gz";
sha256 = "sha256-LaUG0maatc2YtWQjff7J54vadQ2RE4X6FcW8vFefBh8="; sha256 = "sha256-LaUG0maatc2YtWQjff7J54vadQ2RE4X6FcW8vFefBh8=";