diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..722d5e7 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.vscode diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e83ee8c..2a9bad2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,7 +22,7 @@ apply: stage: apply script: - nix-env --install colmena - - colmena apply + - colmena apply --no-keys commit_flake: stage: commit_flake diff --git a/configuration/common/default.nix b/configuration/common/default.nix index d89f1dc..5150469 100644 --- a/configuration/common/default.nix +++ b/configuration/common/default.nix @@ -1,5 +1,4 @@ { config, pkgs, ... }: - { imports = [ ../../users/yuri diff --git a/configuration/proxmox-vm/default.nix b/configuration/proxmox-vm/default.nix index 20d895c..644147a 100644 --- a/configuration/proxmox-vm/default.nix +++ b/configuration/proxmox-vm/default.nix @@ -1,5 +1,4 @@ { ... }: - { imports = [ ./hardware-configuration.nix diff --git a/flake.lock b/flake.lock index 33a1357..bfa6a15 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1688764204, - "narHash": "sha256-FsvK+tIvelCI0tWwlMDKfiyb7P/KfxpGbXMrdCKiT8s=", + "lastModified": 1689048911, + "narHash": "sha256-pODI2CkjWbSLo5nPMZoLtkRNJU/Nr3VSITXZqqmNtIk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d8bb6c681cf86265fdcf3cc3119f757bbb085835", + "rev": "8163a64662b43848802092d52015ef60777d6129", "type": "github" }, "original": { diff --git a/users/yuri/default.nix b/users/yuri/default.nix index f85b37e..ff0ac57 100644 --- a/users/yuri/default.nix +++ b/users/yuri/default.nix @@ -1,5 +1,4 @@ { ... }: - { users.users.yuri = { isNormalUser = true;