Merge pull request 'Merge changes made on GLaDOS to changes made on laptop' (#1) from Desktop-changes into main

Reviewed-on: https://codeberg.org/Lillian-Violet/NixOS-Config/pulls/1
This commit is contained in:
Lillian Violet 2024-10-30 09:19:57 +00:00
commit 4a36dff699
75 changed files with 61 additions and 393 deletions

View file

@ -1,8 +1,4 @@
{
config,
pkgs,
...
}: {
{pkgs, ...}: {
programs.firefox = {
enable = true;
nativeMessagingHosts = [pkgs.firefoxpwa];

View file

@ -1,9 +1,4 @@
{
lib,
pkgs,
inputs,
...
}: {
{...}: {
programs.foot = {
enable = true;
catppuccin.enable = true;

View file

@ -1,9 +1,4 @@
{
lib,
pkgs,
inputs,
...
}: {
{...}: {
home.file = {
"profile" = {
source = ./Catppuccin.profile;

View file

@ -1,11 +1,4 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
{...}: {
# You can import other home-manager modules here
imports = [
./lillian.nix

View file

@ -1,13 +1,6 @@
# This is your home-manager configuration file
# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
{pkgs, ...}: {
# You can import other home-manager modules here
imports = [
# If you want to use modules your own flake exports (from modules/home-manager):

View file

@ -1,11 +1,4 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
{...}: {
# You can import other home-manager modules here
imports = [
./lillian.nix

View file

@ -1,13 +1,6 @@
# This is your home-manager configuration file
# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
{pkgs, ...}: {
# You can import other home-manager modules here
imports = [
# If you want to use modules your own flake exports (from modules/home-manager):

View file

@ -1,11 +1,4 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
{...}: {
# You can import other home-manager modules here
imports = [
./lillian.nix

View file

@ -1,13 +1,6 @@
# This is your home-manager configuration file
# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
{pkgs, ...}: {
# You can import other home-manager modules here
imports = [
# If you want to use modules your own flake exports (from modules/home-manager):

View file

@ -1,11 +1,4 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
{...}: {
# You can import other home-manager modules here
imports = [
./lillian.nix

View file

@ -1,13 +1,6 @@
# This is your home-manager configuration file
# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
{pkgs, ...}: {
# You can import other home-manager modules here
imports = [
# If you want to use modules your own flake exports (from modules/home-manager):

View file

@ -1,11 +1,4 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
{...}: {
# You can import other home-manager modules here
imports = [
./lillian.nix

View file

@ -1,13 +1,6 @@
# This is your home-manager configuration file
# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
{...}: {
# You can import other home-manager modules here
imports = [
# If you want to use modules your own flake exports (from modules/home-manager):

View file

@ -1,11 +1,4 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
{...}: {
# You can import other home-manager modules here
imports = [
./lillian.nix

View file

@ -1,13 +1,6 @@
# This is your home-manager configuration file
# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
{pkgs, ...}: {
# You can import other home-manager modules here
imports = [
# If you want to use modules your own flake exports (from modules/home-manager):

View file

@ -1,11 +1,4 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
{...}: {
# You can import other home-manager modules here
imports = [
./lillian.nix

View file

@ -1,13 +1,6 @@
# This is your home-manager configuration file
# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
{...}: {
# You can import other home-manager modules here
imports = [
# If you want to use modules your own flake exports (from modules/home-manager):

View file

@ -1,11 +1,4 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
{pkgs, ...}: {
imports = [
./shell/helix
./shell/zellij
@ -35,6 +28,7 @@
lazygit
navi
yazi
nil
];
programs.navi.enable = true;
}

View file

@ -1,8 +1,4 @@
{
lib,
pkgs,
...
}: {
{pkgs, ...}: {
programs.bat = {
enable = true;
extraPackages = with pkgs.bat-extras; [batdiff batman batgrep batwatch];

View file

@ -1,4 +1,4 @@
{lib, ...}: {
{...}: {
programs.eza = {
enable = true;
enableZshIntegration = true;

View file

@ -1,9 +1,4 @@
{
config,
lib,
pkgs,
...
}: let
{pkgs, ...}: let
yazi =
pkgs.writeText "open_in_helix_from_yazi.zsh"
''
@ -32,9 +27,10 @@
}
send_to_jupyter() {
is_new && zellij run -f -n "jupyter console" -- direnv exec . jupyter console --kernel="$1" -f="/tmp/rjh-$(pwd | tr \"/\" -).json" --ZMQTerminalInteractiveShell.include_other_output=True --ZMQTerminalInteractiveShell.other_output_prefix=''' && zellij action write 29 25
is_new && zellij run -f -n "jupyter console" -- direnv exec . jupyter console --kernel="$1" -f="/tmp/rjh-$(pwd | tr \"/\" -).json" --ZMQTerminalInteractiveShell.include_other_output=True --ZMQTerminalInteractiveShell.other_output_prefix=''' && zellij action write 29 25 && zellij action write 17
pwd >> /tmp/rjh
zellij action write 29 25
zellij action write 17
cat | just send
}
send_to_jupyter

View file

@ -1,9 +1,4 @@
{
config,
lib,
pkgs,
...
}: {
{...}: {
programs.hyfetch = {
enable = true;
settings = {

View file

@ -1,5 +1,4 @@
{
lib,
pkgs,
inputs,
...

View file

@ -1,11 +1,4 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
{pkgs, ...}: {
programs.zoxide = {
enable = true;
};

View file

@ -9,3 +9,7 @@ test:
update:
nix flake update
clean:
sudo nix-collect-garbage
sudo nix-store --optimise

View file

@ -1,11 +1,4 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
{...}: {
services.pihole = {
enable = true;
hostConfig = {

View file

@ -1,7 +1,6 @@
# This is your system's configuration file.
# Use this to configure your system environment (it replaces /etc/nixos/configuration.nix)
{
inputs,
outputs,
lib,
config,
@ -61,7 +60,7 @@
tpm2-tss
virtualgl
vulkan-tools
waydroid
# waydroid
waypipe
wayland-utils
xwaylandvideobridge

View file

@ -1,11 +1,4 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
{...}: {
imports = [
./firefox
];

View file

@ -4,7 +4,6 @@
inputs,
outputs,
lib,
config,
pkgs,
...
}: {

View file

@ -4,7 +4,6 @@
{
config,
lib,
pkgs,
modulesPath,
...
}: {

View file

@ -3,8 +3,6 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
@ -84,7 +82,7 @@
};
};
virtualisation.waydroid.enable = true;
# virtualisation.waydroid.enable = false;
networking.hostName = "GLaDOS";
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion

View file

@ -4,7 +4,6 @@
{
config,
lib,
pkgs,
modulesPath,
...
}: {

View file

@ -2,9 +2,7 @@
inputs,
outputs,
lib,
config,
pkgs,
nixpkgs-stable,
...
}: {
imports = [

View file

@ -2,9 +2,7 @@
inputs,
outputs,
lib,
config,
pkgs,
nixpkgs-stable,
...
}: {
imports = [

View file

@ -2,9 +2,7 @@
inputs,
outputs,
lib,
config,
pkgs,
nixpkgs-stable,
...
}: {
imports = [

View file

@ -1,7 +1,5 @@
{
config,
lib,
pkgs,
modulesPath,
...
}: {

View file

@ -1,11 +1,4 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
{pkgs, ...}: {
services.udev.extraRules = ''
KERNEL=="sd[a-z]|sd[a-z][0-9]", ACTION=="add", RUN+="${pkgs.systemd}/bin/systemctl start --no-block external-drive-mount@%k.service"
KERNEL=="sd[a-z]|sd[a-z][0-9]", ACTION=="remove", RUN+="${pkgs.systemd}/bin/systemctl stop --no-block external-drive-mount@%k.service"

View file

@ -2,7 +2,6 @@
inputs,
outputs,
lib,
config,
pkgs,
...
}: {

View file

@ -4,7 +4,6 @@
{
config,
lib,
pkgs,
modulesPath,
...
}: {

View file

@ -1,8 +1,4 @@
{
config,
pkgs,
...
}: {
{pkgs, ...}: {
boot.kernelPatches = [
rec {
name = "compat_uts_machine";

View file

@ -2,9 +2,7 @@
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{
config,
lib,
pkgs,
modulesPath,
...
}: {

View file

@ -1,11 +1,4 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
{...}: {
# You can import other home-manager modules here
imports = [
./package-configs

View file

@ -1,7 +1,4 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...

View file

@ -1,8 +1,4 @@
{
config,
pkgs,
...
}: {
{config, ...}: {
users.users.aria2.group = "aria2";
users.groups.aria2 = {};
users.users.aria2.isSystemUser = true;

View file

@ -1,10 +1,4 @@
{
inputs,
outputs,
config,
pkgs,
...
}: {
{config, ...}: {
users.users.aria2.group = "aria2";
users.groups.aria2 = {};
users.users.aria2.isSystemUser = true;

View file

@ -1,10 +1,4 @@
{
config,
pkgs,
inputs,
lib,
...
}: {
{pkgs, ...}: {
services.nginx = {
enable = true;
virtualHosts = {

View file

@ -2,7 +2,6 @@
config,
pkgs,
inputs,
lib,
...
}: let
# You'll need to edit these values

View file

@ -1,8 +1,4 @@
{
config,
pkgs,
...
}: {
{config, ...}: {
sops.secrets."coturn-auth-secret".mode = "0440";
sops.secrets."coturn-auth-secret".owner = config.users.users.turnserver.name;
users.users.nginx.extraGroups = ["turnserver"];

View file

@ -1,11 +1,4 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
{...}: {
imports = [
./grafana
#./loki

View file

@ -1,8 +1,4 @@
{
config,
pkgs,
...
}: {
{config, ...}: {
# grafana configuration
services.grafana = {
enable = true;

View file

@ -1,8 +1,4 @@
{
config,
pkgs,
...
}: {
{...}: {
services.loki = {
enable = true;
configFile = ./loki.yaml;

View file

@ -1,8 +1,4 @@
{
config,
pkgs,
...
}: {
{...}: {
services.prometheus = {
enable = true;
port = 9001;

View file

@ -1,11 +1,4 @@
{
inputs,
lib,
config,
pkgs,
user,
...
}: {
{config, ...}: {
sops.secrets."grafana-telegraf-key".mode = "0440";
sops.secrets."grafana-telegraf-key".owner = config.users.users.telegraf.name;
services.telegraf = {

View file

@ -1,11 +1,4 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
{...}: {
imports = [
./conduit
./forgejo

View file

@ -1,11 +1,4 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
{pkgs, ...}: {
imports = [];
#sops.secrets."mailpassunhash".mode = "0440";

View file

@ -1,11 +1,4 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
{pkgs, ...}: {
users.users.gotosocial.extraGroups = ["virtualMail"];
services.nginx = {

View file

@ -1,11 +1,4 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
{...}: {
users.users.jellyfin.extraGroups = ["nextcloud" "aria2"];
services.nginx = {

View file

@ -1,11 +1,4 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
{config, ...}: {
sops.secrets."mailpass".mode = "0440";
sops.secrets."mailpass".owner = config.users.users.virtualMail.name;

View file

@ -1,8 +1,4 @@
{
config,
pkgs,
...
}: {
{...}: {
users.users = {
ombi.extraGroups = ["radarr" "sonarr" "aria2" "nextcloud"];
};

View file

@ -1,10 +1,4 @@
{
config,
pkgs,
inputs,
lib,
...
}: {
{pkgs, ...}: {
services.nginx = {
enable = true;
virtualHosts = {

View file

@ -1,8 +1,4 @@
{
config,
pkgs,
...
}: {
{pkgs, ...}: {
services.postgresql = {
# https://nixos.org/manual/nixos/stable/#module-postgresql
package = pkgs.postgresql_16;

View file

@ -1,7 +1,6 @@
{
config,
pkgs,
lib,
...
}: {
# TODO: Figure out how to create packages for some plugins for roundcube!

View file

@ -1,10 +1,8 @@
{
inputs,
outputs,
lib,
config,
pkgs,
pkgs-edge,
...
}: {
imports = [

View file

@ -1,11 +1,4 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
{...}: {
# Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8";

View file

@ -1,8 +1,5 @@
{
inputs,
outputs,
lib,
config,
pkgs,
pkgs-edge,
...

View file

@ -1,10 +1,5 @@
{
lib,
stdenv,
system,
pkgs,
util-linux,
jq,
writeShellApplication,
}:
writeShellApplication

View file

@ -1,6 +1,4 @@
{
lib,
stdenv,
direnv,
writeShellApplication,
}:

View file

@ -1,6 +1,4 @@
{
lib,
stdenv,
direnv,
writeShellApplication,
}:

View file

@ -1,6 +1,4 @@
{
lib,
stdenv,
git,
gum,
writeShellApplication,

View file

@ -1,8 +1,4 @@
{
lib,
stdenv,
writeShellApplication,
}:
{writeShellApplication}:
writeShellApplication
{
name = "install-nix";

View file

@ -1,8 +1,4 @@
{
lib,
stdenv,
writeShellApplication,
}:
{writeShellApplication}:
writeShellApplication
{
name = "rebuild-no-inhibit";

View file

@ -1,8 +1,4 @@
{
lib,
stdenv,
writeShellApplication,
}:
{writeShellApplication}:
writeShellApplication
{
name = "rebuild";

View file

@ -1,8 +1,4 @@
{
lib,
stdenv,
writeShellApplication,
}:
{writeShellApplication}:
writeShellApplication
{
name = "restart";

View file

@ -1,8 +1,4 @@
{
lib,
stdenv,
writeShellApplication,
}:
{writeShellApplication}:
writeShellApplication
{
name = "update";

View file

@ -1,8 +1,4 @@
{
lib,
stdenv,
writeShellApplication,
}:
{writeShellApplication}:
writeShellApplication
{
name = "upgrade";