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

update

Browse source
This commit is contained in:
Tasia Iso 2024-08-06 18:44:43 +02:00
parent 043206d30a
commit fa41b2eb5e
Signed by: tasiaiso
SSH key fingerprint: SHA256:KiRjUay5C9i6objsEOIycygBHn54pDBB3Lj7fyJ0Elw
12 changed files with 129 additions and 163 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/components/packages-base.nix
View file

@ -20,5 +20,6 @@
ffmpeg ffmpeg
usbutils usbutils
bat bat
dust
]; ];
} }

8
crypto/ssh-keys.nix
View file

@ -9,9 +9,9 @@ rec {
}; };
host = { host = {
enry = "enry ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHCPPE7U87PZ4+BQrdJtPuD/ibf9ubyPAqcRJe6Lpc2D"; # host or user ? enry = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHCPPE7U87PZ4+BQrdJtPuD/ibf9ubyPAqcRJe6Lpc2D"; # host or user ?
phoenix = "phoenix ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN4Guf38dhoseOjx30w/Tk4Snp2ltJuk/gvpoyRWKUtt"; phoenix = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN4Guf38dhoseOjx30w/Tk4Snp2ltJuk/gvpoyRWKUtt";
stuff = "stuff ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFwMDyMq2eQ5IckD4sUIMN5+O73hkyajz61I3XYbp5vt"; stuff = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFwMDyMq2eQ5IckD4sUIMN5+O73hkyajz61I3XYbp5vt";
yaseen = "yaseen ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFXu/iFf6yhi6A0f6Lvp+wyltMHq1YgxZan5OdCKP9gE"; yaseen = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFXu/iFf6yhi6A0f6Lvp+wyltMHq1YgxZan5OdCKP9gE";
}; };
} }

BIN
crypto/wifi.age Normal file
View file

Binary file not shown.

114
flake.lock
View file

@ -1,24 +1,51 @@
{ {
"nodes": { "nodes": {
"flake-utils": { "agenix": {
"inputs": { "inputs": {
"darwin": "darwin",
"home-manager": "home-manager",
"nixpkgs": [
"stable"
],
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1722339003,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "narHash": "sha256-ZeS51uJI30ehNkcZ4uKqT4ZDARPyqrHADSKAwv5vVCU=",
"owner": "numtide", "owner": "ryantm",
"repo": "flake-utils", "repo": "agenix",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "rev": "3f1dae074a12feb7327b4bf43cbac0d124488bb7",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "numtide", "owner": "ryantm",
"repo": "flake-utils", "repo": "agenix",
"type": "github" "type": "github"
} }
}, },
"flake-utils_2": { "darwin": {
"inputs": {
"nixpkgs": [
"agenix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1700795494,
"narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
"type": "github"
},
"original": {
"owner": "lnl7",
"ref": "master",
"repo": "nix-darwin",
"type": "github"
}
},
"flake-utils": {
"inputs": { "inputs": {
"systems": "systems_2" "systems": "systems_2"
}, },
@ -36,7 +63,46 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_2": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": {
"nixpkgs": [
"agenix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1703113217,
"narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"home-manager_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"stable" "stable"
@ -59,11 +125,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1722087241, "lastModified": 1722651103,
"narHash": "sha256-2ShmEaFi0kJVOEEu5gmlykN5dwjWYWYUJmlRTvZQRpU=", "narHash": "sha256-IRiJA0NVAoyaZeKZluwfb2DoTpBAj+FLI0KfybBeDU0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8c50662509100d53229d4be607f1a3a31157fa12", "rev": "a633d89c6dc9a2a8aae11813a62d7c58b2c0cc51",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -107,7 +173,8 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"home-manager": "home-manager", "agenix": "agenix",
"home-manager": "home-manager_2",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"stable": "stable", "stable": "stable",
"tildefriends": "tildefriends", "tildefriends": "tildefriends",
@ -116,11 +183,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1722087241, "lastModified": 1722651103,
"narHash": "sha256-2ShmEaFi0kJVOEEu5gmlykN5dwjWYWYUJmlRTvZQRpU=", "narHash": "sha256-IRiJA0NVAoyaZeKZluwfb2DoTpBAj+FLI0KfybBeDU0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8c50662509100d53229d4be607f1a3a31157fa12", "rev": "a633d89c6dc9a2a8aae11813a62d7c58b2c0cc51",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -160,6 +227,21 @@
"type": "github" "type": "github"
} }
}, },
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"tildefriends": { "tildefriends": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",

14
flake.nix
View file

@ -22,6 +22,11 @@
# nixos-conf-editor.url = "github:snowfallorg/nixos-conf-editor"; # nixos-conf-editor.url = "github:snowfallorg/nixos-conf-editor";
# nix-software-center.url = "github:snowfallorg/nix-software-center"; # nix-software-center.url = "github:snowfallorg/nix-software-center";
agenix = {
url = "github:ryantm/agenix";
inputs.nixpkgs.follows = "stable";
};
}; };
outputs = { outputs = {
@ -35,6 +40,7 @@
# nixos-conf-editor, # nixos-conf-editor,
# nix-software-center, # nix-software-center,
tildefriends, tildefriends,
agenix,
... ...
} @ inputs: let } @ inputs: let
inherit (self) outputs; inherit (self) outputs;
@ -76,14 +82,6 @@
]; ];
}; };
new-phoenix = stable.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {inherit inputs outputs;};
modules = [
./hosts/new-phoenix/configuration.nix
];
};
theseus = stable.lib.nixosSystem { theseus = stable.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = {inherit inputs outputs;}; specialArgs = {inherit inputs outputs;};

1
home/tasia/home.nix
View file

@ -31,7 +31,6 @@
".config/btop/btop.conf".source = ../../dotfiles/btop.conf; ".config/btop/btop.conf".source = ../../dotfiles/btop.conf;
# ".gitconfig".source = ../../dotfiles/.gitconfig; # ".gitconfig".source = ../../dotfiles/.gitconfig;
".librewolf/librewolf.overrides.cfg".source = ../../dotfiles/librewolf.overrides.cfg; ".librewolf/librewolf.overrides.cfg".source = ../../dotfiles/librewolf.overrides.cfg;
}; };

57
hosts/new-phoenix/configuration.nix
View file

@ -1,57 +0,0 @@
{
pkgs,
lib,
...
}: let
sshKeys = import ../../crypto/ssh-keys.nix;
in {
imports = [
./hardware-configuration.nix
../../common/base.nix
../../common/locales/en.nix
../../common/locales/fr-keymap.nix
../../common/hardware/intel-cpu.nix
../../common/hardware/ssd.nix
../../common/hardware/btrfs.nix
../../common/services/syncthing.nix
../../home/tasia-but-old-username/home.nix
];
networking = {
hostName = "phoenix";
firewall.allowedTCPPorts = [
8384 # syncthing web UI
12345 # tildefriends
13378 # audiobookshelf
];
firewall.allowedUDPPorts = [
12345 # tildefriends
];
};
users.users.user.openssh.authorizedKeys.keys = [
sshKeys.tasia.yaseen
];
services.btrfs.autoScrub.fileSystems = lib.mkForce ["/" "/data"];
virtualisation.docker.enable = true;
services.syncthing = {
dataDir = lib.mkForce "/home/user";
configDir = lib.mkForce "/data/sync/configuration/";
guiAddress = "0.0.0.0:8384";
};
environment.systemPackages = with pkgs; [
#
];
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
system.stateVersion = "23.05";
}

55
hosts/new-phoenix/hardware-configuration.nix
View file

@ -1,55 +0,0 @@
{
config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "sd_mod"];
boot.initrd.kernelModules = [];
boot.kernelModules = [];
boot.extraModulePackages = [];
fileSystems."/" = {
device = "/dev/disk/by-uuid/469da268-3ac1-4591-9209-26c89afb2e59";
fsType = "btrfs";
options = ["subvol=@"];
};
boot.initrd.luks.devices."luks-06613ddd-abd6-409e-9a33-889cb9d15d11".device = "/dev/disk/by-uuid/06613ddd-abd6-409e-9a33-889cb9d15d11";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/E398-A9BF";
fsType = "vfat";
};
fileSystems."/data" = {
device = "/dev/disk/by-uuid/648ae2f4-bd2e-4315-b12f-72733f92d2e0";
fsType = "btrfs";
};
boot.initrd.luks.devices."539c1a57-e6d0-4ff0-927a-8f0d4aa4c9c7".device = "/dev/disk/by-uuid/539c1a57-e6d0-4ff0-927a-8f0d4aa4c9c7";
fileSystems."/home" = {
device = "/dev/disk/by-uuid/469da268-3ac1-4591-9209-26c89afb2e59";
fsType = "btrfs";
options = ["subvol=@home"];
};
swapDevices = [];
# 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
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true;
# networking.interfaces.eno1.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}

29
hosts/phoenix/configuration.nix
View file

@ -8,22 +8,14 @@ in {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
../../common/base.nix ../../common/base.nix
../../common/full-install.nix
../../common/locales/en.nix ../../common/locales/en.nix
../../common/locales/fr-keymap.nix ../../common/locales/fr-keymap.nix
../../common/hardware/intel-cpu.nix ../../common/hardware/intel-cpu.nix
../../common/hardware/amd-gpu.nix
../../common/hardware/ssd.nix ../../common/hardware/ssd.nix
../../common/hardware/btrfs.nix ../../common/hardware/btrfs.nix
../../common/hardware/latest-kernel.nix
../../common/components/de/sddm.nix
../../common/components/de/plasma6.nix
../../common/programs/steam.nix
../../common/services/adguardhome.nix
../../common/services/syncthing.nix ../../common/services/syncthing.nix
../../home/tasia-but-old-username/home.nix ../../home/tasia-but-old-username/home.nix
@ -32,17 +24,14 @@ in {
networking = { networking = {
hostName = "phoenix"; hostName = "phoenix";
firewall = { firewall.allowedTCPPorts = [
enable = true; 8384 # syncthing web UI
allowedTCPPorts = [ # 12345 # tildefriends
8080 # ? # 13378 # audiobookshelf
12345 # tildefriends ];
13378 # audiobookshelf firewall.allowedUDPPorts = [
]; 12345 # tildefriends
allowedUDPPorts = [ ];
8080 # ?
];
};
}; };
users.users.user.openssh.authorizedKeys.keys = [ users.users.user.openssh.authorizedKeys.keys = [
@ -54,11 +43,11 @@ in {
# services.vedirect-reader.enable = true; # services.vedirect-reader.enable = true;
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
services.flatpak.enable = false;
services.syncthing = { services.syncthing = {
dataDir = lib.mkForce "/home/user"; dataDir = lib.mkForce "/home/user";
configDir = lib.mkForce "/data/sync/configuration/"; configDir = lib.mkForce "/data/sync/configuration/";
guiAddress = "0.0.0.0:8384";
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

2
hosts/stuff/configuration.nix
View file

@ -44,7 +44,7 @@ in {
enableKwallet = true; enableKwallet = true;
}; };
services.printing.drivers = [ pkgs.cnijfilter2 ]; services.printing.drivers = [pkgs.cnijfilter2];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# Additional system packages here # Additional system packages here

6
hosts/yaseen/configuration.nix
View file

@ -48,6 +48,7 @@ in {
# Personal modules # Personal modules
# ../../modules/nixos/tildefriends.nix # ../../modules/nixos/tildefriends.nix
inputs.agenix.nixosModules.default
]; ];
# RGB Keyboard backight # RGB Keyboard backight
@ -111,6 +112,9 @@ in {
logseq logseq
nix-tree nix-tree
android-studio android-studio
lutris
inputs.agenix.packages.x86_64-linux.default
]; ];
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
@ -162,7 +166,7 @@ in {
]; ];
}; };
services.printing.drivers = [ pkgs.cnijfilter2 ]; services.printing.drivers = [pkgs.cnijfilter2];
services.ollama = { services.ollama = {
enable = true; enable = true;

5
secrets.nix Normal file
View file

@ -0,0 +1,5 @@
let
sshKeys = import ./crypto/ssh-keys.nix;
in {
"crypto/wifi.age".publicKeys = [sshKeys.host.yaseen sshKeys.tasia.yaseen];
}