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

move nvidia to specialisation, add dns entries, maybe fix hypridle

Browse Source
This commit is contained in:
Kopatz
2025-01-08 10:43:21 +01:00
parent 1675f04bc7
commit ef4551ff79
6 changed files with 68 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
flake.nix
View File

@@ -161,16 +161,6 @@
./users/kopatz ./users/kopatz
./systems/laptop/configuration.nix ./systems/laptop/configuration.nix
./modules/collections/laptop.nix ./modules/collections/laptop.nix
./modules/ecryptfs.nix
#./modules/fh/scanning.nix
./modules/support/ntfs.nix
./modules/thunderbolt.nix
#./modules/vmware-host.nix
#./modules/fh/forensik.nix
#./modules/no-sleep-lid-closed.nix
#./modules/static-ip.nix
#./modules/wake-on-lan.nix
nixos-hardware.nixosModules.dell-xps-15-7590-nvidia
]; ];
}; };
"mini-pc" = mkStableServer { "mini-pc" = mkStableServer {

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

@@ -286,7 +286,7 @@ in {
"${pkgs.networkmanagerapplet}/bin/nm-applet --indicator &" "${pkgs.networkmanagerapplet}/bin/nm-applet --indicator &"
"${pkgs.hyprshade}/bin/hyprshade auto" "${pkgs.hyprshade}/bin/hyprshade auto"
"dex --autostart --environment Hyprland" "dex --autostart --environment Hyprland"
"hypridle &" "${pkgs.hypridle}/bin/hypridle &"
"sleep 3 && ${pkgs.waybar}/bin/waybar &" "sleep 3 && ${pkgs.waybar}/bin/waybar &"
#"${pkgs.dunst}/bin/dunst &" #"${pkgs.dunst}/bin/dunst &"
] ++ lib.lists.optionals (osConfig.networking.hostName == "kop-pc") [ ] ++ lib.lists.optionals (osConfig.networking.hostName == "kop-pc") [

1
home-manager/hyprland/hyprlock.nix
View File

@@ -59,6 +59,7 @@ in {
# don't autostart # don't autostart
systemd.user.services.hypridle.Service.ExecStart = lib.mkForce "true"; systemd.user.services.hypridle.Service.ExecStart = lib.mkForce "true";
systemd.user.services.hypridle.Service.Restart = lib.mkForce "no";
services.hypridle.enable = true; services.hypridle.enable = true;
services.hypridle.settings = { services.hypridle.settings = {
general = { general = {

2
home-manager/hyprland/waybar.nix
View File

@@ -34,7 +34,7 @@ in {
modules-right = [ "group/stats" "group/other" ]; modules-right = [ "group/stats" "group/other" ];
"group/stats" = { "group/stats" = {
"orientation" = "horizontal"; "orientation" = "horizontal";
"modules" = [ "network" "cpu" "memory" "disk" "temperature" "custom/nvidia" ]; "modules" = [ "network" "cpu" "memory" "disk" "temperature" ] ++ lib.optionals (osConfig.networking.hostName != "nix-laptop") [ "custom/nvidia" ] ;
}; };
"group/other" = { "group/other" = {
"orientation" = "horizontal"; "orientation" = "horizontal";

18
modules/services/adguard.nix
View File

@@ -147,10 +147,26 @@ in {
"domain" = "turnserver.home.arpa"; "domain" = "turnserver.home.arpa";
"answer" = wireguardIp; "answer" = wireguardIp;
} }
{
"domain" = "powerline.home.arpa";
"answer" = "192.168.0.2";
}
{
"domain" = "3neo.home.arpa";
"answer" = "192.168.0.4";
}
{
"domain" = "alcatel.home.arpa";
"answer" = "192.168.0.5";
}
{
"domain" = "extender.home.arpa";
"answer" = "192.168.0.8";
}
{ {
"domain" = "inverter.home.arpa"; "domain" = "inverter.home.arpa";
"answer" = "192.168.0.9"; "answer" = "192.168.0.9";
} }
]; ];
}; };
}; };

78
systems/laptop/configuration.nix
View File

@@ -1,23 +1,41 @@
{ config, pkgs, inputs, ... }: { config, pkgs, inputs, ... }: {
{ imports = [ # Include the results of the hardware scan.
imports = ./hardware-configuration.nix
[ # Include the results of the hardware scan. ./modules/battery.nix
./hardware-configuration.nix ../../modules/ecryptfs.nix
./modules/battery.nix #../../modules/fh/scanning.nix
#./modules/wireguard.nix ../../modules/support/ntfs.nix
## -- set in flake.nix ../../modules/thunderbolt.nix
#<nixos-hardware/dell/xps/15-7590/nvidia> #../../modules/vmware-host.nix
#<home-manager/nixos> #../../modules/fh/forensik.nix
]; #../../modules/no-sleep-lid-closed.nix
#../../modules/static-ip.nix
#../../modules/wake-on-lan.nix
#./modules/wireguard.nix
## -- set in flake.nix
#<nixos-hardware/dell/xps/15-7590/nvidia>
#<home-manager/nixos>
inputs.nixos-hardware.nixosModules.dell-xps-15-7590
];
hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.production; specialisation.nvidia = {
configuration = {
imports = [ inputs.nixos-hardware.nixosModules.dell-xps-15-7590-nvidia ];
hardware.nvidia.package =
config.boot.kernelPackages.nvidiaPackages.production;
hardware.nvidia.open = false;
};
};
services.blueman.enable = true; services.blueman.enable = true;
hardware.bluetooth.enable = true; # enables support for Bluetooth hardware.bluetooth.enable = true; # enables support for Bluetooth
hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot hardware.bluetooth.powerOnBoot =
true; # powers up the default Bluetooth controller on boot
age.identityPaths = [ "/home/kopatz/.ssh/id_ed25519" "/etc/ssh/ssh_host_ed25519_key" ]; age.identityPaths =
[ "/home/kopatz/.ssh/id_ed25519" "/etc/ssh/ssh_host_ed25519_key" ];
mainUser.layout = "at"; mainUser.layout = "at";
mainUser.variant = ""; mainUser.variant = "";
# Bootloader. # Bootloader.
@@ -31,10 +49,10 @@
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
networking.extraHosts = #networking.extraHosts =
'' #''
82.218.12.28 kopatz.ddns.net # 82.218.12.28 kopatz.ddns.net
''; #'';
# Set your time zone. # Set your time zone.
time.timeZone = "Europe/Vienna"; time.timeZone = "Europe/Vienna";
@@ -68,18 +86,18 @@
# "d /docker-data 0755 kopatz users" # "d /docker-data 0755 kopatz users"
#]; #];
security.pki.certificates = [ '' security.pki.certificates = [''
-----BEGIN CERTIFICATE----- -----BEGIN CERTIFICATE-----
MIIBjTCCATKgAwIBAgIRAMVH2+JHZ3wm2fLUlKjTYDswCgYIKoZIzj0EAwIwJDEM MIIBjTCCATKgAwIBAgIRAMVH2+JHZ3wm2fLUlKjTYDswCgYIKoZIzj0EAwIwJDEM
MAoGA1UEChMDS29wMRQwEgYDVQQDEwtLb3AgUm9vdCBDQTAeFw0yMzEyMDgxNDUx MAoGA1UEChMDS29wMRQwEgYDVQQDEwtLb3AgUm9vdCBDQTAeFw0yMzEyMDgxNDUx
MTZaFw0zMzEyMDUxNDUxMTZaMCQxDDAKBgNVBAoTA0tvcDEUMBIGA1UEAxMLS29w MTZaFw0zMzEyMDUxNDUxMTZaMCQxDDAKBgNVBAoTA0tvcDEUMBIGA1UEAxMLS29w
IFJvb3QgQ0EwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATdZBOkNynShXipzhuX IFJvb3QgQ0EwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATdZBOkNynShXipzhuX
f6dUByD3chNupNWsagYC5AlPRJT9fAeHEIK/bxWkFwRtLBDopWvBu9lHahBgpHc7 f6dUByD3chNupNWsagYC5AlPRJT9fAeHEIK/bxWkFwRtLBDopWvBu9lHahBgpHc7
y7rTo0UwQzAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBATAdBgNV y7rTo0UwQzAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBATAdBgNV
HQ4EFgQU9AVtwipW5HDBLfZRH1KZCnIKCfowCgYIKoZIzj0EAwIDSQAwRgIhAMHj HQ4EFgQU9AVtwipW5HDBLfZRH1KZCnIKCfowCgYIKoZIzj0EAwIDSQAwRgIhAMHj
AipNdhQKIYPvMt/h1uW4xP3NTkitnmshM09+rIasAiEAlSalGddXDkqJBHhPD+Fr AipNdhQKIYPvMt/h1uW4xP3NTkitnmshM09+rIasAiEAlSalGddXDkqJBHhPD+Fr
gpuVkfVkA8gQCXNs5F9TnxA= gpuVkfVkA8gQCXNs5F9TnxA=
-----END CERTIFICATE----- -----END CERTIFICATE-----
'']; ''];
system.stateVersion = "23.05"; # Did you read the comment? system.stateVersion = "23.05"; # Did you read the comment?