From 60b36f3709f7db91ca2daf435937a046aba178e8 Mon Sep 17 00:00:00 2001 From: victor Date: Fri, 9 Sep 2022 19:02:32 +0200 Subject: [PATCH] add github actions --- .github/workflows/nixos.yml | 20 ++++++++++++++++ flake.lock | 24 +++++++++---------- nixos/hosts/thalassa/null/configuration.nix | 3 ++- nixos/hosts/thalassa/null/home/default.nix | 7 ++++-- .../hosts/thalassa/null/home/eww/default.nix | 2 +- nixos/hosts/thalassa/null/home/theme.nix | 1 + 6 files changed, 41 insertions(+), 16 deletions(-) create mode 100644 .github/workflows/nixos.yml diff --git a/.github/workflows/nixos.yml b/.github/workflows/nixos.yml new file mode 100644 index 0000000..f9e86df --- /dev/null +++ b/.github/workflows/nixos.yml @@ -0,0 +1,20 @@ +name: NixOS + +jobs: + build: + runs-on: ubuntu-18.04 + steps: + - uses: actions/checkout@v2.3.2 + + - name: "Install Nix ❄️" + uses: cachix/install-nix-action@v15 + + - name: "Install Cachix ❄️" + uses: cachix/cachix-action@v10 + with: + name: 0x76-infra + authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" + + - name: "Build NixOS config ❄️" + run: | + nix run '.#' build diff --git a/flake.lock b/flake.lock index 8427af7..d74ddd9 100644 --- a/flake.lock +++ b/flake.lock @@ -209,11 +209,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1662659484, - "narHash": "sha256-+uanOaNQCOkwZhzdtLEce1L8IZcGhTgEw8mXKVLGVxQ=", + "lastModified": 1662736595, + "narHash": "sha256-43viuA7wymW9shuGxFE5U3XGauucm7sQc83P8cvNLLo=", "owner": "nix-community", "repo": "home-manager", - "rev": "4cfc0a1e02c6374f66acdfd2ff8ae3e87c80c818", + "rev": "b92826d0c4a6a7c50fece3caaeaa0cb08536a3f3", "type": "github" }, "original": { @@ -228,11 +228,11 @@ "wlroots": "wlroots" }, "locked": { - "lastModified": 1662670949, - "narHash": "sha256-VB/34YMiW9mL6sdEAnYOqi1sjOiJcu8ZmQx3R8PI2iI=", + "lastModified": 1662732084, + "narHash": "sha256-uW9KRO0zNC2xPISInFCFP0Nqko1x/DLI+jrhndERuRQ=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "928158bbfb906bd871738d60610d85634d1f8c7e", + "rev": "9370c7aa8a0f43b4471626f95013e1bf55539c19", "type": "github" }, "original": { @@ -412,11 +412,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1662706500, - "narHash": "sha256-aGLVvP1H5Y9rmbVpP9/5esO/4lmDkGxIVgq1AGDiDTM=", + "lastModified": 1662729926, + "narHash": "sha256-klAcKYYKVtd3a/34kfi4bqUKlL4GJqh9iYWictDpsJg=", "owner": "NULLx76", "repo": "nixpkgs", - "rev": "98eb447a5320ea4a93ebb92f5d7367e18c3dbbee", + "rev": "cc6ef9492eba324cc2482127f0778b8178a186bd", "type": "github" }, "original": { @@ -495,11 +495,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1662656610, - "narHash": "sha256-5mz1SsMNXMoacixgFxfVHLwp1ycX+sW4T5/G9KHF68E=", + "lastModified": 1662734285, + "narHash": "sha256-6WHeR4k640SnTqxusciQ6zfB6of20cjMjM3wwaIgzNQ=", "owner": "DeterminateSystems", "repo": "riff", - "rev": "895037519e9fcc1bdb6e709d4ffa34ed71851c96", + "rev": "bbb08d8ec46d8eb0317a10bc828c25ce8be42c58", "type": "github" }, "original": { diff --git a/nixos/hosts/thalassa/null/configuration.nix b/nixos/hosts/thalassa/null/configuration.nix index cfb7d5a..4267cc9 100644 --- a/nixos/hosts/thalassa/null/configuration.nix +++ b/nixos/hosts/thalassa/null/configuration.nix @@ -120,10 +120,11 @@ in enable = true; wlr.enable = true; extraPortals = with pkgs; [ - xdg-desktop-portal-gtk + # xdg-desktop-portal-gtk ]; }; }; + services.dbus.enable = true; # Hyprland programs.hyprland = { diff --git a/nixos/hosts/thalassa/null/home/default.nix b/nixos/hosts/thalassa/null/home/default.nix index 7ac7a2e..9219382 100644 --- a/nixos/hosts/thalassa/null/home/default.nix +++ b/nixos/hosts/thalassa/null/home/default.nix @@ -43,7 +43,6 @@ wf-recorder # Screenrecorder wl-clipboard # Clipboard manager wofi # Wayland rofi - inputs.riff.packages.x86_64-linux.riff ]; @@ -51,6 +50,11 @@ enable = true; }; + programs.exa = { + enable = true; + enableAliases = true; + }; + programs.git = { enable = true; package = pkgs.gitAndTools.gitFull; @@ -60,7 +64,6 @@ programs.mako = { enable = true; - borderRadius = 5; }; programs.tmux = { diff --git a/nixos/hosts/thalassa/null/home/eww/default.nix b/nixos/hosts/thalassa/null/home/eww/default.nix index da3b738..29accf2 100644 --- a/nixos/hosts/thalassa/null/home/eww/default.nix +++ b/nixos/hosts/thalassa/null/home/eww/default.nix @@ -7,7 +7,7 @@ ]; home.file.".config/eww/eww.yuck".source = ./eww.yuck; - home.file.".config/eww/eww.scss".source = ./eww.scss; + home.file.".config/eww/eww.scss".text = builtins.readFile ./eww.scss; # scripts home.file.".config/eww/scripts/volume.sh" = { diff --git a/nixos/hosts/thalassa/null/home/theme.nix b/nixos/hosts/thalassa/null/home/theme.nix index a4f2ee1..870403f 100644 --- a/nixos/hosts/thalassa/null/home/theme.nix +++ b/nixos/hosts/thalassa/null/home/theme.nix @@ -59,5 +59,6 @@ in backgroundColor = colour.hex.mantle; borderColor = colour.hex.pink; textColor = colour.hex.text; + borderRadius = 5; }; }