Compare commits

..

No commits in common. "1c7e2bc82cda8f70943f29d93ac33896c7ee15ec" and "e32e6e7d86294320a81b4154928462ae0b8e3c70" have entirely different histories.

6 changed files with 34 additions and 27 deletions

View File

@ -60,6 +60,7 @@
};
programs = {
appgate-sdp.enable = true;
zsh.enable = true;
gphoto2.enable = true;
};

View File

@ -7,11 +7,11 @@
]
},
"locked": {
"lastModified": 1706981411,
"narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=",
"lastModified": 1705659542,
"narHash": "sha256-WA3xVfAk1AYmFdwghT7mt/erYpsU6JPu9mdTEP/e9HQ=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "652fda4ca6dafeb090943422c34ae9145787af37",
"rev": "10cd9c53115061aa6a0a90aad0b0dde6a999cdb9",
"type": "github"
},
"original": {
@ -39,11 +39,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1707238373,
"narHash": "sha256-WKxT0yLzWbFZwYi92lI0yWJpYtRaFSWHGX8QXzejapw=",
"lastModified": 1705774713,
"narHash": "sha256-j6ADaDH9XiumUzkTPlFyCBcoWYhO83lfgiSqEJF2zcs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "fb0c047e30b69696acc42e669d02452ca1b55755",
"rev": "1b64fc1287991a9cce717a01c1973ef86cb1af0b",
"type": "github"
},
"original": {
@ -55,11 +55,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1707092692,
"narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=",
"lastModified": 1705677747,
"narHash": "sha256-eyM3okYtMgYDgmYukoUzrmuoY4xl4FUujnsv/P6I/zI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "faf912b086576fd1a15fca610166c98d47bc667e",
"rev": "bbe7d8f876fbbe7c959c90ba2ae2852220573261",
"type": "github"
},
"original": {

View File

@ -30,11 +30,32 @@
in
{
nixosConfigurations = {
nixos-vm = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
./configuration.nix
./greetd.nix
./users.nix
./machines/nixos-vm/configuration.nix
./machines/nixos-vm/hardware-configuration.nix
home-manager.nixosModules.home-manager
{
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit user theme; };
home-manager.users.${user} = {
imports = [ ./home-${user}.nix ];
nixpkgs.config = nixpkgs-config;
nixpkgs.overlays = [ overlay-unstable ];
};
}
];
};
apache = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
./configuration.nix
./swp/configuration.nix
./greetd.nix
./users.nix
./machines/apache/configuration.nix
@ -48,7 +69,6 @@
imports = [
./home-${user}.nix
./machines/apache/home-${user}.nix
./swp/home-${user}.nix
];
nixpkgs.config = nixpkgs-config;
nixpkgs.overlays = [ overlay-unstable ];
@ -61,7 +81,6 @@
system = "x86_64-linux";
modules = [
./configuration.nix
./swp/configuration.nix
./greetd.nix
./users.nix
./machines/p330/configuration.nix
@ -76,7 +95,6 @@
imports = [
./home-${user}.nix
./machines/p330/home-${user}.nix
./swp/home-${user}.nix
];
nixpkgs.config = nixpkgs-config;
nixpkgs.overlays = [ overlay-unstable ];

View File

@ -17,12 +17,14 @@
gnumake
unzip
gcc
slack
thunderbird
keepassxc
tree
light
element-desktop
difftastic
zoom-us
darktable
kubectl
kubectx

View File

@ -1,6 +0,0 @@
{ pkgs, lib, ... }:
{
programs.appgate-sdp.enable = true;
}

View File

@ -1,8 +0,0 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [
slack
zoom-us
];
}