mirror of
https://github.com/Ahwxorg/nixos-config.git
synced 2025-12-04 15:00:13 +01:00
chore: merge remote-tracking branch 'refs/remotes/origin/master'
This commit is contained in:
commit
e155e2524c
23 changed files with 317 additions and 74 deletions
|
|
@ -1,18 +1,7 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
hardware = {
|
||||
graphics = {
|
||||
enable = true;
|
||||
};
|
||||
enableRedistributableFirmware = true;
|
||||
opengl = {
|
||||
extraPackages = with pkgs; [
|
||||
amdvlk
|
||||
];
|
||||
# For 32 bit applications as well
|
||||
extraPackages32 = with pkgs; [
|
||||
driversi686Linux.amdvlk
|
||||
];
|
||||
};
|
||||
services.smartd = {
|
||||
enable = true;
|
||||
autodetect = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ pkgs, inputs, config, username, host, ...}:
|
||||
{
|
||||
imports = [ inputs.home-manager.nixosModules.home-manager ] ++ [ ./../../roles ];
|
||||
imports = [ inputs.home-manager.nixosModules.home-manager ] ++ [ ./../../roles ] ++ [./../../variables.nix];
|
||||
home-manager = {
|
||||
useUserPackages = true;
|
||||
useGlobalPkgs = true;
|
||||
|
|
@ -10,7 +10,9 @@
|
|||
if (host == "desktop") then
|
||||
[ ./../home/default.desktop.nix ]
|
||||
else if (host == "violet") then
|
||||
[ ./../home/default.violet.nix ]
|
||||
[ ./../home/default.server.nix ]
|
||||
else if (host == "dandelion") then
|
||||
[ ./../home/default.server.nix ]
|
||||
else if (host == "yoshino") then
|
||||
[ ./../home/default.yoshino.nix ]
|
||||
else [ ./../home ];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
imports =
|
||||
[(import ./git.nix)] # version control
|
||||
++ [(import ./nvim.nix)] # neovim editor
|
||||
++ [(import ./packages.violet.nix)] # other packages
|
||||
++ [(import ./packages.server.nix)] # other packages
|
||||
++ [(import ./scripts/scripts.nix)] # personal scripts
|
||||
++ [(import ./zsh.nix)] # shell
|
||||
++ [(import ./tmux.nix)]; # terminal multiplexer
|
||||
|
|
@ -28,18 +28,18 @@
|
|||
color = "black";
|
||||
};
|
||||
};
|
||||
# cursorTheme = {
|
||||
# name = "Bibata-Modern-Ice";
|
||||
# package = pkgs.bibata-cursors;
|
||||
# size = 24;
|
||||
# };
|
||||
cursorTheme = {
|
||||
name = "Bibata-Modern-Ice";
|
||||
package = pkgs.bibata-cursors;
|
||||
size = 24;
|
||||
};
|
||||
};
|
||||
|
||||
# home.pointerCursor = {
|
||||
# name = "Bibata-Modern-Ice";
|
||||
# package = pkgs.bibata-cursors;
|
||||
# size = 24;
|
||||
# };
|
||||
home.pointerCursor = {
|
||||
name = "Bibata-Modern-Ice";
|
||||
package = pkgs.bibata-cursors;
|
||||
size = 24;
|
||||
};
|
||||
|
||||
# gtk = {
|
||||
# enable = true;
|
||||
|
|
@ -84,7 +84,7 @@
|
|||
source = "~/nixos-config/modules/home/hyprland/displays.conf";
|
||||
|
||||
"debug:disable_scale_checks" = true;
|
||||
monitor = "eDP-1, 2256x1504@60, 0x0, 1.5";
|
||||
monitor = "eDP-1, 2256x1504@60, 0x0, 1.5"; # this works as I only have one computer using eDP-1 as a display, I could also add LVDS or DP-1 since that'd also be machine-specific.
|
||||
|
||||
# autostart
|
||||
exec-once = [
|
||||
|
|
@ -124,7 +124,6 @@
|
|||
border_size = 2;
|
||||
"col.active_border" = "rgb(cda5ef) rgb(cda5ef) 45deg";
|
||||
"col.inactive_border" = "0x00000000";
|
||||
border_part_of_window = false;
|
||||
no_border_on_floating = false;
|
||||
};
|
||||
|
||||
|
|
@ -227,6 +226,8 @@
|
|||
"$mainMod SHIFT, V, exec, cliphist list | bemenu -l 5 --ignorecase | cliphist decode | wl-copy"
|
||||
|
||||
"$mainMod SHIFT, F, exec, librewolf"
|
||||
"$mainMod SHIFT, C, exec, chromium"
|
||||
"$mainMod SHIFT, Q, exec, qutebrowser"
|
||||
"$mainMod SHIFT, W, exec, wdisplays"
|
||||
"$mainMod SHIFT, T, exec, thunderbird"
|
||||
"$mainMod SHIFT, E, exec, element-desktop"
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@
|
|||
python3
|
||||
|
||||
# CLI shit
|
||||
termpdfpy
|
||||
vimv
|
||||
iamb
|
||||
pass
|
||||
|
|
@ -51,9 +52,8 @@
|
|||
spotify-player
|
||||
nodejs_22
|
||||
yarn
|
||||
# wikit # Wikipedia summaries from the terminal, not added to Nix yet
|
||||
# reader # Firefox reader mode but in the terminal, not added to Nix yet
|
||||
# pastel # generate, analyze, convert and manipulate colors
|
||||
# wikit
|
||||
# reader
|
||||
|
||||
# GUI shit
|
||||
element-desktop
|
||||
|
|
@ -61,8 +61,9 @@
|
|||
anki-bin
|
||||
obs-studio
|
||||
wdisplays
|
||||
librewolf
|
||||
ungoogled-chromium
|
||||
librewolf # main
|
||||
ungoogled-chromium # for things that don't work with librewolf
|
||||
qutebrowser # focus
|
||||
nsxiv
|
||||
libreoffice
|
||||
xfce.thunar
|
||||
|
|
|
|||
|
|
@ -14,11 +14,6 @@
|
|||
ripgrep
|
||||
yt-dlp
|
||||
neofetch
|
||||
yarn
|
||||
|
||||
# C / C++
|
||||
gcc
|
||||
gnumake
|
||||
|
||||
# Python
|
||||
python3
|
||||
7
modules/services/dandelion.nix
Normal file
7
modules/services/dandelion.nix
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
{ ... }: {
|
||||
imports =
|
||||
[(import ./docker.nix)]
|
||||
++ [(import ./immich.nix)]
|
||||
++ [(import ./nextcloud.nix)]
|
||||
++ [(import ./scrutiny.nix)];
|
||||
}
|
||||
22
modules/services/immich.nix
Normal file
22
modules/services/immich.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{ config, ... }: {
|
||||
services.immich = {
|
||||
enable = true;
|
||||
port = 2283;
|
||||
};
|
||||
|
||||
# services.nginx.virtualHosts."" = {
|
||||
# enableACME = true;
|
||||
# forceSSL = true;
|
||||
# locations."/" = {
|
||||
# proxyPass = "http://localhost:${toString config.services.immich.port}";
|
||||
# proxyWebsockets = true;
|
||||
# recommendedProxySettings = true;
|
||||
# extraConfig = ''
|
||||
# client_max_body_size 50000M;
|
||||
# proxy_read_timeout 600s;
|
||||
# proxy_send_timeout 600s;
|
||||
# send_timeout 600s;
|
||||
# '';
|
||||
# };
|
||||
# };
|
||||
}
|
||||
31
modules/services/nextcloud.nix
Normal file
31
modules/services/nextcloud.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
{ ... }: {
|
||||
services.nextcloud = {
|
||||
enable = true;
|
||||
config.dbtype = "sqlite";
|
||||
configureRedis = true;
|
||||
home = "/home/liv/nextcloud";
|
||||
config.adminpassFile = "/run/nextcloud/adminpassFile";
|
||||
maxUploadSize = "25G";
|
||||
https = true;
|
||||
hostName = "dandelion.srv.liv.town";
|
||||
settings = {
|
||||
trusted_domains = [
|
||||
"dandelion.srv.liv.town"
|
||||
"files.dandelion.srv.liv.town"
|
||||
];
|
||||
enabledPreviewProviders = [
|
||||
"OC\\Preview\\BMP"
|
||||
"OC\\Preview\\GIF"
|
||||
"OC\\Preview\\JPEG"
|
||||
"OC\\Preview\\Krita"
|
||||
"OC\\Preview\\MarkDown"
|
||||
"OC\\Preview\\MP3"
|
||||
"OC\\Preview\\OpenDocument"
|
||||
"OC\\Preview\\PNG"
|
||||
"OC\\Preview\\TXT"
|
||||
"OC\\Preview\\XBitmap"
|
||||
"OC\\Preview\\HEIC"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,18 +1,16 @@
|
|||
{ ... }:
|
||||
|
||||
{
|
||||
{ config, ... }: {
|
||||
services.scrutiny = {
|
||||
enable = true;
|
||||
collector.enable = true;
|
||||
settings.web.listen.port = 8181;
|
||||
settings.notify.urls = [
|
||||
"ntfy://notify.liv.town/violet"
|
||||
"ntfy://${config.liv.variables.ntfyURL}/${config.networking.hostName}"
|
||||
];
|
||||
};
|
||||
|
||||
services.nginx.virtualHosts."scrutiny.liv.town" = {
|
||||
locations."/" = {
|
||||
proxyPass = "http://localhost:8181/";
|
||||
};
|
||||
};
|
||||
# services.nginx.virtualHosts."" = {
|
||||
# locations."/" = {
|
||||
# proxyPass = "http://localhost:8181/";
|
||||
# };
|
||||
# };
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue