rhelmot
/
nixos-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: rhelmot:61bc29a0aca23bb4eaccb56e232cd9ab79994ac8
Branches Tags
rhelmot:main
..
compare: rhelmot:b0c97ef755e69d343fe5aa3b31f8b09540453dfd
Branches Tags
rhelmot:main

No commits in common. "61bc29a0aca23bb4eaccb56e232cd9ab79994ac8" and "b0c97ef755e69d343fe5aa3b31f8b09540453dfd" have entirely different histories.
61bc29a0ac ... b0c97ef755

6 changed files with 20 additions and 115 deletions
Show Stats Expand all files Collapse all files

2
configuration-desktop.nix
View File

@ -33,8 +33,6 @@
programs = {
firefox.enable = true;
kdeconnect.enable = true;
wireshark.enable = true;
wireshark.package = pkgs.wireshark;
};
environment.systemPackages = with pkgs; [

2
configuration-nixbsd.nix
View File

@ -2,8 +2,6 @@
let
nixKey = "/var/lib/nix/binary-cache-key" ;
in {
# it's already default
lix.enable = false;
init.services.nix-key-setup = {
description = "Generate a nix build signing key";
startType = "oneshot";

2
configuration.nix
View File

@ -35,8 +35,6 @@
file
patchelf
gdb
p7zip
unzip
(python3.withPackages (p: with p; [
virtualenvwrapper

98
flake.lock
View File

@ -30,75 +30,7 @@
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flakey-profile": {
"locked": {
"lastModified": 1712898590,
"narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
"owner": "lf-",
"repo": "flakey-profile",
"rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
"type": "github"
},
"original": {
"owner": "lf-",
"repo": "flakey-profile",
"type": "github"
}
},
"lix": {
"flake": false,
"locked": {
"lastModified": 1737234286,
"narHash": "sha256-pgDJZjj4jpzkFxsqBTI/9Yb0n3gW+DvDtuv9SwQZZcs=",
"rev": "079528098f5998ba13c88821a2eca1005c1695de",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/079528098f5998ba13c88821a2eca1005c1695de.tar.gz?rev=079528098f5998ba13c88821a2eca1005c1695de"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/lix/archive/release-2.92.tar.gz"
}
},
"lix-module": {
"inputs": {
"flake-utils": "flake-utils",
"flakey-profile": "flakey-profile",
"lix": "lix",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1742943028,
"narHash": "sha256-fprwZKE1uMzO9tiWWOrmLWBW3GPkMayQfb0xOvVFIno=",
"rev": "868d97695bab9d21f6070b03957bcace249fbe3c",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/868d97695bab9d21f6070b03957bcace249fbe3c.tar.gz?rev=868d97695bab9d21f6070b03957bcace249fbe3c"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-3.tar.gz"
}
},
"lix_2": {
"inputs": {
"flake-compat": "flake-compat_2",
"nix2container": "nix2container",
@ -167,16 +99,16 @@
"nixbsd": {
"inputs": {
"flake-compat": "flake-compat",
"lix": "lix_2",
"lix": "lix",
"mini-tmpfiles": "mini-tmpfiles",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1743152305,
"narHash": "sha256-jLO2QaCoEqSVF5+UOPAQKE74U4CAlc/5huuaT7I6RL4=",
"lastModified": 1743143885,
"narHash": "sha256-IV//RQg1qxLXEGDlI6ULV3/qpbUkEvbta3y1hxwWgcU=",
"owner": "nixos-bsd",
"repo": "nixbsd",
"rev": "79c61bb25529d19cc1e6922b499162b5dda54268",
"rev": "5036bde2ff8abe3840700227568f6820d7704565",
"type": "github"
},
"original": {
@ -204,11 +136,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1743367904,
"narHash": "sha256-sOos1jZGKmT6xxPvxGQyPTApOunXvScV4lNjBCXd/CI=",
"lastModified": 1739758141,
"narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "7ffe0edc685f14b8c635e3d6591b0bbb97365e6c",
"rev": "c618e28f70257593de75a7044438efc1c1fc0791",
"type": "github"
},
"original": {
@ -236,25 +168,9 @@
},
"root": {
"inputs": {
"lix-module": "lix-module",
"nixbsd": "nixbsd",
"nixpkgs": "nixpkgs_2"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",

7
flake.nix
View File

@ -2,12 +2,8 @@
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
nixbsd.url = "github:nixos-bsd/nixbsd/main";
lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-3.tar.gz";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = { self, nixpkgs, nixbsd, lix-module, ... }: let
outputs = { self, nixpkgs, nixbsd, ... }: let
sitesFiles = builtins.readDir ./sites;
sitesNames = builtins.filter (name: builtins.pathExists ./sites/${name}/configuration.nix) (builtins.attrNames sitesFiles);
systemTypes = {
@ -23,7 +19,6 @@
./configuration-${systemName name}.nix
./sites/${name}/configuration.nix
{ nixpkgs.buildPlatform = platform; }
lix-module.nixosModules.default
];
}; in {
inherit (evaluated) config;

24
sites/daisy/configuration.nix
View File

@ -21,7 +21,7 @@
networking.firewall.allowedUDPPorts = [ 1337 ];
system.stateVersion = "24.11";
#services.immich.enable = true;
services.immich.enable = true;
environment.systemPackages = [
pkgs.idapro9
@ -33,15 +33,15 @@
pkgs.OVMF.fd
];
#services.postgresql.enable = true;
#services.postgresql.authentication = ''
# local all all peer map=pgadmin-superuser
#'';
#services.postgresql.identMap = ''
# pgadmin-superuser pgadmin postgres
# pgadmin-superuser postgres postgres
#'';
#services.pgadmin.enable = true;
#services.pgadmin.initialEmail = "audrey@rhelmot.io";
#services.pgadmin.initialPasswordFile = "/var/lib/pgadmin/initial_password_file";
services.postgresql.enable = true;
services.postgresql.authentication = ''
local all all peer map=pgadmin-superuser
'';
services.postgresql.identMap = ''
pgadmin-superuser pgadmin postgres
pgadmin-superuser postgres postgres
'';
services.pgadmin.enable = true;
services.pgadmin.initialEmail = "audrey@rhelmot.io";
services.pgadmin.initialPasswordFile = "/var/lib/pgadmin/initial_password_file";
}