nixfmt
This commit is contained in:
parent
053f90f64a
commit
796c11b823
27 changed files with 1130 additions and 796 deletions
|
|
@ -1,8 +1,13 @@
|
|||
{ config, lib, pkgs, users, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
users,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
imports =
|
||||
[
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
./router.nix
|
||||
./net_config.nix
|
||||
|
|
|
|||
|
|
@ -1,31 +1,40 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ 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 = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.availableKernelModules = [
|
||||
"xhci_pci"
|
||||
"ehci_pci"
|
||||
"ahci"
|
||||
"usbhid"
|
||||
"usb_storage"
|
||||
"sd_mod"
|
||||
];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/b56a6a08-60e7-4997-9f7b-05c58006e730";
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/b56a6a08-60e7-4997-9f7b-05c58006e730";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/3975-DEB6";
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/3975-DEB6";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-uuid/b196b10b-5480-49b9-a6fb-ed2f21850815"; }
|
||||
];
|
||||
swapDevices = [ { device = "/dev/disk/by-uuid/b196b10b-5480-49b9-a6fb-ed2f21850815"; } ];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
|
|
|
|||
|
|
@ -1,5 +1,12 @@
|
|||
distant-users-id:
|
||||
{ pkgs, lib, users, mods, ... }: {
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
users,
|
||||
mods,
|
||||
...
|
||||
}:
|
||||
{
|
||||
imports = [
|
||||
<nixos/nixos/modules/installer/netboot/netboot.nix>
|
||||
<nixos/nixos/modules/installer/cd-dvd/channel.nix>
|
||||
|
|
@ -17,9 +24,7 @@ distant-users-id:
|
|||
font = "Lat2-Terminus16";
|
||||
keyMap = "fr";
|
||||
};
|
||||
environment.systemPackages = with pkgs; [
|
||||
git
|
||||
];
|
||||
environment.systemPackages = with pkgs; [ git ];
|
||||
security.polkit.extraConfig = ''
|
||||
polkit.addRule(function(action, subject) {
|
||||
if (
|
||||
|
|
@ -73,10 +78,12 @@ distant-users-id:
|
|||
})
|
||||
'';
|
||||
|
||||
|
||||
users.groups.bocal.gid = 2000;
|
||||
users.users = let
|
||||
template = { name, uid }: {
|
||||
users.users =
|
||||
let
|
||||
template =
|
||||
{ name, uid }:
|
||||
{
|
||||
inherit name;
|
||||
value = {
|
||||
isNormalUser = true;
|
||||
|
|
@ -86,26 +93,33 @@ distant-users-id:
|
|||
homeMode = "750";
|
||||
};
|
||||
};
|
||||
in builtins.listToAttrs (map template distant-users-id) // {
|
||||
in
|
||||
builtins.listToAttrs (map template distant-users-id)
|
||||
// {
|
||||
root.hashedPassword = "$y$j9T$GK2ejPfMgk0GlBqZX0aBo/$n3nds9zcBi8X8p9aG5Aywq1A.R6Bt/dIOccvfIdMM/1";
|
||||
root.openssh.authorizedKeys.keys = [
|
||||
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCvi5VUsDrwS4XqQQfFFIx1JoRDPVdtChUQWqKFbPFtP8gH51woXiKtKRbDebL0z/EmkdYKxxIkzixHTR5xQXjo8JiFZbwldZi5IvMr3x//ad9sVyOhmbRx1DXLKjyOdWyo+w0vORvbEDu2lHktfSvhHGrvUHfFc3EY+cAl7IImgGEeGNPruAuNkN90Lth9QgwJVsdOEs9j7hwwKtpfMMETL5tkW34Nu7io03+SaPxwi2xLuWTdTklfZ7GWYtG2w/hFkzDbkW97rp5dxB1HO58cPqyRlqyfhZFpiUmWlyuMba3Tip6JarCa52IpFffEIDR0CSeh5CFPoeppo/TPDiXDie370TjjQpxJiG+9PobBhmChH5FmQ/lksffI/WimqpVO7Ixf5cYiHN5Z0mgJgZsXwI3YPICQLA8ebSKHA8+mdmkunDmCBRaBj1qEgkp/UoYqXT6BjBm07nOsnL+3SG/yfx4fLotgWtdm2mkjEAG+OGVR7G3Vk/POxn0EqX7Z+gU= sylvain@idefix"
|
||||
];
|
||||
};
|
||||
home-manager.users = let
|
||||
template = { name, uid }: {
|
||||
home-manager.users =
|
||||
let
|
||||
template =
|
||||
{ name, uid }:
|
||||
{
|
||||
inherit name;
|
||||
value = {
|
||||
home.stateVersion = "23.11";
|
||||
imports = with mods.home; [ zsh neovim ];
|
||||
imports = with mods.home; [
|
||||
zsh
|
||||
neovim
|
||||
];
|
||||
programs.zsh.profileExtra = "exec ${pkgs.plasma5Packages.plasma-workspace}/bin/startplasma-wayland";
|
||||
programs.firefox.enable = true;
|
||||
home.packages = with pkgs; [
|
||||
gedit
|
||||
];
|
||||
home.packages = with pkgs; [ gedit ];
|
||||
};
|
||||
};
|
||||
in builtins.listToAttrs (map template distant-users-id);
|
||||
in
|
||||
builtins.listToAttrs (map template distant-users-id);
|
||||
|
||||
services.getty = {
|
||||
loginProgram = pkgs.writeShellScript "autologin" ''
|
||||
|
|
@ -132,18 +146,23 @@ distant-users-id:
|
|||
desktopManager.plasma5.enable = true;
|
||||
displayManager.lightdm.enable = false;
|
||||
};
|
||||
fileSystems = let
|
||||
template = { name, uid }: {
|
||||
fileSystems =
|
||||
let
|
||||
template =
|
||||
{ name, uid }:
|
||||
{
|
||||
name = "/home/${name}";
|
||||
value = {
|
||||
device = "192.168.222.1:/home/${name}";
|
||||
fsType = "nfs";
|
||||
};
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
"/home/bocal" = {
|
||||
device = "192.168.222.1:/home/bocal";
|
||||
fsType = "nfs";
|
||||
};
|
||||
} // builtins.listToAttrs (map template distant-users-id);
|
||||
}
|
||||
// builtins.listToAttrs (map template distant-users-id);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,10 @@
|
|||
{ lib, users, mods, pkgs, ... }:
|
||||
{
|
||||
lib,
|
||||
users,
|
||||
mods,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
machines = {
|
||||
"54:bf:64:5d:33:5e" = "arturgo";
|
||||
|
|
@ -13,14 +19,23 @@ let
|
|||
"54:bf:64:5d:31:fd" = "loony";
|
||||
};
|
||||
distant-users = builtins.attrValues machines;
|
||||
distant-users-id = builtins.genList (i: { name = builtins.elemAt distant-users i; uid = 2001 + i; }) (builtins.length distant-users);
|
||||
remote_sys = (import (pkgs.path + "/nixos/lib/eval-config.nix") {
|
||||
distant-users-id = builtins.genList (i: {
|
||||
name = builtins.elemAt distant-users i;
|
||||
uid = 2001 + i;
|
||||
}) (builtins.length distant-users);
|
||||
remote_sys = (
|
||||
import (pkgs.path + "/nixos/lib/eval-config.nix") {
|
||||
system = "x86_64-linux";
|
||||
specialArgs = { inherit users mods; };
|
||||
specialArgs = {
|
||||
inherit users mods;
|
||||
};
|
||||
modules = [ (import ./net-user/configuration.nix distant-users-id) ];
|
||||
});
|
||||
}
|
||||
);
|
||||
remote_build = remote_sys.config.system.build;
|
||||
json_maker = mac: user: pkgs.writeText "netboot-${mac}.json" ''
|
||||
json_maker =
|
||||
mac: user:
|
||||
pkgs.writeText "netboot-${mac}.json" ''
|
||||
{
|
||||
"kernel": "/kernel",
|
||||
"initrd": [ "/initrd" ],
|
||||
|
|
@ -34,10 +49,14 @@ let
|
|||
"ln -s ${remote_build.netbootRamdisk}/initrd $out/initrd"
|
||||
] ++ builtins.attrValues (builtins.mapAttrs json_ln (builtins.mapAttrs json_maker machines));
|
||||
webroot = pkgs.runCommand "netboot-apiroot" { } (builtins.concatStringsSep "\n" cmds);
|
||||
in {
|
||||
in
|
||||
{
|
||||
users.groups.bocal.gid = 2000;
|
||||
users.users = let
|
||||
template = { name, uid }: {
|
||||
users.users =
|
||||
let
|
||||
template =
|
||||
{ name, uid }:
|
||||
{
|
||||
inherit name;
|
||||
value = {
|
||||
isNormalUser = true;
|
||||
|
|
@ -47,7 +66,9 @@ in {
|
|||
homeMode = "750";
|
||||
};
|
||||
};
|
||||
in builtins.listToAttrs (map template distant-users-id) // {
|
||||
in
|
||||
builtins.listToAttrs (map template distant-users-id)
|
||||
// {
|
||||
bocal = {
|
||||
isNormalUser = true;
|
||||
uid = 2000;
|
||||
|
|
@ -63,7 +84,10 @@ in {
|
|||
};
|
||||
home-manager.users.bocal = {
|
||||
home.stateVersion = "23.11";
|
||||
imports = with mods.home; [ zsh neovim ];
|
||||
imports = with mods.home; [
|
||||
zsh
|
||||
neovim
|
||||
];
|
||||
programs.zsh.shellAliases = {
|
||||
"redac" = "/home/bocal/bin/redac";
|
||||
"faire" = "redac faire";
|
||||
|
|
@ -80,11 +104,16 @@ in {
|
|||
};
|
||||
services.nfs.server = {
|
||||
enable = true;
|
||||
exports = let
|
||||
template = { name, uid }: "/home/${name} 192.168.222.0/24(rw,nohide,insecure,no_subtree_check,anonuid=${builtins.toString uid},anongid=2000)";
|
||||
in builtins.concatStringsSep "\n" ([
|
||||
"/home/bocal 192.168.222.0/24(rw,nohide,insecure,no_subtree_check)"
|
||||
] ++ map template distant-users-id);
|
||||
exports =
|
||||
let
|
||||
template =
|
||||
{ name, uid }:
|
||||
"/home/${name} 192.168.222.0/24(rw,nohide,insecure,no_subtree_check,anonuid=${builtins.toString uid},anongid=2000)";
|
||||
in
|
||||
builtins.concatStringsSep "\n" (
|
||||
[ "/home/bocal 192.168.222.0/24(rw,nohide,insecure,no_subtree_check)" ]
|
||||
++ map template distant-users-id
|
||||
);
|
||||
};
|
||||
services.dnsmasq = {
|
||||
enable = true;
|
||||
|
|
@ -98,7 +127,12 @@ in {
|
|||
services.nginx = {
|
||||
enable = true;
|
||||
virtualHosts."localhost" = {
|
||||
listen = [{ addr = "localhost"; port = 8000; }];
|
||||
listen = [
|
||||
{
|
||||
addr = "localhost";
|
||||
port = 8000;
|
||||
}
|
||||
];
|
||||
root = webroot;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,10 @@
|
|||
{ config, lib, pkgs, ... }: {
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
boot.kernel.sysctl."net.ipv4.ip_forward" = true;
|
||||
|
||||
systemd.network = {
|
||||
|
|
@ -46,8 +52,7 @@
|
|||
Kind = "bridge";
|
||||
};
|
||||
};
|
||||
networking.nameservers =
|
||||
[ "208.67.222.222" ];
|
||||
networking.nameservers = [ "208.67.222.222" ];
|
||||
|
||||
networking.nat = {
|
||||
enable = true;
|
||||
|
|
|
|||
46
hive.nix
46
hive.nix
|
|
@ -1,18 +1,28 @@
|
|||
let
|
||||
mods = import ./modules;
|
||||
users = import ./users;
|
||||
in {
|
||||
in
|
||||
{
|
||||
meta.nixpkgs = <nixpkgs>;
|
||||
meta.specialArgs = {
|
||||
inherit mods users;
|
||||
};
|
||||
defaults = { name, pkgs, ... }: {
|
||||
defaults =
|
||||
{ name, pkgs, ... }:
|
||||
{
|
||||
imports = [ <home-manager/nixos> ];
|
||||
boot.tmp.useTmpfs = true;
|
||||
networking.hostName = name;
|
||||
};
|
||||
|
||||
kat-probook = { name, nodes, users, ... }: {
|
||||
kat-probook =
|
||||
{
|
||||
name,
|
||||
nodes,
|
||||
users,
|
||||
...
|
||||
}:
|
||||
{
|
||||
deployment.allowLocalDeployment = true;
|
||||
|
||||
imports = [
|
||||
|
|
@ -20,10 +30,15 @@ in {
|
|||
(users.root { ssh = false; })
|
||||
users.catvayor
|
||||
];
|
||||
nix.settings.trusted-users = [ "root" "@wheel" ];
|
||||
nix.settings.trusted-users = [
|
||||
"root"
|
||||
"@wheel"
|
||||
];
|
||||
};
|
||||
|
||||
kat-r86s = { name, nodes, ... }: {
|
||||
kat-r86s =
|
||||
{ name, nodes, ... }:
|
||||
{
|
||||
deployment.targetHost = "r86s.kat";
|
||||
imports = [
|
||||
./machines/kat-r86s/configuration.nix
|
||||
|
|
@ -31,7 +46,9 @@ in {
|
|||
];
|
||||
};
|
||||
|
||||
kat-test = { name, nodes, ... }: {
|
||||
kat-test =
|
||||
{ name, nodes, ... }:
|
||||
{
|
||||
deployment = {
|
||||
allowLocalDeployment = true;
|
||||
targetHost = "test.kat";
|
||||
|
|
@ -47,7 +64,9 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
kat-virt = { name, nodes, ... }: {
|
||||
kat-virt =
|
||||
{ name, nodes, ... }:
|
||||
{
|
||||
deployment.targetHost = "virt.kat";
|
||||
|
||||
imports = [
|
||||
|
|
@ -59,7 +78,9 @@ in {
|
|||
];
|
||||
};
|
||||
|
||||
kat-runner = { name, nodes, ... }: {
|
||||
kat-runner =
|
||||
{ name, nodes, ... }:
|
||||
{
|
||||
deployment.targetHost = "runner.kat";
|
||||
|
||||
imports = [
|
||||
|
|
@ -77,7 +98,9 @@ in {
|
|||
];
|
||||
};
|
||||
|
||||
kat-iso = { name, pkgs, ... }:{
|
||||
kat-iso =
|
||||
{ name, pkgs, ... }:
|
||||
{
|
||||
deployment = {
|
||||
allowLocalDeployment = false;
|
||||
targetHost = null;
|
||||
|
|
@ -94,7 +117,10 @@ in {
|
|||
};
|
||||
console.keyMap = "fr";
|
||||
|
||||
environment.systemPackages = with pkgs; [ perl git ];
|
||||
environment.systemPackages = with pkgs; [
|
||||
perl
|
||||
git
|
||||
];
|
||||
boot.supportedFilesystems = [ "bcachefs" ];
|
||||
programs.zsh.enable = true;
|
||||
services.openssh.enable = true;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,13 @@
|
|||
{ config, lib, pkgs, mods, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
mods,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
imports =
|
||||
[
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
<agenix/modules/age.nix>
|
||||
./secrets.nix
|
||||
|
|
@ -70,7 +75,10 @@
|
|||
folders."essentials" = {
|
||||
path = "~/essentials";
|
||||
id = "vgpwu-fk3ct";
|
||||
devices = [ "katest" "katel" ];
|
||||
devices = [
|
||||
"katest"
|
||||
"katel"
|
||||
];
|
||||
};
|
||||
devices.katest.id = "UPVXT7D-ZQF4E3J-4WKLLRV-2KF7323-7VOMEJJ-4PZVXW4-UQ2YABE-G7ID4AD";
|
||||
devices.katel.id = "DYOKK7J-HZAF5S7-FYTHQF5-UD5GJZ2-4JMV5I5-STUM3HG-5YM2JPR-LATJNAZ";
|
||||
|
|
|
|||
|
|
@ -1,20 +1,31 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ 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 = [ "xhci_pci" "vmd" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
|
||||
boot.initrd.availableKernelModules = [
|
||||
"xhci_pci"
|
||||
"vmd"
|
||||
"nvme"
|
||||
"usb_storage"
|
||||
"sd_mod"
|
||||
"rtsx_pci_sdmmc"
|
||||
];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/4c1f76c6-5ce6-4987-b15e-9419627b7f19";
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/4c1f76c6-5ce6-4987-b15e-9419627b7f19";
|
||||
fsType = "bcachefs";
|
||||
};
|
||||
|
||||
|
|
@ -24,14 +35,12 @@
|
|||
allowDiscards = true;
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/4F30-BEC7";
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/4F30-BEC7";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-uuid/5edcb909-6109-4198-84c7-703cbd471b44"; }
|
||||
];
|
||||
swapDevices = [ { device = "/dev/disk/by-uuid/5edcb909-6109-4198-84c7-703cbd471b44"; } ];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
|
|
|
|||
|
|
@ -1,4 +1,10 @@
|
|||
{ config, lib, pkgs, ... }: {
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
boot.kernel.sysctl."net.ipv4.ip_forward" = true;
|
||||
|
||||
systemd.network = {
|
||||
|
|
|
|||
|
|
@ -6,15 +6,25 @@ let
|
|||
};
|
||||
in
|
||||
{
|
||||
age.identityPaths = [
|
||||
"/root/.ssh/passwd"
|
||||
];
|
||||
age.identityPaths = [ "/root/.ssh/passwd" ];
|
||||
age.secrets = {
|
||||
mails-laposte = cat-owned // { file = ./secrets/mails-laposte.age; };
|
||||
mails-dgnum = cat-owned // { file = ./secrets/mails-dgnum.age; };
|
||||
mails-kat = cat-owned // { file = ./secrets/mails-kat.age; };
|
||||
clipper = cat-owned // { file = ./secrets/clipper.age; };
|
||||
"geek.gle" = cat-owned // { file = ./secrets/geek.gle.age; };
|
||||
"pro.gle" = cat-owned // { file = ./secrets/pro.gle.age; };
|
||||
mails-laposte = cat-owned // {
|
||||
file = ./secrets/mails-laposte.age;
|
||||
};
|
||||
mails-dgnum = cat-owned // {
|
||||
file = ./secrets/mails-dgnum.age;
|
||||
};
|
||||
mails-kat = cat-owned // {
|
||||
file = ./secrets/mails-kat.age;
|
||||
};
|
||||
clipper = cat-owned // {
|
||||
file = ./secrets/clipper.age;
|
||||
};
|
||||
"geek.gle" = cat-owned // {
|
||||
file = ./secrets/geek.gle.age;
|
||||
};
|
||||
"pro.gle" = cat-owned // {
|
||||
file = ./secrets/pro.gle.age;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
let
|
||||
pub-key = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBtlIx8XVse0m+Aqf4DuxzYdeF6gh/nObNzfrHJOn3Ik" ];
|
||||
in {
|
||||
in
|
||||
{
|
||||
"mails-laposte.age".publicKeys = pub-key;
|
||||
"mails-dgnum.age".publicKeys = pub-key;
|
||||
"mails-kat.age".publicKeys = pub-key;
|
||||
|
|
|
|||
|
|
@ -1,10 +1,14 @@
|
|||
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
|
||||
|
||||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
imports =
|
||||
[
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
./router.nix
|
||||
];
|
||||
|
|
@ -52,8 +56,7 @@
|
|||
users.users.guest = {
|
||||
isNormalUser = true;
|
||||
# extraGroups = [ "wheel" ];
|
||||
packages = with pkgs; [
|
||||
];
|
||||
packages = with pkgs; [ ];
|
||||
openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAA16foz+XzwKwyIR4wFgNIAE3Y7AfXyEsUZFVVz8Rie catvayor@katvayor"
|
||||
|
||||
|
|
@ -97,7 +100,10 @@
|
|||
services.openssh.enable = true;
|
||||
services.netbird.enable = true;
|
||||
|
||||
boot.kernelModules = [ "kvm-intel" "kvm-amd" ];
|
||||
boot.kernelModules = [
|
||||
"kvm-intel"
|
||||
"kvm-amd"
|
||||
];
|
||||
programs.virt-manager.enable = true;
|
||||
virtualisation.libvirtd.enable = true;
|
||||
|
||||
|
|
@ -118,7 +124,13 @@
|
|||
};
|
||||
|
||||
# Open ports in the firewall.
|
||||
networking.firewall.allowedTCPPorts = [ 22 53 80 443 22000 ];
|
||||
networking.firewall.allowedTCPPorts = [
|
||||
22
|
||||
53
|
||||
80
|
||||
443
|
||||
22000
|
||||
];
|
||||
networking.firewall.allowedUDPPorts = [ 67 ];
|
||||
# Or disable the firewall altogether.
|
||||
# networking.firewall.enable = false;
|
||||
|
|
@ -145,6 +157,4 @@
|
|||
#
|
||||
# For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
|
||||
system.stateVersion = "23.11"; # Did you read the comment?
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,25 +1,35 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ 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 = [ "xhci_pci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ];
|
||||
boot.initrd.availableKernelModules = [
|
||||
"xhci_pci"
|
||||
"usbhid"
|
||||
"usb_storage"
|
||||
"sd_mod"
|
||||
"sdhci_pci"
|
||||
];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "UUID=2d6f7d3a-936d-457c-86c7-f49d816ff5b7";
|
||||
fileSystems."/" = {
|
||||
device = "UUID=2d6f7d3a-936d-457c-86c7-f49d816ff5b7";
|
||||
fsType = "bcachefs";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/DD9A-3823";
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/DD9A-3823";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,10 @@
|
|||
{config, lib, pkgs, ...}: {
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
boot.kernel.sysctl."net.ipv4.ip_forward" = true;
|
||||
|
||||
# networking.nat = {
|
||||
|
|
@ -8,7 +14,12 @@
|
|||
# };
|
||||
networking.interfaces.enp2s0 = {
|
||||
useDHCP = false;
|
||||
ipv4.addresses = [{ address = "192.168.42.1"; prefixLength = 24; }];
|
||||
ipv4.addresses = [
|
||||
{
|
||||
address = "192.168.42.1";
|
||||
prefixLength = 24;
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
# networking.interfaces.enp3s0 = {
|
||||
|
|
@ -33,7 +44,10 @@
|
|||
"10-enp3s0" = {
|
||||
name = "enp3s0";
|
||||
networkConfig = {
|
||||
VLAN = [ "vlan-admin" "vlan-user-test" ];
|
||||
VLAN = [
|
||||
"vlan-admin"
|
||||
"vlan-user-test"
|
||||
];
|
||||
|
||||
LinkLocalAddressing = false;
|
||||
LLDP = false;
|
||||
|
|
|
|||
|
|
@ -1,10 +1,12 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
imports =
|
||||
[
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
imports = [ ./hardware-configuration.nix ];
|
||||
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
|
@ -15,7 +17,10 @@
|
|||
enable = true;
|
||||
networks."10-enp1s0" = {
|
||||
name = "enp1s0";
|
||||
address = [ "192.168.122.3/24" "fe80::3/64" ];
|
||||
address = [
|
||||
"192.168.122.3/24"
|
||||
"fe80::3/64"
|
||||
];
|
||||
routes = [
|
||||
{ routeConfig.Gateway = "192.168.122.1"; }
|
||||
{ routeConfig.Gateway = "fe80::1"; }
|
||||
|
|
@ -56,7 +61,11 @@
|
|||
services.parkas = {
|
||||
executor = "shell";
|
||||
registrationConfigFile = "/root/parkas-runner-secrets.toml";
|
||||
tagList = [ "test" "linux" "nix" ];
|
||||
tagList = [
|
||||
"test"
|
||||
"linux"
|
||||
"nix"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -71,4 +80,3 @@
|
|||
|
||||
system.stateVersion = "23.11";
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,27 +1,40 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# 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 = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ];
|
||||
boot.initrd.availableKernelModules = [
|
||||
"ahci"
|
||||
"xhci_pci"
|
||||
"virtio_pci"
|
||||
"sr_mod"
|
||||
"virtio_blk"
|
||||
];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/33eef82e-c54b-49a8-8f48-4dc28aab0fab";
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/33eef82e-c54b-49a8-8f48-4dc28aab0fab";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/6760-3980";
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/6760-3980";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0022" "dmask=0022" ];
|
||||
options = [
|
||||
"fmask=0022"
|
||||
"dmask=0022"
|
||||
];
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
|
|
|
|||
|
|
@ -1,12 +1,15 @@
|
|||
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
|
||||
|
||||
{ config, lib, pkgs, mods, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
mods,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
imports =
|
||||
[
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
imports = [ ./hardware-configuration.nix ];
|
||||
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
|
@ -128,6 +131,4 @@
|
|||
#
|
||||
# For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
|
||||
system.stateVersion = "23.11"; # Did you read the comment?
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,33 +1,41 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ 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 = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.availableKernelModules = [
|
||||
"xhci_pci"
|
||||
"ahci"
|
||||
"nvme"
|
||||
"usb_storage"
|
||||
"sd_mod"
|
||||
];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "UUID=3d3c874f-7182-4eb1-91a6-ededc6f05fcc";
|
||||
fileSystems."/" = {
|
||||
device = "UUID=3d3c874f-7182-4eb1-91a6-ededc6f05fcc";
|
||||
fsType = "bcachefs";
|
||||
};
|
||||
|
||||
boot.initrd.luks.devices."disk".device = "/dev/disk/by-uuid/b1e18836-c657-49b2-81f9-8f0b2e4a4283";
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/B405-7B40";
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/B405-7B40";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-uuid/060c35d7-86b0-4901-b882-02443efbfe07"; }
|
||||
];
|
||||
swapDevices = [ { device = "/dev/disk/by-uuid/060c35d7-86b0-4901-b882-02443efbfe07"; } ];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
|
|
|
|||
|
|
@ -1,12 +1,14 @@
|
|||
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
|
||||
|
||||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
imports =
|
||||
[
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
imports = [ ./hardware-configuration.nix ];
|
||||
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
|
@ -19,14 +21,23 @@
|
|||
interfaces."enp1s0" = {
|
||||
useDHCP = false;
|
||||
ipv4.addresses = [
|
||||
{ address = "192.168.122.2"; prefixLength = 24; }
|
||||
{
|
||||
address = "192.168.122.2";
|
||||
prefixLength = 24;
|
||||
}
|
||||
];
|
||||
ipv6.addresses = [
|
||||
{ address = "fe80::2"; prefixLength = 64; }
|
||||
{
|
||||
address = "fe80::2";
|
||||
prefixLength = 64;
|
||||
}
|
||||
];
|
||||
};
|
||||
defaultGateway = "192.168.122.1";
|
||||
defaultGateway6 = { address = "fe80::1"; interface = "enp1s0"; };
|
||||
defaultGateway6 = {
|
||||
address = "fe80::1";
|
||||
interface = "enp1s0";
|
||||
};
|
||||
nameservers = [
|
||||
"192.168.122.1"
|
||||
"fe80::1%enp1s0"
|
||||
|
|
@ -124,6 +135,4 @@
|
|||
#
|
||||
# For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
|
||||
system.stateVersion = "23.11"; # Did you read the comment?
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,25 +1,35 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# 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 = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ];
|
||||
boot.initrd.availableKernelModules = [
|
||||
"ahci"
|
||||
"xhci_pci"
|
||||
"virtio_pci"
|
||||
"sr_mod"
|
||||
"virtio_blk"
|
||||
];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "UUID=301a23cf-1aa3-4c53-a174-1a97592da5fa";
|
||||
fileSystems."/" = {
|
||||
device = "UUID=301a23cf-1aa3-4c53-a174-1a97592da5fa";
|
||||
fsType = "bcachefs";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/F594-E8DB";
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/F594-E8DB";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
let
|
||||
sway = import ./desktop/sway.nix;
|
||||
in {
|
||||
in
|
||||
{
|
||||
home = {
|
||||
sway = sway.home;
|
||||
neovim = ./neovim;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,12 @@
|
|||
{
|
||||
global = { config, pkgs, lib, mods, ... }:
|
||||
global =
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
mods,
|
||||
...
|
||||
}:
|
||||
{
|
||||
programs.wshowkeys.enable = true;
|
||||
programs.sway.enable = true;
|
||||
|
|
@ -12,7 +19,14 @@
|
|||
];
|
||||
};
|
||||
};
|
||||
home = { config, pkgs, lib, mods, ... }:
|
||||
home =
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
mods,
|
||||
...
|
||||
}:
|
||||
{
|
||||
xdg.configFile."sway/config".onChange = lib.mkForce "";
|
||||
|
||||
|
|
@ -28,13 +42,18 @@
|
|||
};
|
||||
|
||||
programs.waybar.enable = true;
|
||||
home.file.".config/waybar" = { source = ./waybar; recursive = true; };
|
||||
home.file.".config/waybar" = {
|
||||
source = ./waybar;
|
||||
recursive = true;
|
||||
};
|
||||
|
||||
services.swayidle =
|
||||
let lockwall = pkgs.runCommand "lock_wall.jpg" {} ''
|
||||
let
|
||||
lockwall = pkgs.runCommand "lock_wall.jpg" { } ''
|
||||
${pkgs.ffmpeg}/bin/ffmpeg -i ${./wall.jpg} -filter_complex 'gblur=sigma=3' $out -y
|
||||
'';
|
||||
in {
|
||||
in
|
||||
{
|
||||
enable = true;
|
||||
timeouts = [
|
||||
{
|
||||
|
|
@ -44,8 +63,14 @@
|
|||
}
|
||||
];
|
||||
events = [
|
||||
{ event = "before-sleep"; command = "${pkgs.systemd}/bin/loginctl lock-session"; }
|
||||
{ event = "lock"; command = "${pkgs.swaylock}/bin/swaylock -f -i ${lockwall}"; }
|
||||
{
|
||||
event = "before-sleep";
|
||||
command = "${pkgs.systemd}/bin/loginctl lock-session";
|
||||
}
|
||||
{
|
||||
event = "lock";
|
||||
command = "${pkgs.swaylock}/bin/swaylock -f -i ${lockwall}";
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
|
|
@ -58,7 +83,8 @@
|
|||
};
|
||||
extraConfig = ''workspace 1'';
|
||||
config =
|
||||
let menuCmd = "${pkgs.wofi}/bin/wofi --show drun -i | xargs swaymsg exec --";
|
||||
let
|
||||
menuCmd = "${pkgs.wofi}/bin/wofi --show drun -i | xargs swaymsg exec --";
|
||||
exitMd = ''Exit Mode:| (l)Log out | (r)Reboot | (p)Poweroff'';
|
||||
weechatCmd = pkgs.writeShellScript "weechat.sh" ''
|
||||
nix-shell -p python3 python311Packages.dbus-python python311Packages.notify2 --run 'python ${./weenotify.py} -s' > /dev/null &
|
||||
|
|
@ -67,7 +93,8 @@
|
|||
sleep 1
|
||||
done
|
||||
'';
|
||||
in rec {
|
||||
in
|
||||
rec {
|
||||
window.border = 1;
|
||||
gaps.smartBorders = "on";
|
||||
modifier = "Mod4";
|
||||
|
|
@ -81,7 +108,9 @@
|
|||
{ command = "mattermost-desktop"; }
|
||||
{ command = "signal-desktop --"; }
|
||||
{ command = ''sh -c "sleep 2 && exec keepassxc"''; }
|
||||
{ command = "alacritty --class weechat --title weechat --command ${pkgs.bash}/bin/bash -c ${weechatCmd}"; }
|
||||
{
|
||||
command = "alacritty --class weechat --title weechat --command ${pkgs.bash}/bin/bash -c ${weechatCmd}";
|
||||
}
|
||||
];
|
||||
assigns = {
|
||||
"1" = [ { app_id = "firefox"; } ];
|
||||
|
|
@ -93,16 +122,19 @@
|
|||
{ app_id = "weechat"; }
|
||||
];
|
||||
};
|
||||
bars = [{
|
||||
bars = [
|
||||
{
|
||||
command = "waybar";
|
||||
mode = "hide";
|
||||
}];
|
||||
}
|
||||
];
|
||||
output."*".bg = "${./wall.jpg} fill";
|
||||
seat."*"."hide_cursor" = "5000";
|
||||
focus.wrapping = "yes";
|
||||
window.titlebar = false;
|
||||
colors =
|
||||
let black = "#000000";
|
||||
let
|
||||
black = "#000000";
|
||||
dark = "#111111";
|
||||
adark = "#111111BB";
|
||||
aadark = "#11111177";
|
||||
|
|
@ -111,11 +143,36 @@
|
|||
white = "#FFFFFF";
|
||||
color = "#FFBB00";
|
||||
urgent = "#FF0000";
|
||||
in {
|
||||
focused = {border = adark; background = adark; text = white; indicator = color; childBorder = color; };
|
||||
unfocused = {border = aadark; background = aadark; text = gray; indicator = dark; childBorder = dark; };
|
||||
focusedInactive = {border = adark; background = adark; text = gray; indicator = dark; childBorder = dark; };
|
||||
urgent = {border = urgent; background = urgent; text = white; indicator = urgent; childBorder = urgent; };
|
||||
in
|
||||
{
|
||||
focused = {
|
||||
border = adark;
|
||||
background = adark;
|
||||
text = white;
|
||||
indicator = color;
|
||||
childBorder = color;
|
||||
};
|
||||
unfocused = {
|
||||
border = aadark;
|
||||
background = aadark;
|
||||
text = gray;
|
||||
indicator = dark;
|
||||
childBorder = dark;
|
||||
};
|
||||
focusedInactive = {
|
||||
border = adark;
|
||||
background = adark;
|
||||
text = gray;
|
||||
indicator = dark;
|
||||
childBorder = dark;
|
||||
};
|
||||
urgent = {
|
||||
border = urgent;
|
||||
background = urgent;
|
||||
text = white;
|
||||
indicator = urgent;
|
||||
childBorder = urgent;
|
||||
};
|
||||
};
|
||||
modes = {
|
||||
"display" = {
|
||||
|
|
|
|||
|
|
@ -1,12 +1,16 @@
|
|||
{ pkgs, config, ... }: {
|
||||
{ pkgs, config, ... }:
|
||||
{
|
||||
programs.aerc = {
|
||||
extraConfig.general.unsafe-accounts-conf = true;
|
||||
enable = true;
|
||||
};
|
||||
accounts.email.accounts =
|
||||
let
|
||||
aerc = { enable = true; };
|
||||
in {
|
||||
aerc = {
|
||||
enable = true;
|
||||
};
|
||||
in
|
||||
{
|
||||
"ens" = {
|
||||
primary = true;
|
||||
inherit aerc;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,9 @@
|
|||
{ pkgs, config, lib, ... }:
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{
|
||||
programs.neovim = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,12 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
{
|
||||
programs.zsh = {
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{
|
||||
programs = {
|
||||
zsh = {
|
||||
enable = true;
|
||||
oh-my-zsh = {
|
||||
enable = true;
|
||||
|
|
@ -40,9 +46,10 @@
|
|||
];
|
||||
};
|
||||
|
||||
programs.starship = {
|
||||
starship = {
|
||||
enable = true;
|
||||
enableZshIntegration = true;
|
||||
settings.battery.disabled = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,10 @@
|
|||
{ config, pkgs, lib, mods, ... }:
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
mods,
|
||||
...
|
||||
}:
|
||||
{
|
||||
imports = with mods.global; [ sway ];
|
||||
|
||||
|
|
@ -6,9 +12,17 @@
|
|||
users.users.catvayor = {
|
||||
shell = pkgs.zsh;
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" "usb" "networkmanager" "video" "audio" "libvirtd" ];
|
||||
extraGroups = [
|
||||
"wheel"
|
||||
"usb"
|
||||
"networkmanager"
|
||||
"video"
|
||||
"audio"
|
||||
"libvirtd"
|
||||
];
|
||||
packages = with pkgs; [
|
||||
tree
|
||||
nixfmt-rfc-style
|
||||
];
|
||||
};
|
||||
|
||||
|
|
@ -24,7 +38,13 @@
|
|||
home-manager.users.catvayor = {
|
||||
home.stateVersion = "23.11";
|
||||
|
||||
imports = with mods.home; [ neovim zsh sway ssh mail ];
|
||||
imports = with mods.home; [
|
||||
neovim
|
||||
zsh
|
||||
sway
|
||||
ssh
|
||||
mail
|
||||
];
|
||||
|
||||
home.packages = with pkgs; [
|
||||
wl-clipboard
|
||||
|
|
@ -39,7 +59,10 @@
|
|||
keepassxc
|
||||
];
|
||||
|
||||
programs.alacritty = { enable = true; settings = lib.importTOML ./cat-alacritty.toml; };
|
||||
programs.alacritty = {
|
||||
enable = true;
|
||||
settings = lib.importTOML ./cat-alacritty.toml;
|
||||
};
|
||||
programs.thunderbird.enable = true;
|
||||
programs.thunderbird.profiles = { };
|
||||
services.mako = {
|
||||
|
|
@ -55,11 +78,23 @@
|
|||
|
||||
gtk = {
|
||||
enable = true;
|
||||
theme = { package = pkgs.arc-theme; name = "Arc-Dark"; };
|
||||
iconTheme = { package = pkgs.arc-icon-theme; name = "Arc"; };
|
||||
cursorTheme = { package = pkgs.breeze-hacked-cursor-theme; name = "Breeze_Hacked"; };
|
||||
theme = {
|
||||
package = pkgs.arc-theme;
|
||||
name = "Arc-Dark";
|
||||
};
|
||||
iconTheme = {
|
||||
package = pkgs.arc-icon-theme;
|
||||
name = "Arc";
|
||||
};
|
||||
cursorTheme = {
|
||||
package = pkgs.breeze-hacked-cursor-theme;
|
||||
name = "Breeze_Hacked";
|
||||
};
|
||||
};
|
||||
home.pointerCursor = {
|
||||
package = pkgs.breeze-hacked-cursor-theme;
|
||||
name = "Breeze_Hacked";
|
||||
};
|
||||
home.pointerCursor = { package = pkgs.breeze-hacked-cursor-theme; name = "Breeze_Hacked"; };
|
||||
xdg.enable = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,18 +1,28 @@
|
|||
{ ssh }:
|
||||
{ config, lib, pkgs, mods, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
mods,
|
||||
...
|
||||
}:
|
||||
{
|
||||
programs.zsh.enable = true;
|
||||
users.users.root = {
|
||||
users.users.root =
|
||||
{
|
||||
shell = pkgs.zsh;
|
||||
} // lib.attrsets.optionalAttrs ssh {
|
||||
}
|
||||
// lib.attrsets.optionalAttrs ssh {
|
||||
openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAA16foz+XzwKwyIR4wFgNIAE3Y7AfXyEsUZFVVz8Rie catvayor@katvayor"
|
||||
];
|
||||
};
|
||||
home-manager.users.root = {
|
||||
home.stateVersion = "23.11";
|
||||
imports = with mods.home; [ neovim zsh ];
|
||||
imports = with mods.home; [
|
||||
neovim
|
||||
zsh
|
||||
];
|
||||
};
|
||||
} // lib.attrsets.optionalAttrs ssh {
|
||||
services.openssh.enable = true;
|
||||
}
|
||||
// lib.attrsets.optionalAttrs ssh { services.openssh.enable = true; }
|
||||
|
|
|
|||
Loading…
Reference in a new issue