Compare commits

...

3 Commits

Author SHA1 Message Date
mandlm 1c7e2bc82c
chore: nix flake update 2024-02-08 13:49:05 +01:00
mandlm faf497776e
feat: remove nixos-vm config 2024-02-08 13:48:51 +01:00
mandlm c498035140
feat: split private from swp config 2024-02-08 13:48:37 +01:00
6 changed files with 27 additions and 34 deletions

View File

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

View File

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

View File

@ -30,32 +30,11 @@
in in
{ {
nixosConfigurations = { 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 { apache = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./configuration.nix ./configuration.nix
./swp/configuration.nix
./greetd.nix ./greetd.nix
./users.nix ./users.nix
./machines/apache/configuration.nix ./machines/apache/configuration.nix
@ -69,6 +48,7 @@
imports = [ imports = [
./home-${user}.nix ./home-${user}.nix
./machines/apache/home-${user}.nix ./machines/apache/home-${user}.nix
./swp/home-${user}.nix
]; ];
nixpkgs.config = nixpkgs-config; nixpkgs.config = nixpkgs-config;
nixpkgs.overlays = [ overlay-unstable ]; nixpkgs.overlays = [ overlay-unstable ];
@ -81,6 +61,7 @@
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./configuration.nix ./configuration.nix
./swp/configuration.nix
./greetd.nix ./greetd.nix
./users.nix ./users.nix
./machines/p330/configuration.nix ./machines/p330/configuration.nix
@ -95,6 +76,7 @@
imports = [ imports = [
./home-${user}.nix ./home-${user}.nix
./machines/p330/home-${user}.nix ./machines/p330/home-${user}.nix
./swp/home-${user}.nix
]; ];
nixpkgs.config = nixpkgs-config; nixpkgs.config = nixpkgs-config;
nixpkgs.overlays = [ overlay-unstable ]; nixpkgs.overlays = [ overlay-unstable ];

View File

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

6
swp/configuration.nix Normal file
View File

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

8
swp/home-mandlm.nix Normal file
View File

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