mirror of
https://github.com/tomasriveral/nixos.git
synced 2026-08-12 02:28:37 +02:00
Auto: cleanup-2026-05-18T16-56-07Z
This commit is contained in:
@@ -1,11 +1,4 @@
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
pkgs-unstable,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
_: {
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
exec-once = [
|
||||
"qtbatticon" # custom battery tray
|
||||
|
||||
@@ -1,8 +1,4 @@
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
_: {
|
||||
programs.zsh = {
|
||||
shellAliases = {
|
||||
snrt = "git -C ~/nixos add -A && time sudo nixos-rebuild test --flake ~/nixos/#laptop && pkill shell || true && pkill caelestia-shell || true && caelestia-shell -n > /dev/null 2>&1 & disown";
|
||||
|
||||
@@ -1,12 +1,10 @@
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
{pkgs, ...}: {
|
||||
# Ensure your script is available system-wide
|
||||
environment.systemPackages = [
|
||||
(pkgs.callPackage ../scripts/autoUpdate.nix {})
|
||||
];
|
||||
users.users.tomasr = {
|
||||
linger = true; # lingering is required
|
||||
linger = true; # lingering is required
|
||||
};
|
||||
|
||||
systemd.user.services.custom-autoupdate = {
|
||||
@@ -33,7 +31,7 @@
|
||||
|
||||
# Systemd USER timer
|
||||
systemd.user.timers.custom-autoupdate = {
|
||||
wantedBy = [ "timers.target" ];
|
||||
wantedBy = ["timers.target"];
|
||||
|
||||
timerConfig = {
|
||||
OnCalendar = "Fri *-*-* 20:00:00"; # runs friday night. If for whatever reason something breaks. I have whole week-end to fix it.
|
||||
|
||||
@@ -2,7 +2,8 @@
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
...}:
|
||||
...
|
||||
}:
|
||||
# we just activate tlp unconditonally
|
||||
#let
|
||||
# cfg = config.custom;
|
||||
|
||||
@@ -2,8 +2,7 @@
|
||||
inputs,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
}: {
|
||||
# grub theme
|
||||
boot.loader.grub = {
|
||||
theme = inputs.nixos-grub-themes.packages.${pkgs.system}.nixos; # if you want to use nixos grub theme
|
||||
|
||||
@@ -1,13 +1,7 @@
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
pkgs-unstable,
|
||||
libs,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
_: {
|
||||
# i found swap necessary when running nixpkgs review
|
||||
swapDevices = [{
|
||||
swapDevices = [
|
||||
{
|
||||
device = "/swapfile";
|
||||
size = 16384; # 16 GB
|
||||
}
|
||||
|
||||
@@ -1,8 +1,4 @@
|
||||
{
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
{pkgs, ...}: {
|
||||
environment.systemPackages = with pkgs; [
|
||||
# used for the framework 16 laptop
|
||||
framework-tool
|
||||
|
||||
@@ -1,14 +1,9 @@
|
||||
{
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
{pkgs, ...}: {
|
||||
environment.systemPackages = with pkgs; [
|
||||
wget
|
||||
networkmanagerapplet # NetworkManager control applet
|
||||
inetutils # collections of network programs such as telnet
|
||||
|
||||
];
|
||||
wget
|
||||
networkmanagerapplet # NetworkManager control applet
|
||||
inetutils # collections of network programs such as telnet
|
||||
];
|
||||
#networking.Name = "nixos"; # Define your hostname.
|
||||
#networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
||||
|
||||
|
||||
@@ -1,7 +1,4 @@
|
||||
{
|
||||
...
|
||||
}:
|
||||
{
|
||||
_: {
|
||||
# nixpkgs-review crashed my laptop multiple times.
|
||||
nix.settings.max-jobs = 2;
|
||||
nix.settings.cores = 2;
|
||||
|
||||
@@ -1,7 +1,4 @@
|
||||
{
|
||||
pkgs-unstable,
|
||||
...
|
||||
}: {
|
||||
{pkgs-unstable, ...}: {
|
||||
services.ollama = {
|
||||
enable = true;
|
||||
package = pkgs-unstable.ollama-vulkan;
|
||||
@@ -11,15 +8,18 @@
|
||||
#loadModels = [ "mistral:7b" ]; # don't forget the :xxxxx for ex: "mixtral" don't work
|
||||
#syncModels = true;
|
||||
};
|
||||
systemd.services.ollama.serviceConfig.ExecStartPost = [ # use this to auto download models
|
||||
"${pkgs-unstable.ollama-vulkan}/bin/ollama pull mistral:7b"
|
||||
systemd.services.ollama.serviceConfig.ExecStartPost = [
|
||||
# use this to auto download models
|
||||
"${pkgs-unstable.ollama-vulkan}/bin/ollama pull mistral:7b"
|
||||
];
|
||||
/*services.open-webui = {
|
||||
/*
|
||||
services.open-webui = {
|
||||
enable = true;
|
||||
port = 8080;
|
||||
environment = {
|
||||
OLLAMA_BASE_URL = "http://127.0.0.1:11434";
|
||||
WEBUI_AUTH = "True";
|
||||
};
|
||||
};*/
|
||||
};
|
||||
*/
|
||||
}
|
||||
|
||||
@@ -1,8 +1,4 @@
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
_: {
|
||||
# udev with only the necessary rules. See udev.nix to get all the rules
|
||||
services.udev.extraRules = ''
|
||||
# adapted from here https://wiki.nixos.org/wiki/Keychron_M6
|
||||
|
||||
@@ -1,7 +1,4 @@
|
||||
# configuration is in ../../../modules/nixos/user.nix
|
||||
{
|
||||
...
|
||||
}:
|
||||
{
|
||||
_: {
|
||||
home-manager.users.tomasr = ../../../hosts/laptop/home.nix;
|
||||
}
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
# at your risk and perils
|
||||
# click on the icon to get a notification with state, percentage and wattage
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
qt6,
|
||||
pkg-config,
|
||||
|
||||
@@ -1,7 +1,4 @@
|
||||
{
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{pkgs, ...}:
|
||||
pkgs.writeShellApplication {
|
||||
name = "custom-autoupdate";
|
||||
|
||||
@@ -30,7 +27,7 @@ pkgs.writeShellApplication {
|
||||
nix flake update --flake "$FLAKE_DIR"
|
||||
|
||||
if sudo /run/current-system/sw/bin/nixos-rebuild switch --flake "$FLAKE" 2> "$ERROR_FILE"; then # use /run/.../bin/ uses the sudoless rule
|
||||
|
||||
|
||||
if ! git -C "$FLAKE_DIR" diff --quiet -- flake.lock; then
|
||||
git -C "$FLAKE_DIR" add flake.lock
|
||||
git -C "$FLAKE_DIR" commit -m "flake.lock: autoupdate-$TIME"
|
||||
@@ -57,7 +54,7 @@ pkgs.writeShellApplication {
|
||||
|
||||
git -C "$FLAKE_DIR" reset --hard "pre-autoupdate-$TIME"
|
||||
fi
|
||||
|
||||
|
||||
rm -f "$ERROR_FILE"
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ pkgs }:
|
||||
|
||||
{pkgs}:
|
||||
pkgs.writeShellApplication {
|
||||
name = "custom-checkMatrix";
|
||||
|
||||
|
||||
@@ -1,7 +1,4 @@
|
||||
{
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{pkgs, ...}:
|
||||
pkgs.writeShellApplication {
|
||||
name = "custom-cleanNix";
|
||||
|
||||
@@ -34,7 +31,7 @@ pkgs.writeShellApplication {
|
||||
alejandra "$FLAKE_DIR" # formats the config
|
||||
|
||||
if sudo /run/current-system/sw/bin/nixos-rebuild switch --flake "$FLAKE" 2> "$ERROR_FILE"; then # use /run/.../bin/ uses the sudoless rule
|
||||
|
||||
|
||||
if ! git -C "$FLAKE_DIR" diff --quiet HEAD; then
|
||||
git -C "$FLAKE_DIR" add -A
|
||||
git -C "$FLAKE_DIR" commit -m "Auto: cleanup-$TIME"
|
||||
@@ -62,7 +59,7 @@ pkgs.writeShellApplication {
|
||||
git -C "$FLAKE_DIR" reset --hard "pre-cleanup-$TIME"
|
||||
fi
|
||||
git -C "$FLAKE_DIR" tag -d "pre-cleanup-$TIME" # removes the tag
|
||||
|
||||
|
||||
rm -f "$ERROR_FILE"
|
||||
'';
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user