Run nix fmt
This commit is contained in:
parent
df9449315d
commit
c22aee3927
41
flake.nix
41
flake.nix
|
|
@ -29,16 +29,25 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { nixpkgs, home-manager, nur, nixos-06cb-009a-fingerprint-sensor, ... }@inputs:
|
outputs = {
|
||||||
let
|
nixpkgs,
|
||||||
system = "x86_64-linux";
|
home-manager,
|
||||||
|
nur,
|
||||||
|
nixos-06cb-009a-fingerprint-sensor,
|
||||||
|
...
|
||||||
|
} @ inputs: let
|
||||||
|
supportedSystems = ["x86_64-linux" "aarch64-linux"];
|
||||||
|
forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
|
||||||
|
system = builtins.currentSystem;
|
||||||
pkgs = nixpkgs.legacyPackages.${system};
|
pkgs = nixpkgs.legacyPackages.${system};
|
||||||
commonModules = host: user: [
|
commonModules = host: user: [
|
||||||
./hosts/${host}/hardware-configuration.nix
|
./hosts/${host}/hardware-configuration.nix
|
||||||
{ nixpkgs.overlays = [
|
{
|
||||||
|
nixpkgs.overlays = [
|
||||||
nur.overlays.default
|
nur.overlays.default
|
||||||
(self: super: {utillinux = super.util-linux;})
|
(self: super: {utillinux = super.util-linux;})
|
||||||
]; }
|
];
|
||||||
|
}
|
||||||
{
|
{
|
||||||
networking.hostName = host;
|
networking.hostName = host;
|
||||||
time.timeZone = "Asia/Bangkok";
|
time.timeZone = "Asia/Bangkok";
|
||||||
|
|
@ -87,12 +96,14 @@
|
||||||
}
|
}
|
||||||
./hosts/${host}
|
./hosts/${host}
|
||||||
];
|
];
|
||||||
mkSystem = host: cfg:
|
mkSystem = host: cfg: let
|
||||||
let
|
|
||||||
system = cfg.system or "x86_64-linux";
|
system = cfg.system or "x86_64-linux";
|
||||||
in
|
in
|
||||||
nixpkgs.lib.nixosSystem {
|
nixpkgs.lib.nixosSystem {
|
||||||
modules = (commonModules host cfg.user) ++ (cfg.modules or [ ]) ++ [
|
modules =
|
||||||
|
(commonModules host cfg.user)
|
||||||
|
++ (cfg.modules or [])
|
||||||
|
++ [
|
||||||
{nixpkgs.hostPlatform = system;}
|
{nixpkgs.hostPlatform = system;}
|
||||||
];
|
];
|
||||||
specialArgs = inputs;
|
specialArgs = inputs;
|
||||||
|
|
@ -101,13 +112,19 @@
|
||||||
Riva = {user = "user";};
|
Riva = {user = "user";};
|
||||||
Kell = {user = "user";};
|
Kell = {user = "user";};
|
||||||
Aloria = {user = "user";};
|
Aloria = {user = "user";};
|
||||||
Arendia = { user = "user"; modules = [
|
Arendia = {
|
||||||
|
user = "user";
|
||||||
|
modules = [
|
||||||
nixos-06cb-009a-fingerprint-sensor.nixosModules."06cb-009a-fingerprint-sensor"
|
nixos-06cb-009a-fingerprint-sensor.nixosModules."06cb-009a-fingerprint-sensor"
|
||||||
];};
|
];
|
||||||
|
};
|
||||||
Asturia = {user = "user";};
|
Asturia = {user = "user";};
|
||||||
};
|
};
|
||||||
in
|
in {
|
||||||
{
|
|
||||||
nixosConfigurations = nixpkgs.lib.mapAttrs mkSystem systems;
|
nixosConfigurations = nixpkgs.lib.mapAttrs mkSystem systems;
|
||||||
|
formatter = forAllSystems (
|
||||||
|
system:
|
||||||
|
nixpkgs.legacyPackages.${system}.alejandra
|
||||||
|
);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,9 @@
|
||||||
{ inputs, config, pkgs, ... }:
|
{
|
||||||
let
|
inputs,
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
fzgo_paths = {
|
fzgo_paths = {
|
||||||
files = [
|
files = [
|
||||||
"/home/user/.dotfiles"
|
"/home/user/.dotfiles"
|
||||||
|
|
@ -9,8 +13,7 @@ let
|
||||||
"/Storage/TrackBox"
|
"/Storage/TrackBox"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
in
|
in {
|
||||||
{
|
|
||||||
imports = [
|
imports = [
|
||||||
(import ./utils/desktop.nix {inherit inputs config pkgs;})
|
(import ./utils/desktop.nix {inherit inputs config pkgs;})
|
||||||
(import ./utils/fzgo_links.nix {inherit config pkgs fzgo_paths;})
|
(import ./utils/fzgo_links.nix {inherit config pkgs fzgo_paths;})
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,9 @@
|
||||||
{ inputs, config, pkgs, ... }:
|
{
|
||||||
let
|
inputs,
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
fzgo_paths = {
|
fzgo_paths = {
|
||||||
files = [
|
files = [
|
||||||
"/home/user/.dotfiles"
|
"/home/user/.dotfiles"
|
||||||
|
|
@ -9,8 +13,7 @@ let
|
||||||
"/Storage/TrackBox/"
|
"/Storage/TrackBox/"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
in
|
in {
|
||||||
{
|
|
||||||
imports = [
|
imports = [
|
||||||
(import ./utils/desktop.nix {inherit inputs config pkgs;})
|
(import ./utils/desktop.nix {inherit inputs config pkgs;})
|
||||||
(import ./utils/fzgo_links.nix {inherit config pkgs fzgo_paths;})
|
(import ./utils/fzgo_links.nix {inherit config pkgs fzgo_paths;})
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,10 @@
|
||||||
{ inputs, config, pkgs, ... }:
|
|
||||||
let
|
|
||||||
in
|
|
||||||
{
|
{
|
||||||
|
inputs,
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
in {
|
||||||
home.username = "ubuntu";
|
home.username = "ubuntu";
|
||||||
home.homeDirectory = "/home/ubuntu";
|
home.homeDirectory = "/home/ubuntu";
|
||||||
nix = {
|
nix = {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,9 @@
|
||||||
{ inputs, config, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
|
inputs,
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
imports = [
|
imports = [
|
||||||
(import ./utils/desktop.nix {inherit inputs config pkgs;})
|
(import ./utils/desktop.nix {inherit inputs config pkgs;})
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,9 @@
|
||||||
{ inputs, config, pkgs, ... }:
|
|
||||||
{
|
{
|
||||||
|
inputs,
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
home.username = "user";
|
home.username = "user";
|
||||||
home.homeDirectory = "/home/user";
|
home.homeDirectory = "/home/user";
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,9 @@
|
||||||
{ inputs, config, pkgs, ... }:
|
{
|
||||||
let
|
inputs,
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
fzgo_paths = {
|
fzgo_paths = {
|
||||||
files = [
|
files = [
|
||||||
"/home/user/.dotfiles"
|
"/home/user/.dotfiles"
|
||||||
|
|
@ -12,8 +16,7 @@ let
|
||||||
"/home/server/.cache/fzgo/entries/d/|home|server|Storage|Shared"
|
"/home/server/.cache/fzgo/entries/d/|home|server|Storage|Shared"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
in
|
in {
|
||||||
{
|
|
||||||
imports = [
|
imports = [
|
||||||
(import ./utils/desktop.nix {inherit inputs config pkgs;})
|
(import ./utils/desktop.nix {inherit inputs config pkgs;})
|
||||||
(import ./utils/fzgo_links.nix {inherit config pkgs fzgo_paths;})
|
(import ./utils/fzgo_links.nix {inherit config pkgs fzgo_paths;})
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,9 @@
|
||||||
{ inputs, config, pkgs, ... }:
|
{
|
||||||
let
|
inputs,
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
username = "server";
|
username = "server";
|
||||||
home_dir = "/home/${username}";
|
home_dir = "/home/${username}";
|
||||||
scripts = {
|
scripts = {
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,10 @@
|
||||||
{ inputs, config, pkgs, ... }:
|
|
||||||
let
|
|
||||||
in
|
|
||||||
{
|
{
|
||||||
|
inputs,
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
in {
|
||||||
home.username = "user";
|
home.username = "user";
|
||||||
home.homeDirectory = "/home/user";
|
home.homeDirectory = "/home/user";
|
||||||
nix = {
|
nix = {
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,9 @@
|
||||||
{ inputs, config, pkgs, ... }:
|
{
|
||||||
let
|
inputs,
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
fzgo_paths = {
|
fzgo_paths = {
|
||||||
files = [
|
files = [
|
||||||
"/home/user/.dotfiles"
|
"/home/user/.dotfiles"
|
||||||
|
|
@ -12,8 +16,7 @@ let
|
||||||
"/home/server/.cache/fzgo/entries/d/|home|server|Storage|Shared"
|
"/home/server/.cache/fzgo/entries/d/|home|server|Storage|Shared"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
in
|
in {
|
||||||
{
|
|
||||||
imports = [
|
imports = [
|
||||||
(import ./utils/fzgo_links.nix {inherit config pkgs fzgo_paths;})
|
(import ./utils/fzgo_links.nix {inherit config pkgs fzgo_paths;})
|
||||||
(import ./utils/desktop.nix {inherit inputs config pkgs;})
|
(import ./utils/desktop.nix {inherit inputs config pkgs;})
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,9 @@
|
||||||
{ inputs, config, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
|
inputs,
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
home.username = "user";
|
home.username = "user";
|
||||||
home.homeDirectory = "/home/user";
|
home.homeDirectory = "/home/user";
|
||||||
nix = {
|
nix = {
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,9 @@
|
||||||
{ inputs, config, pkgs, ... }:
|
{
|
||||||
let
|
inputs,
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
scripts = {
|
scripts = {
|
||||||
disk_check = {
|
disk_check = {
|
||||||
when = "*-*-* *:00:00";
|
when = "*-*-* *:00:00";
|
||||||
|
|
@ -47,8 +51,7 @@ let
|
||||||
'');
|
'');
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
in
|
in {
|
||||||
{
|
|
||||||
home.username = "server";
|
home.username = "server";
|
||||||
home.homeDirectory = "/home/server";
|
home.homeDirectory = "/home/server";
|
||||||
nix = {
|
nix = {
|
||||||
|
|
@ -59,7 +62,10 @@ in
|
||||||
xdg.enable = true;
|
xdg.enable = true;
|
||||||
imports = [
|
imports = [
|
||||||
(import ./utils/common.nix {inherit inputs config pkgs;})
|
(import ./utils/common.nix {inherit inputs config pkgs;})
|
||||||
(import ./utils/services.nix { inherit pkgs; scripts = scripts; })
|
(import ./utils/services.nix {
|
||||||
|
inherit pkgs;
|
||||||
|
scripts = scripts;
|
||||||
|
})
|
||||||
./ssh
|
./ssh
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,8 @@
|
||||||
{ inputs, pkgs, ... }:
|
|
||||||
{
|
{
|
||||||
|
inputs,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
# add the home manager module
|
# add the home manager module
|
||||||
imports = [inputs.ags.homeManagerModules.default];
|
imports = [inputs.ags.homeManagerModules.default];
|
||||||
programs.ags = {
|
programs.ags = {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,4 @@
|
||||||
{ pkgs, ... }:
|
{pkgs, ...}: {
|
||||||
|
|
||||||
{
|
|
||||||
programs.alacritty = {
|
programs.alacritty = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,9 @@
|
||||||
{ config, inputs, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
|
config,
|
||||||
|
inputs,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
programs.starship = {
|
programs.starship = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableBashIntegration = true;
|
enableBashIntegration = true;
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,10 @@
|
||||||
{ config, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
home.file = {
|
home.file = {
|
||||||
".mailcap".text =
|
".mailcap".text = "text/html; w3m -dump -o -document_charset=%{charset} %s; nametemplate=%s.html; copiousoutput";
|
||||||
"text/html; w3m -dump -o -document_charset=%{charset} %s; nametemplate=%s.html; copiousoutput";
|
|
||||||
};
|
};
|
||||||
home.packages = with pkgs; [mailcap];
|
home.packages = with pkgs; [mailcap];
|
||||||
|
|
||||||
|
|
@ -177,13 +178,11 @@
|
||||||
dirlist-tree = true;
|
dirlist-tree = true;
|
||||||
};
|
};
|
||||||
viewer = {
|
viewer = {
|
||||||
pager =
|
pager = "${pkgs.neovim}/bin/nvim -u ${config.xdg.configHome}/nvim/aerc.lua";
|
||||||
"${pkgs.neovim}/bin/nvim -u ${config.xdg.configHome}/nvim/aerc.lua";
|
|
||||||
};
|
};
|
||||||
compose = {address-book-cmd = ''notmuch address "%s"'';};
|
compose = {address-book-cmd = ''notmuch address "%s"'';};
|
||||||
multipart-converters = {
|
multipart-converters = {
|
||||||
"text/html" =
|
"text/html" = "${pkgs.w3m}/bin/w3m -dump -o display_link_number=1 -T text/html";
|
||||||
"${pkgs.w3m}/bin/w3m -dump -o display_link_number=1 -T text/html";
|
|
||||||
};
|
};
|
||||||
filters = {
|
filters = {
|
||||||
"text/plain" = "cat";
|
"text/plain" = "cat";
|
||||||
|
|
@ -198,22 +197,17 @@
|
||||||
Zoho = {
|
Zoho = {
|
||||||
outgoing = "smtps://email%40thomasave.be@smtp.zoho.com";
|
outgoing = "smtps://email%40thomasave.be@smtp.zoho.com";
|
||||||
outgoing-cred-cmd = "cat ~/.secrets/Aerc/Zoho.key";
|
outgoing-cred-cmd = "cat ~/.secrets/Aerc/Zoho.key";
|
||||||
source =
|
source = "maildir:///home/server/Storage/Thomas/Mail/email@thomasave.be/";
|
||||||
"maildir:///home/server/Storage/Thomas/Mail/email@thomasave.be/";
|
check-mail-cmd = "ssh server@10.1 /home/server/Containers/mbsync/sync.sh";
|
||||||
check-mail-cmd =
|
|
||||||
"ssh server@10.1 /home/server/Containers/mbsync/sync.sh";
|
|
||||||
check-mail-timeout = "60s";
|
check-mail-timeout = "60s";
|
||||||
default = "Inbox";
|
default = "Inbox";
|
||||||
from = ''"Thomas Avé" <email@thomasave.be>'';
|
from = ''"Thomas Avé" <email@thomasave.be>'';
|
||||||
cache-headers = true;
|
cache-headers = true;
|
||||||
};
|
};
|
||||||
UAntwerpen = {
|
UAntwerpen = {
|
||||||
outgoing =
|
outgoing = "ssh server@192.168.1.2 /home/server/Containers/mbsync/send.sh";
|
||||||
"ssh server@192.168.1.2 /home/server/Containers/mbsync/send.sh";
|
source = "maildir:///home/server/Storage/Thomas/Mail/Thomas.Ave@uantwerpen.be";
|
||||||
source =
|
check-mail-cmd = "ssh server@10.1 /home/server/Containers/mbsync/sync.sh";
|
||||||
"maildir:///home/server/Storage/Thomas/Mail/Thomas.Ave@uantwerpen.be";
|
|
||||||
check-mail-cmd =
|
|
||||||
"ssh server@10.1 /home/server/Containers/mbsync/sync.sh";
|
|
||||||
check-mail-timeout = "60s";
|
check-mail-timeout = "60s";
|
||||||
default = "Inbox";
|
default = "Inbox";
|
||||||
from = ''"Thomas Avé" <Thomas.Ave@uantwerpen.be>'';
|
from = ''"Thomas Avé" <Thomas.Ave@uantwerpen.be>'';
|
||||||
|
|
@ -222,10 +216,8 @@
|
||||||
IMEC = {
|
IMEC = {
|
||||||
outgoing = "smtp+insecure://ave57%40imec.be@smtp.thomasave.be:1025";
|
outgoing = "smtp+insecure://ave57%40imec.be@smtp.thomasave.be:1025";
|
||||||
outgoing-cred-cmd = "cat ~/.secrets/Aerc/IMEC.key";
|
outgoing-cred-cmd = "cat ~/.secrets/Aerc/IMEC.key";
|
||||||
source =
|
source = "maildir:///home/server/Storage/Thomas/Mail/Thomas.Ave@imec.be/";
|
||||||
"maildir:///home/server/Storage/Thomas/Mail/Thomas.Ave@imec.be/";
|
check-mail-cmd = "ssh server@10.1 /home/server/Containers/mbsync/sync.sh";
|
||||||
check-mail-cmd =
|
|
||||||
"ssh server@10.1 /home/server/Containers/mbsync/sync.sh";
|
|
||||||
check-mail-timeout = "60s";
|
check-mail-timeout = "60s";
|
||||||
default = "Inbox";
|
default = "Inbox";
|
||||||
from = ''"Thomas Avé" <Thomas.Ave@imec.be>'';
|
from = ''"Thomas Avé" <Thomas.Ave@imec.be>'';
|
||||||
|
|
@ -233,8 +225,7 @@
|
||||||
};
|
};
|
||||||
NotMuch = {
|
NotMuch = {
|
||||||
source = "notmuch:///home/server/Storage/Thomas/Mail/";
|
source = "notmuch:///home/server/Storage/Thomas/Mail/";
|
||||||
check-mail-cmd =
|
check-mail-cmd = "ssh server@10.1 /home/server/Containers/mbsync/sync.sh";
|
||||||
"ssh server@10.1 /home/server/Containers/mbsync/sync.sh";
|
|
||||||
check-mail-timeout = "60s";
|
check-mail-timeout = "60s";
|
||||||
from = ''"Thomas Avé" <Thomas.Ave@uantwerpen.be>'';
|
from = ''"Thomas Avé" <Thomas.Ave@uantwerpen.be>'';
|
||||||
query-map = "${config.xdg.configHome}/aerc/map.conf";
|
query-map = "${config.xdg.configHome}/aerc/map.conf";
|
||||||
|
|
@ -244,8 +235,7 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
home.file."${config.xdg.configHome}/aerc/map.conf".text =
|
home.file."${config.xdg.configHome}/aerc/map.conf".text = "Inbox=tag:inbox and not tag:archived and not tag:deleted";
|
||||||
"Inbox=tag:inbox and not tag:archived and not tag:deleted";
|
|
||||||
home.file."${config.xdg.configHome}/aerc/stylesets/catppuccin-mocha".text = ''
|
home.file."${config.xdg.configHome}/aerc/stylesets/catppuccin-mocha".text = ''
|
||||||
*.default=true
|
*.default=true
|
||||||
*.normal=true
|
*.normal=true
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,9 @@
|
||||||
{ pkgs, ... }:
|
{pkgs, ...}: let
|
||||||
let
|
|
||||||
lock-false = {
|
lock-false = {
|
||||||
Value = false;
|
Value = false;
|
||||||
Status = "locked";
|
Status = "locked";
|
||||||
};
|
};
|
||||||
in
|
in {
|
||||||
{
|
|
||||||
programs.firefox = {
|
programs.firefox = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.wrapFirefox pkgs.firefox-unwrapped {
|
package = pkgs.wrapFirefox pkgs.firefox-unwrapped {
|
||||||
|
|
@ -24,8 +22,7 @@ in
|
||||||
};
|
};
|
||||||
ExtensionSettings = {
|
ExtensionSettings = {
|
||||||
"{3e4d2037-d300-4e95-859d-3cba866f46d3}" = {
|
"{3e4d2037-d300-4e95-859d-3cba866f46d3}" = {
|
||||||
install_url =
|
install_url = "https://addons.mozilla.org/firefox/downloads/latest/private-internet-access-ext/latest.xpi";
|
||||||
"https://addons.mozilla.org/firefox/downloads/latest/private-internet-access-ext/latest.xpi";
|
|
||||||
installation_mode = "force_installed";
|
installation_mode = "force_installed";
|
||||||
};
|
};
|
||||||
"{c7c120ff-2878-4e59-a5a3-cd4d1655bc13}" = {
|
"{c7c120ff-2878-4e59-a5a3-cd4d1655bc13}" = {
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
{ ... }:
|
{...}: {
|
||||||
{
|
|
||||||
programs.foot = {
|
programs.foot = {
|
||||||
enable = true;
|
enable = true;
|
||||||
server.enable = true;
|
server.enable = true;
|
||||||
|
|
@ -13,7 +12,7 @@
|
||||||
sixel = "yes";
|
sixel = "yes";
|
||||||
};
|
};
|
||||||
scrollback.lines = 100000;
|
scrollback.lines = 100000;
|
||||||
colors = {
|
colors-dark = {
|
||||||
background = "000010";
|
background = "000010";
|
||||||
foreground = "F8F8F2";
|
foreground = "F8F8F2";
|
||||||
regular0 = "121212";
|
regular0 = "121212";
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
{ ... }:
|
{...}: {
|
||||||
{
|
|
||||||
programs.ghostty = {
|
programs.ghostty = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableZshIntegration = true;
|
enableZshIntegration = true;
|
||||||
|
|
@ -39,7 +38,6 @@
|
||||||
font-family = "JetBrains Mono";
|
font-family = "JetBrains Mono";
|
||||||
window-decoration = false;
|
window-decoration = false;
|
||||||
# adjust-cell-height = "10%";
|
# adjust-cell-height = "10%";
|
||||||
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,4 @@
|
||||||
{ pkgs, ... }:
|
{pkgs, ...}: {
|
||||||
|
|
||||||
{
|
|
||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
lfs.enable = true;
|
lfs.enable = true;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
{ pkgs, ... }:
|
{pkgs, ...}: {
|
||||||
{
|
|
||||||
home.packages = [
|
home.packages = [
|
||||||
(pkgs.appimageTools.wrapType2 {
|
(pkgs.appimageTools.wrapType2 {
|
||||||
pname = "Helium";
|
pname = "Helium";
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
{ pkgs, ... }:
|
{pkgs, ...}: let
|
||||||
let
|
|
||||||
playerctl = "${pkgs.playerctl}/bin/playerctl";
|
playerctl = "${pkgs.playerctl}/bin/playerctl";
|
||||||
nautilus = "${pkgs.nautilus}/bin/nautilus";
|
nautilus = "${pkgs.nautilus}/bin/nautilus";
|
||||||
gnome-calendar = "${pkgs.gnome-calendar}/bin/gnome-calendar";
|
gnome-calendar = "${pkgs.gnome-calendar}/bin/gnome-calendar";
|
||||||
|
|
@ -232,7 +231,8 @@ in {
|
||||||
"$mainMod $altMod, K, resizeactive, 0 -20"
|
"$mainMod $altMod, K, resizeactive, 0 -20"
|
||||||
"$mainMod $altMod, J, resizeactive, 0 20"
|
"$mainMod $altMod, J, resizeactive, 0 20"
|
||||||
];
|
];
|
||||||
bind = [
|
bind =
|
||||||
|
[
|
||||||
"$mainMod, return, exec, ${launch_terminal}/bin/launch_terminal $(hyprctl activewindow -j | ${jq} .pid)"
|
"$mainMod, return, exec, ${launch_terminal}/bin/launch_terminal $(hyprctl activewindow -j | ${jq} .pid)"
|
||||||
"$mainMod SHIFT, return, exec, ${terminal}"
|
"$mainMod SHIFT, return, exec, ${terminal}"
|
||||||
"$mainMod, Q, killactive,"
|
"$mainMod, Q, killactive,"
|
||||||
|
|
@ -282,16 +282,16 @@ in {
|
||||||
"$mainMod SHIFT, TAB, ${workspace_command_prefix}workspace, m-1"
|
"$mainMod SHIFT, TAB, ${workspace_command_prefix}workspace, m-1"
|
||||||
"$mainMod, Caps_Lock, ${workspace_command_prefix}workspace, m+1"
|
"$mainMod, Caps_Lock, ${workspace_command_prefix}workspace, m+1"
|
||||||
"$mainMod SHIFT, Caps_Lock, ${workspace_command_prefix}workspace, m-1"
|
"$mainMod SHIFT, Caps_Lock, ${workspace_command_prefix}workspace, m-1"
|
||||||
] ++ (
|
]
|
||||||
|
++ (
|
||||||
# workspaces
|
# workspaces
|
||||||
builtins.concatLists (builtins.genList (x:
|
builtins.concatLists (builtins.genList (x: let
|
||||||
let
|
|
||||||
ws = let c = (x + 1) / 10; in builtins.toString (x + 1 - (c * 10));
|
ws = let c = (x + 1) / 10; in builtins.toString (x + 1 - (c * 10));
|
||||||
in
|
in [
|
||||||
[
|
|
||||||
"$mainMod, ${ws}, ${workspace_command_prefix}workspace, ${toString (x + 1)}"
|
"$mainMod, ${ws}, ${workspace_command_prefix}workspace, ${toString (x + 1)}"
|
||||||
"$mainMod SHIFT, ${ws}, ${workspace_command_prefix}movetoworkspace, ${toString (x + 1)}"
|
"$mainMod SHIFT, ${ws}, ${workspace_command_prefix}movetoworkspace, ${toString (x + 1)}"
|
||||||
]) 10));
|
]) 10)
|
||||||
|
);
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,4 @@
|
||||||
{ lib, ... }:
|
{lib, ...}: {
|
||||||
|
|
||||||
{
|
|
||||||
programs.kitty = {
|
programs.kitty = {
|
||||||
enable = true;
|
enable = true;
|
||||||
shellIntegration.enableZshIntegration = true;
|
shellIntegration.enableZshIntegration = true;
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,8 @@
|
||||||
{ config, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
home.file."${config.xdg.configHome}/lf" = {
|
home.file."${config.xdg.configHome}/lf" = {
|
||||||
source = ./files;
|
source = ./files;
|
||||||
recursive = true;
|
recursive = true;
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,8 @@
|
||||||
{ config, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
home.file."${config.xdg.configHome}/mpv" = {
|
home.file."${config.xdg.configHome}/mpv" = {
|
||||||
source = ./files;
|
source = ./files;
|
||||||
recursive = true;
|
recursive = true;
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,8 @@
|
||||||
{ config, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
# codeium
|
# codeium
|
||||||
nixd
|
nixd
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,8 @@
|
||||||
{ config, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
home.packages = with pkgs; [papirus-icon-theme];
|
home.packages = with pkgs; [papirus-icon-theme];
|
||||||
|
|
||||||
programs.rofi = {
|
programs.rofi = {
|
||||||
|
|
@ -13,8 +15,8 @@
|
||||||
kb-cancel = "Super_L+XF86Launch5,Escape";
|
kb-cancel = "Super_L+XF86Launch5,Escape";
|
||||||
combi-hide-mode-prefix = true;
|
combi-hide-mode-prefix = true;
|
||||||
};
|
};
|
||||||
theme =
|
theme = let
|
||||||
let inherit (config.lib.formats.rasi) mkLiteral;
|
inherit (config.lib.formats.rasi) mkLiteral;
|
||||||
in {
|
in {
|
||||||
"*" = {
|
"*" = {
|
||||||
background = mkLiteral "#0f111a";
|
background = mkLiteral "#0f111a";
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,9 @@
|
||||||
{ inputs, config, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
|
inputs,
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
programs.ssh = {
|
programs.ssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableDefaultConfig = false;
|
enableDefaultConfig = false;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
{ pkgs, ... }:
|
{pkgs, ...}: {
|
||||||
{
|
|
||||||
programs.tmux = {
|
programs.tmux = {
|
||||||
shell = "${pkgs.zsh}/bin/zsh";
|
shell = "${pkgs.zsh}/bin/zsh";
|
||||||
terminal = "screen-256color";
|
terminal = "screen-256color";
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,9 @@
|
||||||
{ inputs, config, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
|
inputs,
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
imports = [
|
imports = [
|
||||||
(import ../zsh {inherit inputs config pkgs;})
|
(import ../zsh {inherit inputs config pkgs;})
|
||||||
(import ../bash {inherit inputs config pkgs;})
|
(import ../bash {inherit inputs config pkgs;})
|
||||||
|
|
@ -48,5 +51,4 @@
|
||||||
$pdf_mode = 1;
|
$pdf_mode = 1;
|
||||||
$pdf_previewer = 'evince %O %S';
|
$pdf_previewer = 'evince %O %S';
|
||||||
'';
|
'';
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,9 @@
|
||||||
{ inputs, config, pkgs, ... }:
|
|
||||||
{
|
{
|
||||||
|
inputs,
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
imports = [
|
imports = [
|
||||||
(import ./common.nix {inherit inputs config pkgs;})
|
(import ./common.nix {inherit inputs config pkgs;})
|
||||||
(import ./python.nix {inherit inputs config pkgs;})
|
(import ./python.nix {inherit inputs config pkgs;})
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
{ pkgs }:
|
{pkgs}: {
|
||||||
{
|
|
||||||
when = "*-*-* *:00:00";
|
when = "*-*-* *:00:00";
|
||||||
script = toString (pkgs.writeShellScript "script" ''
|
script = toString (pkgs.writeShellScript "script" ''
|
||||||
REPORT_EMAIL=email@thomasave.be
|
REPORT_EMAIL=email@thomasave.be
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,8 @@
|
||||||
{ config, pkgs, fzgo_paths }:
|
{
|
||||||
let
|
config,
|
||||||
|
pkgs,
|
||||||
|
fzgo_paths,
|
||||||
|
}: let
|
||||||
mkLink = source_path: file_type: {
|
mkLink = source_path: file_type: {
|
||||||
"${source_path}-${file_type}" = {
|
"${source_path}-${file_type}" = {
|
||||||
source = config.lib.file.mkOutOfStoreSymlink source_path;
|
source = config.lib.file.mkOutOfStoreSymlink source_path;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
{ pkgs, ... }:
|
{pkgs, ...}: let
|
||||||
let
|
|
||||||
pythonldlibpath = pkgs.lib.makeLibraryPath (with pkgs; [
|
pythonldlibpath = pkgs.lib.makeLibraryPath (with pkgs; [
|
||||||
libGL
|
libGL
|
||||||
glib
|
glib
|
||||||
|
|
@ -20,19 +19,22 @@ let
|
||||||
systemd
|
systemd
|
||||||
]);
|
]);
|
||||||
# Darwin requires a different library path prefix
|
# Darwin requires a different library path prefix
|
||||||
wrapPrefix = if (!pkgs.stdenv.isDarwin) then "LD_LIBRARY_PATH" else "DYLD_LIBRARY_PATH";
|
wrapPrefix =
|
||||||
|
if (!pkgs.stdenv.isDarwin)
|
||||||
|
then "LD_LIBRARY_PATH"
|
||||||
|
else "DYLD_LIBRARY_PATH";
|
||||||
# pythonOverlay = (pkgs.python313.withPackages (ps: [
|
# pythonOverlay = (pkgs.python313.withPackages (ps: [
|
||||||
# (ps.torch.override { rocmSupport = true; })
|
# (ps.torch.override { rocmSupport = true; })
|
||||||
# ]));
|
# ]));
|
||||||
|
|
||||||
patchedpython = (pkgs.symlinkJoin {
|
patchedpython = pkgs.symlinkJoin {
|
||||||
name = "python";
|
name = "python";
|
||||||
paths = [pkgs.python313];
|
paths = [pkgs.python313];
|
||||||
buildInputs = [pkgs.makeWrapper];
|
buildInputs = [pkgs.makeWrapper];
|
||||||
postBuild = ''
|
postBuild = ''
|
||||||
wrapProgram "$out/bin/python3.13" --prefix ${wrapPrefix} : "${pythonldlibpath}"
|
wrapProgram "$out/bin/python3.13" --prefix ${wrapPrefix} : "${pythonldlibpath}"
|
||||||
'';
|
'';
|
||||||
});
|
};
|
||||||
in {
|
in {
|
||||||
home.packages = [
|
home.packages = [
|
||||||
patchedpython
|
patchedpython
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,9 @@
|
||||||
{ pkgs, scripts }:
|
{
|
||||||
let
|
pkgs,
|
||||||
notify_script = (pkgs.writers.writePython3Bin "telegram-notify.py"
|
scripts,
|
||||||
|
}: let
|
||||||
|
notify_script =
|
||||||
|
pkgs.writers.writePython3Bin "telegram-notify.py"
|
||||||
{
|
{
|
||||||
libraries = [pkgs.python3Packages.python-telegram-bot];
|
libraries = [pkgs.python3Packages.python-telegram-bot];
|
||||||
} ''
|
} ''
|
||||||
|
|
@ -52,7 +55,7 @@ let
|
||||||
loop = asyncio.get_event_loop()
|
loop = asyncio.get_event_loop()
|
||||||
loop.run_until_complete(asyncio.wait([loop.create_task(run())]))
|
loop.run_until_complete(asyncio.wait([loop.create_task(run())]))
|
||||||
loop.close()
|
loop.close()
|
||||||
'');
|
'';
|
||||||
|
|
||||||
mkTimer = name: cfg: {
|
mkTimer = name: cfg: {
|
||||||
Install.WantedBy = ["timers.target"];
|
Install.WantedBy = ["timers.target"];
|
||||||
|
|
@ -68,9 +71,9 @@ let
|
||||||
# Install = { WantedBy = [ "default.target" ]; };
|
# Install = { WantedBy = [ "default.target" ]; };
|
||||||
Service = {ExecStart = cfg.script;};
|
Service = {ExecStart = cfg.script;};
|
||||||
};
|
};
|
||||||
in
|
in {
|
||||||
{
|
systemd.user.services =
|
||||||
systemd.user.services = pkgs.lib.mapAttrs mkService scripts
|
pkgs.lib.mapAttrs mkService scripts
|
||||||
// (pkgs.lib.mapAttrs mkService {
|
// (pkgs.lib.mapAttrs mkService {
|
||||||
"status_notify@" = {
|
"status_notify@" = {
|
||||||
script = "${notify_script}/bin/telegram-notify.py %i";
|
script = "${notify_script}/bin/telegram-notify.py %i";
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
{ inputs, ... }: # Add inputs here
|
{inputs, ...}:
|
||||||
|
# Add inputs here
|
||||||
{
|
{
|
||||||
# Import the module definition here
|
# Import the module definition here
|
||||||
imports = [inputs.vicinae.homeManagerModules.default];
|
imports = [inputs.vicinae.homeManagerModules.default];
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,9 @@
|
||||||
{ inputs, config, pkgs, ... }:
|
|
||||||
{
|
{
|
||||||
|
inputs,
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
imports = [inputs.walker.homeManagerModules.walker];
|
imports = [inputs.walker.homeManagerModules.walker];
|
||||||
programs.walker = {
|
programs.walker = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,8 @@
|
||||||
{ inputs, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
|
inputs,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
programs.waybar = {
|
programs.waybar = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = inputs.waybar.packages.${pkgs.stdenv.hostPlatform.system}.waybar;
|
package = inputs.waybar.packages.${pkgs.stdenv.hostPlatform.system}.waybar;
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,4 @@
|
||||||
{...}:
|
{...}: {
|
||||||
|
|
||||||
{
|
|
||||||
programs.yazi = {
|
programs.yazi = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableZshIntegration = true;
|
enableZshIntegration = true;
|
||||||
|
|
@ -13,16 +11,56 @@
|
||||||
|
|
||||||
keymap = {
|
keymap = {
|
||||||
mgr.normal = [
|
mgr.normal = [
|
||||||
{ on = [ "j" ]; run = "down"; desc = "Move cursor down"; }
|
{
|
||||||
{ on = [ "k" ]; run = "up"; desc = "Move cursor up"; }
|
on = ["j"];
|
||||||
{ on = [ "h" ]; run = "back"; desc = "Go back to parent directory"; }
|
run = "down";
|
||||||
{ on = [ "l" ]; run = "forward"; desc = "Enter directory / open file"; }
|
desc = "Move cursor down";
|
||||||
{ on = [ "q" ]; run = "quit"; desc = "Quit yazi"; }
|
}
|
||||||
{ on = [ " " ]; run = "select"; desc = "Select the current file"; }
|
{
|
||||||
{ on = [ "v" ]; run = "visual_mode"; desc = "Enter visual mode"; }
|
on = ["k"];
|
||||||
{ on = [ "y" ]; run = "yank"; desc = "Yank selection"; }
|
run = "up";
|
||||||
{ on = [ "p" ]; run = "paste"; desc = "Paste files"; }
|
desc = "Move cursor up";
|
||||||
{ on = [ "d" ]; run = "remove --permanently"; desc = "Delete permanently"; }
|
}
|
||||||
|
{
|
||||||
|
on = ["h"];
|
||||||
|
run = "back";
|
||||||
|
desc = "Go back to parent directory";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
on = ["l"];
|
||||||
|
run = "forward";
|
||||||
|
desc = "Enter directory / open file";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
on = ["q"];
|
||||||
|
run = "quit";
|
||||||
|
desc = "Quit yazi";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
on = [" "];
|
||||||
|
run = "select";
|
||||||
|
desc = "Select the current file";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
on = ["v"];
|
||||||
|
run = "visual_mode";
|
||||||
|
desc = "Enter visual mode";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
on = ["y"];
|
||||||
|
run = "yank";
|
||||||
|
desc = "Yank selection";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
on = ["p"];
|
||||||
|
run = "paste";
|
||||||
|
desc = "Paste files";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
on = ["d"];
|
||||||
|
run = "remove --permanently";
|
||||||
|
desc = "Delete permanently";
|
||||||
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
{ config, ... }:
|
{config, ...}: {
|
||||||
{
|
|
||||||
programs.zellij = {
|
programs.zellij = {
|
||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,9 @@
|
||||||
{ config, inputs, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
|
config,
|
||||||
|
inputs,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
home.packages = [
|
home.packages = [
|
||||||
pkgs.fzy
|
pkgs.fzy
|
||||||
pkgs.lf
|
pkgs.lf
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,10 @@
|
||||||
{ pkgs, lib, inputs, config, ... }:
|
{
|
||||||
let
|
pkgs,
|
||||||
|
lib,
|
||||||
|
inputs,
|
||||||
|
config,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
serverIP = "10.0.0.1";
|
serverIP = "10.0.0.1";
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
|
|
@ -24,13 +29,25 @@ in {
|
||||||
services.thinkfan.settings = {
|
services.thinkfan.settings = {
|
||||||
sensors = [
|
sensors = [
|
||||||
# Search for 'coretemp' anywhere in /sys/class/hwmon
|
# Search for 'coretemp' anywhere in /sys/class/hwmon
|
||||||
{ hwmon = "/sys/class/hwmon"; name = "coretemp"; indices = [ 1 ]; }
|
{
|
||||||
|
hwmon = "/sys/class/hwmon";
|
||||||
|
name = "coretemp";
|
||||||
|
indices = [1];
|
||||||
|
}
|
||||||
|
|
||||||
# Search for 'acpitz'
|
# Search for 'acpitz'
|
||||||
{ hwmon = "/sys/class/hwmon"; name = "acpitz"; indices = [ 1 ]; }
|
{
|
||||||
|
hwmon = "/sys/class/hwmon";
|
||||||
|
name = "acpitz";
|
||||||
|
indices = [1];
|
||||||
|
}
|
||||||
|
|
||||||
# Search for 'nvme'
|
# Search for 'nvme'
|
||||||
{ hwmon = "/sys/class/hwmon"; name = "nvme"; indices = [ 1 ]; }
|
{
|
||||||
|
hwmon = "/sys/class/hwmon";
|
||||||
|
name = "nvme";
|
||||||
|
indices = [1];
|
||||||
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
fans = [
|
fans = [
|
||||||
|
|
@ -108,12 +125,14 @@ in {
|
||||||
autostart = false;
|
autostart = false;
|
||||||
postUp = "resolvectl dns Tunnel 10.0.0.1; resolvectl domain Tunnel ~thomasave.be;";
|
postUp = "resolvectl dns Tunnel 10.0.0.1; resolvectl domain Tunnel ~thomasave.be;";
|
||||||
dns = ["10.0.0.1"];
|
dns = ["10.0.0.1"];
|
||||||
peers = [{
|
peers = [
|
||||||
|
{
|
||||||
publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";
|
publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";
|
||||||
allowedIPs = ["0.0.0.0/0" "::/0"];
|
allowedIPs = ["0.0.0.0/0" "::/0"];
|
||||||
endpoint = "external.thomasave.be:13231";
|
endpoint = "external.thomasave.be:13231";
|
||||||
persistentKeepalive = 25;
|
persistentKeepalive = 25;
|
||||||
}];
|
}
|
||||||
|
];
|
||||||
};
|
};
|
||||||
OPNsense = {
|
OPNsense = {
|
||||||
address = ["10.0.0.5/24"];
|
address = ["10.0.0.5/24"];
|
||||||
|
|
@ -122,12 +141,14 @@ in {
|
||||||
autostart = true;
|
autostart = true;
|
||||||
postUp = "resolvectl dns OPNsense 10.0.0.1; resolvectl domain OPNsense ~thomasave.be;";
|
postUp = "resolvectl dns OPNsense 10.0.0.1; resolvectl domain OPNsense ~thomasave.be;";
|
||||||
dns = ["10.0.0.1"];
|
dns = ["10.0.0.1"];
|
||||||
peers = [{
|
peers = [
|
||||||
|
{
|
||||||
publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";
|
publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";
|
||||||
allowedIPs = ["10.0.0.1/8" "192.168.1.2/32"];
|
allowedIPs = ["10.0.0.1/8" "192.168.1.2/32"];
|
||||||
endpoint = "external.thomasave.be:13231";
|
endpoint = "external.thomasave.be:13231";
|
||||||
persistentKeepalive = 25;
|
persistentKeepalive = 25;
|
||||||
}];
|
}
|
||||||
|
];
|
||||||
};
|
};
|
||||||
GCP = {
|
GCP = {
|
||||||
address = ["10.5.0.5/24"];
|
address = ["10.5.0.5/24"];
|
||||||
|
|
@ -135,16 +156,21 @@ in {
|
||||||
listenPort = 51820;
|
listenPort = 51820;
|
||||||
autostart = false;
|
autostart = false;
|
||||||
postUp = "resolvectl dns GCP 1.1.1.1;resolvectl dns wlan0 1.1.1.1;";
|
postUp = "resolvectl dns GCP 1.1.1.1;resolvectl dns wlan0 1.1.1.1;";
|
||||||
peers = [{
|
peers = [
|
||||||
|
{
|
||||||
publicKey = "NEBNE4Czf2MkZF2X5aVhmofENH1uXjDpvXjIMJvfMFA=";
|
publicKey = "NEBNE4Czf2MkZF2X5aVhmofENH1uXjDpvXjIMJvfMFA=";
|
||||||
allowedIPs = ["0.0.0.0/0"];
|
allowedIPs = ["0.0.0.0/0"];
|
||||||
endpoint = "35.201.231.151:443";
|
endpoint = "35.201.231.151:443";
|
||||||
persistentKeepalive = 25;
|
persistentKeepalive = 25;
|
||||||
}];
|
}
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
systemd.services."wg-quick-OPNsense" = {
|
systemd.services."wg-quick-OPNsense" = {
|
||||||
serviceConfig = { Restart = "on-failure"; RestartSec = "2s"; };
|
serviceConfig = {
|
||||||
|
Restart = "on-failure";
|
||||||
|
RestartSec = "2s";
|
||||||
|
};
|
||||||
unitConfig.StartLimitIntervalSec = 0;
|
unitConfig.StartLimitIntervalSec = 0;
|
||||||
};
|
};
|
||||||
services.usbmuxd.enable = true;
|
services.usbmuxd.enable = true;
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,15 @@
|
||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||||
# and may be overwritten by future invocations. Please make changes
|
# and may be overwritten by future invocations. Please make changes
|
||||||
# to /etc/nixos/configuration.nix instead.
|
# to /etc/nixos/configuration.nix instead.
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
config,
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
lib,
|
||||||
|
pkgs,
|
||||||
|
modulesPath,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
imports = [
|
||||||
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod"];
|
boot.initrd.availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod"];
|
||||||
|
|
@ -18,18 +22,18 @@
|
||||||
'';
|
'';
|
||||||
boot.kernelParams = ["ipv6.disable=1"];
|
boot.kernelParams = ["ipv6.disable=1"];
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" = {
|
||||||
{ device = "rpool/root";
|
device = "rpool/root";
|
||||||
fsType = "zfs";
|
fsType = "zfs";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/home" =
|
fileSystems."/home" = {
|
||||||
{ device = "rpool/home";
|
device = "rpool/home";
|
||||||
fsType = "zfs";
|
fsType = "zfs";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot" =
|
fileSystems."/boot" = {
|
||||||
{ device = "/dev/disk/by-uuid/5C58-A909";
|
device = "/dev/disk/by-uuid/5C58-A909";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
options = ["fmask=0022" "dmask=0022"];
|
options = ["fmask=0022" "dmask=0022"];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,11 @@
|
||||||
{ pkgs, lib, inputs, config, nixos-06cb-009a-fingerprint-sensor, ... }:
|
{
|
||||||
let
|
pkgs,
|
||||||
|
lib,
|
||||||
|
inputs,
|
||||||
|
config,
|
||||||
|
nixos-06cb-009a-fingerprint-sensor,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
serverIP = "10.0.0.1";
|
serverIP = "10.0.0.1";
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
|
|
@ -89,12 +95,14 @@ in {
|
||||||
autostart = false;
|
autostart = false;
|
||||||
postUp = "resolvectl dns Tunnel 10.0.0.1; resolvectl domain Tunnel ~thomasave.be;";
|
postUp = "resolvectl dns Tunnel 10.0.0.1; resolvectl domain Tunnel ~thomasave.be;";
|
||||||
dns = ["10.0.0.1"];
|
dns = ["10.0.0.1"];
|
||||||
peers = [{
|
peers = [
|
||||||
|
{
|
||||||
publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";
|
publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";
|
||||||
allowedIPs = ["0.0.0.0/0" "::/0"];
|
allowedIPs = ["0.0.0.0/0" "::/0"];
|
||||||
endpoint = "ipv4.thomasave.be:13231";
|
endpoint = "ipv4.thomasave.be:13231";
|
||||||
persistentKeepalive = 25;
|
persistentKeepalive = 25;
|
||||||
}];
|
}
|
||||||
|
];
|
||||||
};
|
};
|
||||||
OPNsense = {
|
OPNsense = {
|
||||||
address = ["10.0.0.7/24" "2a02:a03f:83ad:2101::7/128"];
|
address = ["10.0.0.7/24" "2a02:a03f:83ad:2101::7/128"];
|
||||||
|
|
@ -103,16 +111,21 @@ in {
|
||||||
autostart = true;
|
autostart = true;
|
||||||
postUp = "resolvectl dns OPNsense 10.0.0.1; resolvectl domain OPNsense ~thomasave.be;";
|
postUp = "resolvectl dns OPNsense 10.0.0.1; resolvectl domain OPNsense ~thomasave.be;";
|
||||||
dns = ["10.0.0.1"];
|
dns = ["10.0.0.1"];
|
||||||
peers = [{
|
peers = [
|
||||||
|
{
|
||||||
publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";
|
publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";
|
||||||
allowedIPs = ["10.0.0.1/8" "192.168.1.2/32"];
|
allowedIPs = ["10.0.0.1/8" "192.168.1.2/32"];
|
||||||
endpoint = "ipv4.thomasave.be:13231";
|
endpoint = "ipv4.thomasave.be:13231";
|
||||||
persistentKeepalive = 25;
|
persistentKeepalive = 25;
|
||||||
}];
|
}
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
systemd.services."wg-quick-OPNsense" = {
|
systemd.services."wg-quick-OPNsense" = {
|
||||||
serviceConfig = { Restart = "on-failure"; RestartSec = "2s"; };
|
serviceConfig = {
|
||||||
|
Restart = "on-failure";
|
||||||
|
RestartSec = "2s";
|
||||||
|
};
|
||||||
unitConfig.StartLimitIntervalSec = 0;
|
unitConfig.StartLimitIntervalSec = 0;
|
||||||
};
|
};
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,9 @@
|
||||||
{ config, lib, modulesPath, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
modulesPath,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
imports = [
|
imports = [
|
||||||
(modulesPath + "/installer/scan/not-detected.nix")
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -11,8 +11,11 @@
|
||||||
fzgo.url = "git+https://git.thomasave.be/thomasave/fzgo.git";
|
fzgo.url = "git+https://git.thomasave.be/thomasave/fzgo.git";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { nixpkgs, home-manager, ... }@inputs:
|
outputs = {
|
||||||
let
|
nixpkgs,
|
||||||
|
home-manager,
|
||||||
|
...
|
||||||
|
} @ inputs: let
|
||||||
system = "aarch64-linux";
|
system = "aarch64-linux";
|
||||||
pkgs = nixpkgs.legacyPackages.${system};
|
pkgs = nixpkgs.legacyPackages.${system};
|
||||||
in {
|
in {
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,10 @@
|
||||||
{ lib, inputs, config, pkgs, ... }:
|
{
|
||||||
let
|
lib,
|
||||||
|
inputs,
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
serverIP = "192.168.1.2";
|
serverIP = "192.168.1.2";
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
|
|
@ -15,11 +20,13 @@ in {
|
||||||
dns = ["10.0.0.1" "fdc9:281f:04d7:9ee9::1"];
|
dns = ["10.0.0.1" "fdc9:281f:04d7:9ee9::1"];
|
||||||
privateKeyFile = "/home/user/.secrets/Wireguard/Asturia.key";
|
privateKeyFile = "/home/user/.secrets/Wireguard/Asturia.key";
|
||||||
listenPort = 51820;
|
listenPort = 51820;
|
||||||
peers = [{
|
peers = [
|
||||||
|
{
|
||||||
publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";
|
publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";
|
||||||
allowedIPs = ["10.0.0.1/8"];
|
allowedIPs = ["10.0.0.1/8"];
|
||||||
endpoint = "192.168.1.1:13231";
|
endpoint = "192.168.1.1:13231";
|
||||||
}];
|
}
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,15 @@
|
||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||||
# and may be overwritten by future invocations. Please make changes
|
# and may be overwritten by future invocations. Please make changes
|
||||||
# to /etc/nixos/configuration.nix instead.
|
# to /etc/nixos/configuration.nix instead.
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
config,
|
||||||
[ (modulesPath + "/profiles/qemu-guest.nix")
|
lib,
|
||||||
|
pkgs,
|
||||||
|
modulesPath,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
imports = [
|
||||||
|
(modulesPath + "/profiles/qemu-guest.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "usbhid" "sd_mod" "sr_mod"];
|
boot.initrd.availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "usbhid" "sd_mod" "sr_mod"];
|
||||||
|
|
@ -13,13 +17,13 @@
|
||||||
boot.kernelModules = ["kvm-amd"];
|
boot.kernelModules = ["kvm-amd"];
|
||||||
boot.extraModulePackages = [];
|
boot.extraModulePackages = [];
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" = {
|
||||||
{ device = "/dev/disk/by-uuid/721d0462-9488-435e-9690-f13f11557edc";
|
device = "/dev/disk/by-uuid/721d0462-9488-435e-9690-f13f11557edc";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot" =
|
fileSystems."/boot" = {
|
||||||
{ device = "/dev/disk/by-uuid/CE52-0414";
|
device = "/dev/disk/by-uuid/CE52-0414";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
options = ["fmask=0077" "dmask=0077"];
|
options = ["fmask=0077" "dmask=0077"];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
{ pkgs, ... }:
|
{pkgs, ...}: {
|
||||||
{
|
|
||||||
environment.sessionVariables.NIXOS_OZONE_WL = "1"; # hint electron apps to use wayland:
|
environment.sessionVariables.NIXOS_OZONE_WL = "1"; # hint electron apps to use wayland:
|
||||||
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,8 @@
|
||||||
{ inputs, pkgs, ... }:
|
|
||||||
{
|
{
|
||||||
|
inputs,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
services.udev.packages = [pkgs.yubikey-personalization];
|
services.udev.packages = [pkgs.yubikey-personalization];
|
||||||
programs.appimage.enable = true;
|
programs.appimage.enable = true;
|
||||||
programs.appimage.binfmt = true;
|
programs.appimage.binfmt = true;
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,8 @@
|
||||||
{pkgs, serverIP, ...}:
|
{
|
||||||
|
pkgs,
|
||||||
let
|
serverIP,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
sharePath = "/home/server";
|
sharePath = "/home/server";
|
||||||
mountPath = "/home/server";
|
mountPath = "/home/server";
|
||||||
common_options = [
|
common_options = [
|
||||||
|
|
@ -18,20 +20,24 @@ let
|
||||||
"x-systemd.after=network-online.target"
|
"x-systemd.after=network-online.target"
|
||||||
"x-systemd.requires=network-online.target"
|
"x-systemd.requires=network-online.target"
|
||||||
];
|
];
|
||||||
bind_options = [
|
bind_options =
|
||||||
|
[
|
||||||
"bind"
|
"bind"
|
||||||
"x-systemd.after=${builtins.replaceStrings ["/"] ["-"] mountPath}.mount"
|
"x-systemd.after=${builtins.replaceStrings ["/"] ["-"] mountPath}.mount"
|
||||||
] ++ common_options;
|
]
|
||||||
|
++ common_options;
|
||||||
in {
|
in {
|
||||||
services.rpcbind.enable = true;
|
services.rpcbind.enable = true;
|
||||||
boot.supportedFilesystems = ["nfs"];
|
boot.supportedFilesystems = ["nfs"];
|
||||||
fileSystems.${mountPath} = {
|
fileSystems.${mountPath} = {
|
||||||
device = "${serverIP}:${sharePath}";
|
device = "${serverIP}:${sharePath}";
|
||||||
fsType = "nfs";
|
fsType = "nfs";
|
||||||
options = [
|
options =
|
||||||
|
[
|
||||||
"x-systemd.after=wg-quick-Tunnel.service"
|
"x-systemd.after=wg-quick-Tunnel.service"
|
||||||
"x-systemd.after=wg-quick-OPNsense.service"
|
"x-systemd.after=wg-quick-OPNsense.service"
|
||||||
] ++ common_options;
|
]
|
||||||
|
++ common_options;
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.services."${builtins.replaceStrings ["/"] ["-"] mountPath}-unmount" = {
|
systemd.services."${builtins.replaceStrings ["/"] ["-"] mountPath}-unmount" = {
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,8 @@
|
||||||
{ pkgs, config, ... }:
|
|
||||||
{
|
{
|
||||||
|
pkgs,
|
||||||
|
config,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
services.xserver.videoDrivers = ["nvidia"];
|
services.xserver.videoDrivers = ["nvidia"];
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
pciutils
|
pciutils
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
{ ... }:
|
{...}: {
|
||||||
{
|
|
||||||
boot.initrd.supportedFilesystems = ["zfs"];
|
boot.initrd.supportedFilesystems = ["zfs"];
|
||||||
boot.supportedFilesystems = ["zfs"];
|
boot.supportedFilesystems = ["zfs"];
|
||||||
services.zfs.autoScrub.enable = true;
|
services.zfs.autoScrub.enable = true;
|
||||||
|
|
|
||||||
|
|
@ -16,8 +16,11 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { nixpkgs, home-manager, ... }@inputs:
|
outputs = {
|
||||||
let
|
nixpkgs,
|
||||||
|
home-manager,
|
||||||
|
...
|
||||||
|
} @ inputs: let
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
pkgs = nixpkgs.legacyPackages.${system};
|
pkgs = nixpkgs.legacyPackages.${system};
|
||||||
in {
|
in {
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,10 @@
|
||||||
{ lib, inputs, config, pkgs, ... }:
|
{
|
||||||
let
|
lib,
|
||||||
|
inputs,
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
serverIP = "192.168.1.2";
|
serverIP = "192.168.1.2";
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
|
|
@ -54,11 +59,13 @@ in {
|
||||||
dns = ["10.0.0.1" "fdc9:281f:04d7:9ee9::1"];
|
dns = ["10.0.0.1" "fdc9:281f:04d7:9ee9::1"];
|
||||||
privateKeyFile = "/home/user/.secrets/Wireguard/Kell.key";
|
privateKeyFile = "/home/user/.secrets/Wireguard/Kell.key";
|
||||||
listenPort = 51820;
|
listenPort = 51820;
|
||||||
peers = [{
|
peers = [
|
||||||
|
{
|
||||||
publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";
|
publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";
|
||||||
allowedIPs = ["10.0.0.1/8"];
|
allowedIPs = ["10.0.0.1/8"];
|
||||||
endpoint = "192.168.1.1:13231";
|
endpoint = "192.168.1.1:13231";
|
||||||
}];
|
}
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -81,7 +88,6 @@ in {
|
||||||
# };
|
# };
|
||||||
# };
|
# };
|
||||||
|
|
||||||
|
|
||||||
# Programs & Services
|
# Programs & Services
|
||||||
programs.gnupg.agent.enable = true;
|
programs.gnupg.agent.enable = true;
|
||||||
services.sunshine = {
|
services.sunshine = {
|
||||||
|
|
@ -156,7 +162,10 @@ in {
|
||||||
hardware.sane = {
|
hardware.sane = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraBackends = [
|
extraBackends = [
|
||||||
(pkgs.epsonscan2.override { withNonFreePlugins = true; withGui = true; } )
|
(pkgs.epsonscan2.override {
|
||||||
|
withNonFreePlugins = true;
|
||||||
|
withGui = true;
|
||||||
|
})
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,13 @@
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
modulesPath,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
imports = [(modulesPath + "/installer/scan/not-detected.nix")];
|
imports = [(modulesPath + "/installer/scan/not-detected.nix")];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules =
|
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"];
|
||||||
[ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
|
|
||||||
boot.kernelModules = ["kvm-amd"];
|
boot.kernelModules = ["kvm-amd"];
|
||||||
boot.extraModulePackages = [];
|
boot.extraModulePackages = [];
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -16,8 +16,11 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { nixpkgs, home-manager, ... }@inputs:
|
outputs = {
|
||||||
let
|
nixpkgs,
|
||||||
|
home-manager,
|
||||||
|
...
|
||||||
|
} @ inputs: let
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
pkgs = nixpkgs.legacyPackages.${system};
|
pkgs = nixpkgs.legacyPackages.${system};
|
||||||
in {
|
in {
|
||||||
|
|
|
||||||
|
|
@ -11,8 +11,11 @@
|
||||||
fzgo.url = "git+https://git.thomasave.be/thomasave/fzgo.git";
|
fzgo.url = "git+https://git.thomasave.be/thomasave/fzgo.git";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { nixpkgs, home-manager, ... }@inputs:
|
outputs = {
|
||||||
let
|
nixpkgs,
|
||||||
|
home-manager,
|
||||||
|
...
|
||||||
|
} @ inputs: let
|
||||||
system = "aarch64-linux";
|
system = "aarch64-linux";
|
||||||
pkgs = nixpkgs.legacyPackages.${system};
|
pkgs = nixpkgs.legacyPackages.${system};
|
||||||
in {
|
in {
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,9 @@
|
||||||
{ inputs, config, pkgs, ... }:
|
|
||||||
{
|
{
|
||||||
|
inputs,
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
imports = [
|
imports = [
|
||||||
(import ../Common/default.nix {inherit inputs config pkgs;})
|
(import ../Common/default.nix {inherit inputs config pkgs;})
|
||||||
(import ../Common/nvidia.nix {inherit pkgs config;})
|
(import ../Common/nvidia.nix {inherit pkgs config;})
|
||||||
|
|
@ -23,11 +27,13 @@
|
||||||
address = ["10.0.0.12/24"];
|
address = ["10.0.0.12/24"];
|
||||||
privateKeyFile = "/home/user/.secrets/Wireguard/Riva.key";
|
privateKeyFile = "/home/user/.secrets/Wireguard/Riva.key";
|
||||||
listenPort = 51820;
|
listenPort = 51820;
|
||||||
peers = [{
|
peers = [
|
||||||
|
{
|
||||||
publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";
|
publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";
|
||||||
allowedIPs = ["10.0.0.1/8"];
|
allowedIPs = ["10.0.0.1/8"];
|
||||||
endpoint = "192.168.1.1:13231";
|
endpoint = "192.168.1.1:13231";
|
||||||
}];
|
}
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
fileSystems."/home/server/Workspace" = {
|
fileSystems."/home/server/Workspace" = {
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,16 @@
|
||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||||
# and may be overwritten by future invocations. Please make changes
|
# and may be overwritten by future invocations. Please make changes
|
||||||
# to /etc/nixos/configuration.nix instead.
|
# to /etc/nixos/configuration.nix instead.
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
modulesPath,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
imports = [(modulesPath + "/profiles/qemu-guest.nix")];
|
imports = [(modulesPath + "/profiles/qemu-guest.nix")];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules =
|
boot.initrd.availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk"];
|
||||||
[ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ];
|
|
||||||
boot.initrd.kernelModules = [];
|
boot.initrd.kernelModules = [];
|
||||||
boot.kernelModules = ["kvm-amd"];
|
boot.kernelModules = ["kvm-amd"];
|
||||||
boot.extraModulePackages = [];
|
boot.extraModulePackages = [];
|
||||||
|
|
|
||||||
|
|
@ -11,8 +11,11 @@
|
||||||
fzgo.url = "git+https://git.thomasave.be/thomasave/fzgo.git";
|
fzgo.url = "git+https://git.thomasave.be/thomasave/fzgo.git";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { nixpkgs, home-manager, ... }@inputs:
|
outputs = {
|
||||||
let
|
nixpkgs,
|
||||||
|
home-manager,
|
||||||
|
...
|
||||||
|
} @ inputs: let
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
pkgs = nixpkgs.legacyPackages.${system};
|
pkgs = nixpkgs.legacyPackages.${system};
|
||||||
in {
|
in {
|
||||||
|
|
|
||||||
|
|
@ -11,8 +11,11 @@
|
||||||
fzgo.url = "git+https://git.thomasave.be/thomasave/fzgo.git";
|
fzgo.url = "git+https://git.thomasave.be/thomasave/fzgo.git";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { nixpkgs, home-manager, ... }@inputs:
|
outputs = {
|
||||||
let
|
nixpkgs,
|
||||||
|
home-manager,
|
||||||
|
...
|
||||||
|
} @ inputs: let
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
pkgs = nixpkgs.legacyPackages.${system};
|
pkgs = nixpkgs.legacyPackages.${system};
|
||||||
in {
|
in {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue