From 19c827a7676bf3226f2e7be7e2e771fc579c2b04 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Thu, 2 May 2024 03:20:13 +0800 Subject: [PATCH 1/7] actions need to be in workflows folder --- .github/dependabot.yml | 2 +- .github/{ => workflows}/lock.yml | 0 .github/{ => workflows}/test.yml | 2 ++ 3 files changed, 3 insertions(+), 1 deletion(-) rename .github/{ => workflows}/lock.yml (100%) rename .github/{ => workflows}/test.yml (99%) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 0d08e26..748ec06 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -8,4 +8,4 @@ updates: - package-ecosystem: "github-actions" # See documentation for possible values directory: "/" # Location of package manifests schedule: - interval: "weekly" + interval: "daily" diff --git a/.github/lock.yml b/.github/workflows/lock.yml similarity index 100% rename from .github/lock.yml rename to .github/workflows/lock.yml diff --git a/.github/test.yml b/.github/workflows/test.yml similarity index 99% rename from .github/test.yml rename to .github/workflows/test.yml index b8170e4..e276c42 100644 --- a/.github/test.yml +++ b/.github/workflows/test.yml @@ -1,7 +1,9 @@ name: "Test" + on: pull_request: push: + jobs: tests: runs-on: ubuntu-latest From c6cb10768fb463580a3a3542d93d6021ea6b92a6 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Thu, 2 May 2024 08:08:04 +0800 Subject: [PATCH 2/7] change filename --- configuration.nix => default.nix | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename configuration.nix => default.nix (100%) diff --git a/configuration.nix b/default.nix similarity index 100% rename from configuration.nix rename to default.nix From a2f001f7e688c40796a6c901b31ab485d28a99d1 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Thu, 2 May 2024 08:10:28 +0800 Subject: [PATCH 3/7] update config --- default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/default.nix b/default.nix index e3f1d87..2d4ad14 100644 --- a/default.nix +++ b/default.nix @@ -1,5 +1,4 @@ { config, pkgs, ... }: - { imports = [ ]; @@ -13,11 +12,9 @@ vim git screen - ]; - -# YOU CAN CONFIGURE SSH HERE, BUT WE AREN'T THERE YET -# services.openssh.enable = true; -# users.users.root.openssh.authorizedKeys.keys = [ "your-ssh-public-key" ]; -} + # YOU CAN CONFIGURE SSH HERE, BUT WE AREN'T THERE YET + # services.openssh.enable = true; + # users.users.root.openssh.authorizedKeys.keys = [ "your-ssh-public-key" ]; +} \ No newline at end of file From 1be81670cef0153e3893420f0cd24ccb8e17c7f3 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Thu, 2 May 2024 08:12:07 +0800 Subject: [PATCH 4/7] adjust again --- default.nix | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/default.nix b/default.nix index 2d4ad14..cdbd6d4 100644 --- a/default.nix +++ b/default.nix @@ -1,20 +1,22 @@ { config, pkgs, ... }: { - imports = [ ]; + system.build.toplevel = { + imports = [ ]; - environment.systemPackages = with pkgs; [ - go - rustc - cargo - zerotier - btop - htop - vim - git - screen - ]; + environment.systemPackages = with pkgs; [ + go + rustc + cargo + zerotier + btop + htop + vim + git + screen + ]; - # YOU CAN CONFIGURE SSH HERE, BUT WE AREN'T THERE YET - # services.openssh.enable = true; - # users.users.root.openssh.authorizedKeys.keys = [ "your-ssh-public-key" ]; + # YOU CAN CONFIGURE SSH HERE, BUT WE AREN'T THERE YET + # services.openssh.enable = true; + # users.users.root.openssh.authorizedKeys.keys = [ "your-ssh-public-key" ]; + }; } \ No newline at end of file From 0ed25e2563c0f4c196cd809b251f7befc4b6670c Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Thu, 2 May 2024 08:13:04 +0800 Subject: [PATCH 5/7] remove the dots --- default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default.nix b/default.nix index cdbd6d4..24b1b4e 100644 --- a/default.nix +++ b/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, pkgs }: { system.build.toplevel = { imports = [ ]; From 70742acff03e338296f8d4f8b728da6e7961e73e Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Thu, 2 May 2024 08:21:50 +0800 Subject: [PATCH 6/7] ifix? --- default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/default.nix b/default.nix index 24b1b4e..67549f0 100644 --- a/default.nix +++ b/default.nix @@ -1,5 +1,10 @@ -{ config, pkgs }: { + description = "Somatic Linux"; + + inputs = { + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + }; + system.build.toplevel = { imports = [ ]; From d79dec7f6e0725197c58e4c160bd9052a5d53a91 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Thu, 2 May 2024 08:23:54 +0800 Subject: [PATCH 7/7] update --- default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/default.nix b/default.nix index 67549f0..e4f6e5d 100644 --- a/default.nix +++ b/default.nix @@ -2,7 +2,9 @@ description = "Somatic Linux"; inputs = { + nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + pkgs = import nixpkgs { system = "x86_64-linux"; }; }; system.build.toplevel = {