tristan/nix
1
0
Fork 0
Code Projects Releases Packages Activity

Merge branch alpine/master of into nixbook/master

Browse source
This commit is contained in:
Tristan 2024-03-05 20:36:04 +00:00
commit 61749486f3
9 changed files with 54 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

3
flake.nix
View file

@ -18,7 +18,7 @@
outputs = inputs: let outputs = inputs: let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import inputs.nixpkgs { inherit system; }; pkgs = import inputs.nixpkgs {inherit system;};
user = "tristan"; user = "tristan";
userFullname = "Tristan Beedell"; userFullname = "Tristan Beedell";
auto-login = import ./nixos/programs/auto-login.nix; auto-login = import ./nixos/programs/auto-login.nix;
@ -41,6 +41,7 @@
./home/programs/graphical.nix ./home/programs/graphical.nix
./home/programs/gamer.nix ./home/programs/gamer.nix
./home/programs/personal/. ./home/programs/personal/.
./home/programs/xr.nix
]; ];
FCS-Tristan-Nixbook = FCS-Tristan-Nixbook =

2
hardware/alpine.nix
View file

@ -101,7 +101,6 @@ in {
"/mnt/disk1/SnapRAID.content" "/mnt/disk1/SnapRAID.content"
"/mnt/disk2/SnapRAID.content" "/mnt/disk2/SnapRAID.content"
"/mnt/disk3/SnapRAID.content" "/mnt/disk3/SnapRAID.content"
"/var/snapraid/SnapRAID.content"
]; ];
dataDisks = { dataDisks = {
d1 = "/mnt/disk1"; d1 = "/mnt/disk1";
@ -132,6 +131,7 @@ in {
recommendedOptimisation = true; recommendedOptimisation = true;
recommendedGzipSettings = true; recommendedGzipSettings = true;
virtualHosts = { virtualHosts = {
"cerysb.art".globalRedirect = "instagram.com/cerys.bcreates";
"*.tristans.cloud" = { "*.tristans.cloud" = {
globalRedirect = "tristans.cloud"; globalRedirect = "tristans.cloud";
}; };

2
home/programs/personal/default.nix
View file

@ -19,7 +19,6 @@
ardour ardour
blender blender
# musescore # musescore
jellyfin-media-player
monero-gui monero-gui
electrum electrum
xmrig xmrig
@ -30,5 +29,6 @@
hugo hugo
libsForQt5.neochat libsForQt5.neochat
bookworm bookworm
jellyfin-mpv-shim
]; ];
} }

48
home/programs/xr.nix
View file

@ -1,30 +1,32 @@
{pkgs, config, ...}: { {
pkgs,
...
}: {
home.packages = with pkgs; [ home.packages = with pkgs; [
monado monado
]; ];
home.file.".config/openxr/1/openxr_monado.json" = { home.file.".config/openxr/1/openxr_monado.json" = {
source = "${pkgs.monado}/share/openxr/1/openxr_monado.json"; source = "${pkgs.monado}/share/openxr/1/openxr_monado.json";
}; };
home.file.".config/openvr/openvrpaths.vrpath" = { # home.file.".config/openvr/openvrpaths.vrpath" = {
text = '' # text = ''
{ # {
"config" : # "config" :
[ # [
"${config.home.homeDirectory}/.local/share/Steam/config" # "${config.home.homeDirectory}/.local/share/Steam/config"
], # ],
"external_drivers" : null, # "external_drivers" : null,
"jsonid" : "vrpathreg", # "jsonid" : "vrpathreg",
"log" : # "log" :
[ # [
"${config.home.homeDirectory}/.local/share/Steam/logs" # "${config.home.homeDirectory}/.local/share/Steam/logs"
], # ],
"runtime" : # "runtime" :
[ # [
"${pkgs.opencomposite}/lib/opencomposite" # "${pkgs.opencomposite}/lib/opencomposite"
], # ],
"version" : 1 # "version" : 1
} # }
''; # '';
}; # };
} }

6
nixos/default.nix
View file

@ -41,6 +41,12 @@ in {
} }
]; ];
}; };
networking.hosts = {
"100.65.29.110" = ["zenix"];
"100.106.241.122" = ["alpine" "tristans.cloud"];
"100.71.130.111" = ["fcs-tristan-nixbook"];
"100.69.60.83" = ["google-pixel-8"];
};
time.timeZone = lib.mkDefault "Europe/London"; time.timeZone = lib.mkDefault "Europe/London";

13
nixos/services/nextcloud.nix
View file

@ -68,8 +68,17 @@ in {
datadirectory = "/mnt/storage/nextcloud"; datadirectory = "/mnt/storage/nextcloud";
}; };
extraApps = { extraApps = {
inherit (config.services.nextcloud.package.packages.apps) inherit
contacts calendar mail gpoddersync memories notes maps; (config.services.nextcloud.package.packages.apps)
contacts
calendar
mail
gpoddersync
memories
notes
maps
previewgenerator
;
oidc_login = pkgs.fetchNextcloudApp { oidc_login = pkgs.fetchNextcloudApp {
sha256 = "sha256-cN5azlThKPKRVip14yfUNR85of5z+N6NVI7sg6pSGQI="; sha256 = "sha256-cN5azlThKPKRVip14yfUNR85of5z+N6NVI7sg6pSGQI=";
url = "https://github.com/pulsejet/nextcloud-oidc-login/releases/download/v3.0.2/oidc_login.tar.gz"; url = "https://github.com/pulsejet/nextcloud-oidc-login/releases/download/v3.0.2/oidc_login.tar.gz";

1
nixos/services/whatsapp.nix
View file

@ -65,6 +65,7 @@ in {
}; };
encryption = { encryption = {
allow = true; allow = true;
appservice = false;
}; };
personal_filtering_spaces = true; personal_filtering_spaces = true;
}; };

11
nixos/workstation.nix
View file

@ -1,12 +1,8 @@
{ {
inputs, inputs,
config,
pkgs, pkgs,
lib,
... ...
}: let }: {
user = config.user;
in {
imports = [ imports = [
inputs.stylix.nixosModules.stylix inputs.stylix.nixosModules.stylix
]; ];
@ -58,6 +54,11 @@ in {
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
services.blueman.enable = true; services.blueman.enable = true;
networking.stevenblack = {
enable = true;
block = ["porn" "gambling"];
};
stylix = { stylix = {
image = ../images/nix-soft.png; image = ../images/nix-soft.png;
base16Scheme = "${pkgs.base16-schemes}/share/themes/onedark.yaml"; base16Scheme = "${pkgs.base16-schemes}/share/themes/onedark.yaml";