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-03-19 12:40:10 +01:00
parent 3b4400f8d5 e774dd0227
commit c1481622c2
17 changed files with 139 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
flake.lock generated
View File

@@ -121,11 +121,11 @@
]
},
"locked": {
"lastModified": 1709904018,
"narHash": "sha256-fVp/89wNjWg7OQ/Gj3eSK2IXKDk9mXSj5ltOz98Ce2w=",
"lastModified": 1710532761,
"narHash": "sha256-SUXGZNrXX05YA9G6EmgupxhOr3swI1gcxLUeDMUhrEY=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "8b07ca541939211d3cc437ddfd74ebdef3d72471",
"rev": "206f457fffdb9a73596a4cb2211a471bd305243d",
"type": "github"
},
"original": {
@@ -177,11 +177,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1709410583,
"narHash": "sha256-esOSUoQ7mblwcsSea0K17McZuwAIjoS6dq/4b83+lvw=",
"lastModified": 1710622004,
"narHash": "sha256-6zR642tXcZzzk3C8BHxlCrR0yh8z8zMXLiuXpWDIpX0=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "59e37017b9ed31dee303dbbd4531c594df95cfbc",
"rev": "968952f950a59dee9ed1e8799dda38c6dfa1bad3",
"type": "github"
},
"original": {
@@ -200,11 +200,11 @@
]
},
"locked": {
"lastModified": 1709892121,
"narHash": "sha256-JV1F/ZGwgutBCvTDeQuG/UxreU9/B1J4EoTmZm1XLpI=",
"lastModified": 1710519878,
"narHash": "sha256-0dbc10OBFUVYyXC+C+N6vRUd8xyBSRxkcZ4Egipbx0M=",
"owner": "nix-community",
"repo": "NixOS-WSL",
"rev": "b8db5fddf63be77204290074930560f4a1fff5a6",
"rev": "aef95bdb6800a3a2af7aa7083d6df03067da6592",
"type": "github"
},
"original": {
@@ -246,11 +246,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1709703039,
"narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=",
"lastModified": 1710451336,
"narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d",
"rev": "d691274a972b3165335d261cc4671335f5c67de9",
"type": "github"
},
"original": {
@@ -261,11 +261,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1709677081,
"narHash": "sha256-tix36Y7u0rkn6mTm0lA45b45oab2cFLqAzDbJxeXS+c=",
"lastModified": 1710565619,
"narHash": "sha256-xu/EnZCNdIj7m/QjCNIG5vrCA4TYg5uwFReb9XDxET0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "880992dcc006a5e00dd0591446fdf723e6a51a64",
"rev": "8ac30a39abc5ea67037dfbf090d6e89f187c6e50",
"type": "github"
},
"original": {

12
flake.nix
View File

@@ -107,7 +107,7 @@
./modules/graphical/ime.nix
./modules/graphical/code.nix
./modules/graphical/shared.nix
./modules/fh/forensik.nix
#./modules/fh/forensik.nix
./modules/hardware/nvidia.nix
./modules/hardware/ssd.nix
./modules/hardware/firmware.nix
@@ -154,9 +154,10 @@
./modules/graphical/ime.nix
./modules/graphical/code.nix
./modules/graphical/shared.nix
./modules/fh/forensik.nix
#./modules/fh/forensik.nix
./systems/laptop/configuration.nix
./modules/cli-tools.nix
./modules/ecryptfs.nix
./modules/virt-manager.nix
./modules/vmware-host.nix
./modules/nix/ld.nix
@@ -177,10 +178,15 @@
};
nixosConfigurations."wsl" = nixpkgs.lib.nixosSystem {
inherit system;
specialArgs = {inherit inputs ;};
specialArgs = {
inherit inputs;
pkgsVersion = nixpkgs-unstable;
};
modules = [
#"${nixpkgs}/nixos/modules/profiles/minimal.nix"
./users/anon
./modules/nix/settings.nix
./modules/cli-tools.nix
({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
./systems/wsl/configuration.nix
nixos-wsl.nixosModules.wsl

47
home-manager/kde-path.nix Normal file
View File

@@ -0,0 +1,47 @@
{ config, ... }:
{
home.file."path.sh" = {
enable = true;
recursive = true;
executable = true;
text = ''
#!/usr/bin/env sh
if [ "$XDG_SESSION_TYPE" = "wayland" ]; then
export MOZ_DBUS_REMOTE="1"
export KITTY_ENABLE_WAYLAND="1"
export _JAVA_AWT_WM_NONREPARENTING="1"
export MOZ_ENABLE_WAYLAND="1"
export WLR_NO_HARDWARE_CURSORS="1"
export NIXOS_OZONE_WL="1"
export LIBVA_DRIVER_NAME="nvidia"
export __GLX_VENDOR_LIBRARY_NAME="nvidia"
export GBM_BACKEND="nvidia-drm"
export XDG_SESSION_TYPE="wayland"
export QT_QPA_PLATFORM="wayland;xcb"
export ELECTRON_OZONE_PLATFORM_HINT="wayland"
fi
'';
target = ".config/plasma-workspace/env/path.sh";
};
# home.file."path.desktop" = {
# enable = true;
# recursive = true;
# executable = true;
# text = ''
# [Desktop Entry]
# Type=Application
# Exec=${config.xdg.configHome}/autostart/path.sh
# Hidden=false
# NoDisplay=false
# X-GNOME-Autostart-enabled=true
# Name[en_US]=Login Script
# Name=Login Script
# Comment[en_US]=Launches login script and sets environment variables
# Comment=Launches login script and sets environment variables
# '';
# target = ".config/autostart/path.desktop";
# };
}

1
home-manager/nvim.nix
View File

@@ -10,7 +10,6 @@
enable = true;
defaultEditor = true;
extraPackages = with pkgs; [
rnix-lsp
gcc
ripgrep
fd

2
home-manager/themes/yorha/colors.nix
View File

@@ -2,7 +2,7 @@
slug = "yorha";
name = "yorha";
author = "flick0 (https://github.com/flick0)";
colors = {
palette = {
base00 = "#1e1d1c";
base01 = "#A39D8F";
base02 = "#AFA899";

4
home-manager/zsh.nix
View File

@@ -3,13 +3,15 @@
programs.zsh = {
enable = true;
enableCompletion = true;
# new option autosuggestion.enable = true;
enableAutosuggestions = true;
shellAliases = {
ll = "ls -l";
update = "sudo nixos-rebuild switch";
updateOffline = "sudo nixos-rebuild switch --option substitute false";
checkTime = "(cd ~/Nextcloud/work_drive/TS && nix run)";
ssh="TERM=xterm-256color ssh";
checkWaylandWindowsKDE = "qdbus org.kde.KWin /KWin org.kde.KWin.showDebugConsole";
ssh = "TERM=xterm-256color ssh";
};
oh-my-zsh = {
enable = true;

1
modules/cli-tools.nix
View File

@@ -24,5 +24,6 @@
tldr
file
unzip
lsof
];
}

10
modules/ecryptfs.nix Normal file
View File

@@ -0,0 +1,10 @@
{ pkgs, ...}:
{
environment.systemPackages = with pkgs; [
ecryptfs
];
security.pam.enableEcryptfs = true;
programs.ecryptfs.enable = true;
boot.kernelModules = ["ecryptfs"];
}

1
modules/fh/forensik.nix
View File

@@ -6,5 +6,6 @@
binwalk
sleuthkit
samdump2
apktool
];
}

2
modules/gpg.nix
View File

@@ -5,7 +5,7 @@
programs.gnupg.agent = {
enable = true;
enableSSHSupport = true;
pinentryFlavor = "qt";
#pinentryFlavor = "qt";
};
#environment.systemPackages = with pkgs; [
# pinentry-curses

2
modules/graphical/games.nix
View File

@@ -10,7 +10,9 @@
taisei
osu-lazer-bin
wineWowPackages.unstableFull
winetricks
lutris
prismlauncher
#libs
];
}

9
modules/graphical/obs.nix
View File

@@ -1,9 +1,10 @@
{ config, pkgs, ...}:
{
boot = {
kernelModules = ["v4l2loopback"]; # Autostart kernel modules on boot
extraModulePackages = with config.boot.kernelPackages; [v4l2loopback]; # loopback module to make OBS virtual camera work
};
# borked in unstable branch
#boot = {
# kernelModules = ["v4l2loopback"]; # Autostart kernel modules on boot
# extraModulePackages = with config.boot.kernelPackages; [v4l2loopback]; # loopback module to make OBS virtual camera work
#};
environment.systemPackages = with pkgs; [
(wrapOBS {

7
modules/graphical/plasma.nix
View File

@@ -2,10 +2,11 @@
{
services.xserver = {
layout = "at";
xkbVariant = "";
xkb.layout = "at";
xkb.variant = "";
enable = true;
displayManager.sddm.enable = true;
desktopManager.plasma6.enable = true;
#displayManager.sddm.wayland.enable = true;
};
services.desktopManager.plasma6.enable = true;
}

37
modules/nix/ld.nix
View File

@@ -1,3 +1,40 @@
{ pkgs, ... }:
{
programs.nix-ld.enable = true;
# programs.nix-ld.libraries = with pkgs; [
# nspr
# xorg.libXrandr
# xorg.libX11
# xorg.libXcomposite
# xorg.libXdamage
# xorg.libXfixes
# xorg.libXrender
# xorg.libXtst
# xorg.libXau
# xorg.libXdmcp
# expat
# libgcc.lib
# libglvnd
# zlib
# zstd
# stdenv.cc.cc
# curl
# openssl
# attr
# libssh
# bzip2
# libxml2
# acl
# libsodium
# util-linux
# xz
# systemd
# libkrb5
# glib
# nss
# freetype
# fontconfig.lib
# dbus.lib
# alsa-lib
# ];
}

4
systems/pc/configuration.nix
View File

@@ -56,8 +56,8 @@
# Configure keymap in X11
services.xserver = {
layout = lib.mkForce "de";
xkbVariant = lib.mkForce "us";
xkb.layout = lib.mkForce "de";
xkb.variant = lib.mkForce "us";
};
# Configure console keymap

3
users/anon/default.nix
View File

@@ -18,9 +18,6 @@
description = config.mainUser.name;
shell = pkgs.zsh;
extraGroups = [ "networkmanager" "wheel" "docker" "wireshark"];
packages = with pkgs; [
firefox
];
openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFeP6qtVqE/gu72ZUZE8cdRi3INiUW9NqDR7SjXIzTw2 lukas"
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCuRAKtoU5rjSbjDxlac6oAww/XHgsVRFHwIVnVm/TrTtDNqRyAkr6fIUiSKTHrpBPyJjIKCzkHS8QhbS2zZo4wjcgAyMyK33q/CzLs8DPQMWX0RKxR+OaVNwh90iWHr663a5x7ztTag3oPGOAYjeqCoIJWyQRlvIKflriJnAjWE8nvw4QkErpRWo4JJnhS61GQMrPT6VK0yXzq3zQs2t3cXTvGMmeLjBuluvJ6yiDk2bAGdY2UWnbs1y2M1TD3xn0pHzITeQnoWLfy+cwPHnEulciVqyr4pp6LDygmIPI1rxKAIQUnwo09n/A1eIcqlUo8aKy7ZDyrssuGWKZ/U4FC258NWwdUPbjyQvzNdcZjXC4+AmQTb+DwiECYOCfF7O/uRRqoFl7jfVfKqHJ7DKebt20QKwDCH/d5qfDs6xA0Krl2dgu3vePhsOkmpnIfPk9Cxl+YHGfmpCOVQHhxCwpkQs0Oh7NerO3idnG1enckjCuzCotnL8vDhczdL4eZmus= kopatz@nix-laptop

1
users/kopatz/home.nix
View File

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