lol
This commit is contained in:
parent
c4c432a4d7
commit
38b08f4982
|
@ -1,44 +1,41 @@
|
||||||
{pkgs, ...}: {
|
{pkgs, ...}: {
|
||||||
# systemd.timers."nix-auto-upgrade" = {
|
systemd.timers."nix-auto-upgrade" = {
|
||||||
# wantedBy = ["timers.target"];
|
wantedBy = ["timers.target"];
|
||||||
# timerConfig = {
|
timerConfig = {
|
||||||
# OnCalendar = "weekly";
|
FixedRandomDelay = false;
|
||||||
# Persistent = true;
|
RandomizedDelaySec = 0;
|
||||||
# Unit = "nix-auto-upgrade";
|
OnCalendar = "weekly";
|
||||||
# };
|
Persistent = true;
|
||||||
# };
|
Unit = "nix-auto-upgrade";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
# systemd.services."nix-auto-upgrade" = {
|
systemd.services."nix-auto-upgrade" = {
|
||||||
# script = ''
|
unitConfig = {
|
||||||
# set -eu
|
After="network-online.target";
|
||||||
# # alias git=${pkgs.git}/bin/git
|
Description="NixOS Upgrade";
|
||||||
|
Wants="network-online.target";
|
||||||
|
# X-StopOnRemoval=false; ?
|
||||||
|
};
|
||||||
|
serviceConfig = {
|
||||||
|
Type = "oneshot";
|
||||||
|
User = "root";
|
||||||
|
WorkingDirectory = /etc/nixos/nixos-config;
|
||||||
|
|
||||||
# ${pkgs.git}/bin/git pull -v
|
# X-RestartIfChanged=false; ?
|
||||||
# # ${pkgs.nixos-rebuild}/bin/nixos-rebuild switch --flake .#$(cat /etc/hostname)
|
};
|
||||||
|
|
||||||
# # ${pkgs.curl}/bin/curl \
|
script = ''
|
||||||
# # -H "Title: NixOS upgrade done" \
|
set -eu
|
||||||
# # -H "Priority: low" \
|
|
||||||
# # -H "Tags: low" \
|
|
||||||
# # -d "$(cat /etc/hostname ): upgrade script done" \
|
|
||||||
# # ntfy.sh/tasiaiso_upgrades &> /dev/null # Please don't make me learn how to manage secrets
|
|
||||||
# '';
|
|
||||||
# serviceConfig = {
|
|
||||||
# Type = "oneshot";
|
|
||||||
# User = "root";
|
|
||||||
# WorkingDirectory = /etc/nixos/nixos-config;
|
|
||||||
# };
|
|
||||||
# };
|
|
||||||
|
|
||||||
system.autoUpgrade = {
|
${pkgs.nixos-rebuild}/bin/nixos-rebuild switch -L --flake git+https://gitea.com/tasiaiso/nixos-config --upgrade
|
||||||
enable = true;
|
|
||||||
flake = "git+https://gitea.com/tasiaiso/nixos-config";
|
${pkgs.curl}/bin/curl \
|
||||||
flags = [
|
-H "Title: NixOS upgrade done" \
|
||||||
# "--update-input"
|
-H "Priority: low" \
|
||||||
# "nixpkgs"
|
-H "Tags: low" \
|
||||||
"-L" # print build logs
|
-d "$(cat /etc/hostname): upgrade script done" \
|
||||||
];
|
ntfy.sh/tasiaiso_upgrades &> /dev/null # Please don't make me learn how to manage secrets
|
||||||
dates = "weekly";
|
'';
|
||||||
# randomizedDelaySec = "45min";
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,8 +39,14 @@ in {
|
||||||
configDir = lib.mkForce "/home/user/Sync/configuration";
|
configDir = lib.mkForce "/home/user/Sync/configuration";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
security.pam.services.kwallet = {
|
||||||
|
name = "kwallet";
|
||||||
|
enableKwallet = true;
|
||||||
|
};
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
# Additional system packages here
|
# Additional system packages here
|
||||||
|
zoxide
|
||||||
];
|
];
|
||||||
|
|
||||||
services.displayManager.autoLogin.user = "user";
|
services.displayManager.autoLogin.user = "user";
|
||||||
|
|
|
@ -8,13 +8,16 @@
|
||||||
sshKeys = import ../../crypto/ssh-keys.nix;
|
sshKeys = import ../../crypto/ssh-keys.nix;
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
|
# Defaults
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
../../common/base.nix
|
../../common/base.nix
|
||||||
../../common/full-install.nix
|
../../common/full-install.nix
|
||||||
|
|
||||||
|
# Localization
|
||||||
../../common/locales/en.nix
|
../../common/locales/en.nix
|
||||||
../../common/locales/fr-keymap.nix
|
../../common/locales/fr-keymap.nix
|
||||||
|
|
||||||
|
# Hardware
|
||||||
../../common/hardware/intel-cpu.nix
|
../../common/hardware/intel-cpu.nix
|
||||||
../../common/hardware/tpm2.nix
|
../../common/hardware/tpm2.nix
|
||||||
../../common/hardware/wireless.nix
|
../../common/hardware/wireless.nix
|
||||||
|
@ -23,21 +26,26 @@ in {
|
||||||
../../common/hardware/ssd.nix
|
../../common/hardware/ssd.nix
|
||||||
../../common/hardware/btrfs.nix
|
../../common/hardware/btrfs.nix
|
||||||
|
|
||||||
|
# Software components
|
||||||
../../common/components/de/sddm.nix
|
../../common/components/de/sddm.nix
|
||||||
../../common/components/de/plasma6.nix
|
../../common/components/de/plasma6.nix
|
||||||
# ../../common/components/de/hyprland.nix
|
# ../../common/components/de/hyprland.nix
|
||||||
|
|
||||||
|
# Programs
|
||||||
../../common/programs/steam.nix
|
../../common/programs/steam.nix
|
||||||
|
|
||||||
|
# Services
|
||||||
../../common/services/auditd.nix
|
../../common/services/auditd.nix
|
||||||
../../common/services/nix-gc.nix
|
../../common/services/nix-gc.nix
|
||||||
../../common/services/adguardhome.nix
|
../../common/services/adguardhome.nix
|
||||||
../../common/services/syncthing.nix
|
../../common/services/syncthing.nix
|
||||||
../../common/services/usbguard.nix
|
../../common/services/usbguard.nix
|
||||||
|
|
||||||
../../common/services/autoupgrade.nix
|
../../common/services/autoupgrade.nix
|
||||||
|
|
||||||
|
# Home-manager
|
||||||
../../home/tasia/home.nix
|
../../home/tasia/home.nix
|
||||||
|
|
||||||
|
# Personal modules
|
||||||
../../modules/nixos/tildefriends.nix
|
../../modules/nixos/tildefriends.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -48,28 +56,28 @@ in {
|
||||||
ACTION=="add", SUBSYSTEM=="leds", DEVPATH=="*:kbd_backlight", TEST=="color", ATTR{color}="fc4f05"
|
ACTION=="add", SUBSYSTEM=="leds", DEVPATH=="*:kbd_backlight", TEST=="color", ATTR{color}="fc4f05"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
# Nvidia GPU
|
||||||
|
hardware.nvidia.prime = {
|
||||||
|
intelBusId = "PCI:1:0:0";
|
||||||
|
nvidiaBusId = "PCI:0:2:0";
|
||||||
|
};
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
hostName = "yaseen";
|
hostName = "yaseen";
|
||||||
|
|
||||||
firewall = {
|
firewall = {
|
||||||
allowedTCPPorts = [
|
allowedTCPPorts = [
|
||||||
# 8080 # ?
|
# 8080 # ?
|
||||||
8008 # ssb
|
# 8008 # ssb
|
||||||
12345 # tildefriends
|
# 12345 # tildefriends
|
||||||
13378 # audiobookshelf
|
# 13378 # audiobookshelf
|
||||||
];
|
];
|
||||||
allowedUDPPorts = [
|
allowedUDPPorts = [
|
||||||
8080 # ?
|
# 8080 # ?
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# Nvidia GPU
|
|
||||||
hardware.nvidia.prime = {
|
|
||||||
intelBusId = "PCI:1:0:0";
|
|
||||||
nvidiaBusId = "PCI:0:2:0";
|
|
||||||
};
|
|
||||||
|
|
||||||
users.users.tasia.openssh.authorizedKeys.keys = [
|
users.users.tasia.openssh.authorizedKeys.keys = [
|
||||||
sshKeys.tasia.yaseen
|
sshKeys.tasia.yaseen
|
||||||
];
|
];
|
||||||
|
@ -91,8 +99,6 @@ in {
|
||||||
|
|
||||||
osu-lazer-bin
|
osu-lazer-bin
|
||||||
prismlauncher
|
prismlauncher
|
||||||
# inputs.nixos-conf-editor.packages.${system}.nixos-conf-editor
|
|
||||||
# inputs.nix-software-center.packages.${system}.nix-software-center
|
|
||||||
];
|
];
|
||||||
|
|
||||||
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
|
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
|
||||||
|
|
Loading…
Reference in a new issue