Jimbo/nixos-config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Rename JimboNFS to KittyNFS

Browse source
This commit is contained in:
Jimbo 2025-01-03 18:03:07 -05:00
parent ea3a6db5af
commit c625bba259
14 changed files with 20 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
flake.nix
View file

@ -84,6 +84,6 @@
}; };
# home-manager switch --flake /etc/nixos#username # home-manager switch --flake /etc/nixos#username
homeConfigurations."jimbo" = mkHome [ ./modules/home ] nixpkgs.legacyPackages.x86_64-linux; homeConfigurations."main" = mkHome [ ./modules/home ] nixpkgs.legacyPackages.x86_64-linux;
}; };
} }

2
hosts/extern/disko/default.nix vendored
View file

@ -70,7 +70,7 @@
"/persist/.snapshots" = { }; "/persist/.snapshots" = { };
"/${config.sysusers.main}" = { "/${config.sysusers.main}" = {
mountpoint = "/persist/home/jimbo"; mountpoint = "/persist/home/${config.sysusers.main}";
mountOptions = [ "compress=zstd" "noatime" "ssd" ]; mountOptions = [ "compress=zstd" "noatime" "ssd" ];
}; };
"/${config.sysusers.main}/.snapshots" = { }; "/${config.sysusers.main}/.snapshots" = { };

4
hosts/kitty/filesystems/default.nix
View file

@ -33,9 +33,9 @@
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=persist" "compress=zstd" ]; options = [ "subvol=persist" "compress=zstd" ];
}; };
"/export/JimboNFS" = { "/export/KittyNFS" = {
depends = [ "/persist" ]; depends = [ "/persist" ];
device = "/persist/export/JimboNFS"; device = "/persist/export/KittyNFS";
fsType = "none"; fsType = "none";
options = [ "bind" ]; options = [ "bind" ];
}; };

2
hosts/redmond/disko/default.nix
View file

@ -91,6 +91,6 @@
# Needed for impermanence # Needed for impermanence
fileSystems = { fileSystems = {
"/persist".neededForBoot = true; "/persist".neededForBoot = true;
"/persist/home/jimbo".neededForBoot = true; "/persist/home/${config.sysusers.main}".neededForBoot = true;
}; };
} }

4
hosts/redmond/filesystems/default.nix
View file

@ -5,8 +5,8 @@
device = "/dev/disk/by-uuid/582C6B802C6B57D0"; device = "/dev/disk/by-uuid/582C6B802C6B57D0";
options = [ "nosuid" "nodev" ]; options = [ "nosuid" "nodev" ];
}; };
"/home/${config.sysusers.main}/JimboNFS" = { "/home/${config.sysusers.main}/KittyNFS" = {
device = "10.100.0.1:/export/JimboNFS"; device = "10.100.0.1:/export/KittyNFS";
fsType = "nfs4"; fsType = "nfs4";
options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ]; options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
}; };

4
hosts/tower/filesystems/default.nix
View file

@ -39,8 +39,8 @@
}; };
# Network mounts # Network mounts
"/home/${config.sysusers.main}/JimboNFS" = { "/home/${config.sysusers.main}/KittyNFS" = {
device = "${config.ips.server}:/export/JimboNFS"; device = "${config.ips.server}:/export/KittyNFS";
fsType = "nfs4"; fsType = "nfs4";
options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ]; options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ];
}; };

8
modules/home/programs/terminal/ranger/default.nix
View file

@ -108,10 +108,10 @@
n:/etc/nixos n:/etc/nixos
# Remote files # Remote files
J:/home/${config.sysusers.main}/JimboNFS J:/home/${config.sysusers.main}/KittyNFS
K:/home/${config.sysusers.main}/JimboNFS/Files K:/home/${config.sysusers.main}/KittyNFS/Files
V:/home/${config.sysusers.main}/JimboNFS/Media V:/home/${config.sysusers.main}/KittyNFS/Media
M:/home/${config.sysusers.main}/JimboNFS/Music M:/home/${config.sysusers.main}/KittyNFS/Music
''; '';
}; };
packages = with pkgs; [ packages = with pkgs; [

4
modules/home/services/mpd/default.nix
View file

@ -3,8 +3,8 @@
services.mpd = { services.mpd = {
enable = config.home.desktop.enable; enable = config.home.desktop.enable;
network.startWhenNeeded = true; network.startWhenNeeded = true;
musicDirectory = "/home/${config.sysusers.main}/JimboNFS/Music/JimBops"; musicDirectory = "/home/${config.sysusers.main}/KittyNFS/Music/JimBops";
playlistDirectory = "/home/${config.sysusers.main}/JimboNFS/Music/JimBops/Playlists"; playlistDirectory = "/home/${config.sysusers.main}/KittyNFS/Music/JimBops/Playlists";
extraConfig = '' extraConfig = ''
audio_output { audio_output {
type "pipewire" type "pipewire"

29
modules/system/services/server/fileserver/nextcloud/default.nix
View file

@ -1,29 +0,0 @@
{ pkgs, config, ... }:
{
imports = [ ./nginx ];
services.nextcloud = {
enable = config.system.server.enable;
package = pkgs.nextcloud30;
hostName = "cloud.${config.domains.p2}";
datadir = "/mnt/nextcloud";
https = true;
config = {
adminuser = "jimbo";
adminpassFile = "${pkgs.writeText "nextpass" config.secrets.jimboAccPass}";
};
settings = {
trusted_proxies = [ "127.0.0.1" ];
trusted_domains = [ "cloud.${config.domains.p2}" ];
overwriteprotocol = "https";
mail_smtphost = "mx.${config.domains.p1}";
mail_domain = "${config.domains.p1}";
mail_from_address = "noreply";
mail_smtpauth = "true";
mail_smtpname = "noreply@${config.domains.p2}";
mail_smtppassword = config.secrets.noreplyPassword;
mail_smtpmode = "smtp";
mail_smtpport = 587;
};
};
}

6
modules/system/services/server/fileserver/nfs/default.nix
View file

@ -3,9 +3,9 @@
services.nfs.server = { services.nfs.server = {
enable = config.system.server.enable; enable = config.system.server.enable;
exports = '' exports = ''
/export/JimboNFS/Files *(rw,sync,no_subtree_check) /export/KittyNFS/Files *(rw,sync,no_subtree_check)
/export/JimboNFS/Media *(rw,sync,no_subtree_check) /export/KittyNFS/Media *(rw,sync,no_subtree_check)
/export/JimboNFS/Music *(rw,sync,no_subtree_check) /export/KittyNFS/Music *(rw,sync,no_subtree_check)
''; '';
}; };
} }

10
modules/system/services/server/fileserver/seafile/default.nix
View file

@ -1,10 +0,0 @@
{ config, ... }:
{
services.seafile = {
enable = true;
gc.enable = true;
group = "nfsShare";
adminEmail = "contact@${config.domains.p2}";
initialAdminPassword = config.secrets.jimboAccPass;
};
}

11
modules/system/services/server/fileserver/seafile/nginx/default.nix
View file

@ -1,11 +0,0 @@
{ lib, config, ... }:
{
services.nginx.virtualHosts."cloud.${config.domains.p2}" = lib.mkIf config.services.icecast.enable {
enableACME = true;
forceSSL = true;
locations."/" = {
proxyPass = "http://127.0.0.1:8082";
proxyWebsockets = true;
};
};
}

2
modules/system/services/server/icecast/liquidsoap/jimbops/default.nix
View file

@ -7,7 +7,7 @@
settings.init.allow_root.set(true) settings.init.allow_root.set(true)
settings.scheduler.fast_queues.set(2) settings.scheduler.fast_queues.set(2)
jimbops = mksafe(playlist(mode='randomize', reload=1, reload_mode="rounds", "/export/JimboNFS/Music/JimBops")) jimbops = mksafe(playlist(mode='randomize', reload=1, reload_mode="rounds", "/export/KittyNFS/Music/JimBops"))
jimbops_fallback = fallback([jimbops, jimbops]) jimbops_fallback = fallback([jimbops, jimbops])
output.icecast( output.icecast(

2
modules/system/services/server/icecast/liquidsoap/jimscrapped/default.nix
View file

@ -7,7 +7,7 @@
settings.init.allow_root.set(true) settings.init.allow_root.set(true)
settings.scheduler.fast_queues.set(2) settings.scheduler.fast_queues.set(2)
jimscrapped = mksafe(playlist(mode='randomize', reload=1, reload_mode="rounds", "/export/JimboNFS/Music/JimScrapped")) jimscrapped = mksafe(playlist(mode='randomize', reload=1, reload_mode="rounds", "/export/KittyNFS/Music/JimScrapped"))
jimscrapped_fallback = fallback([jimscrapped, jimscrapped]) jimscrapped_fallback = fallback([jimscrapped, jimscrapped])
output.icecast( output.icecast(