Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
takeokunn committed Oct 18, 2024
1 parent 8e74720 commit 1401903
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 175 deletions.
159 changes: 4 additions & 155 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 4 additions & 8 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@
inputs.nixpkgs.follows = "nixpkgs";
inputs.home-manager.follows = "home-manager";
};
wezterm-flake = {
url = "github:wez/wezterm?dir=nix";
inputs.nixpkgs.follows = "nixpkgs";
};
neovim-nightly-overlay = {
url = "github:nix-community/neovim-nightly-overlay";
inputs.nixpkgs.follows = "nixpkgs";
Expand All @@ -45,15 +41,15 @@
};

outputs = { self, nixpkgs, nix-darwin, home-manager, org-babel, emacs-overlay
, nixos-hardware, xremap, nix-on-droid, wezterm-flake
, neovim-nightly-overlay, sops-nix, ... }: {
, nixos-hardware, xremap, nix-on-droid, neovim-nightly-overlay, sops-nix
, ... }: {
darwinConfigurations = (import ./hosts/OPL2212-2 {
inherit self nixpkgs nix-darwin home-manager org-babel emacs-overlay
wezterm-flake neovim-nightly-overlay;
neovim-nightly-overlay;
});
nixosConfigurations = (import ./hosts/X13Gen2 {
inherit self nixpkgs home-manager org-babel emacs-overlay nixos-hardware
xremap wezterm-flake neovim-nightly-overlay sops-nix;
xremap neovim-nightly-overlay sops-nix;
});
nixOnDroidConfigurations = (import ./hosts/OPPO-A79 {
inherit self nixpkgs home-manager nix-on-droid;
Expand Down
5 changes: 2 additions & 3 deletions home-manager/advanced.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{ system, nixpkgs, org-babel, emacs-overlay, wezterm-flake
, neovim-nightly-overlay }:
{ system, nixpkgs, org-babel, emacs-overlay, neovim-nightly-overlay }:
let
lib = nixpkgs.lib;

Expand All @@ -21,7 +20,7 @@ let
# programs
basicPrograms = import ./programs/basic.nix { inherit pkgs sources; };
advancedPrograms = import ./programs/advanced.nix {
inherit lib pkgs wezterm-flake neovim-nightly-overlay org-babel sources;
inherit lib pkgs neovim-nightly-overlay org-babel sources;
};

# services
Expand Down
4 changes: 2 additions & 2 deletions home-manager/programs/advanced.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, pkgs, wezterm-flake, neovim-nightly-overlay, org-babel, sources }:
{ lib, pkgs, neovim-nightly-overlay, org-babel, sources }:
let
awscli = import ./awscli;
emacs = import ./emacs { inherit pkgs org-babel sources; };
Expand All @@ -7,7 +7,7 @@ let
neovim = import ./neovim { inherit pkgs neovim-nightly-overlay sources; };
nyxt = import ./nyxt { inherit pkgs; };
roswell = import ./roswell { inherit pkgs; };
wezterm = import ./wezterm { inherit pkgs wezterm-flake; };
wezterm = import ./wezterm { inherit pkgs; };

# for window manager
aerospace = import ./aerospace { inherit pkgs; };
Expand Down
3 changes: 1 addition & 2 deletions home-manager/programs/wezterm/default.nix
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{ pkgs, wezterm-flake }: {
{ pkgs }: {
home.file.".config/wezterm/dracula.toml".source = ./dracula.toml;

programs.wezterm = {
enable = pkgs.stdenv.isLinux;
package = wezterm-flake.packages.${pkgs.system}.default;
extraConfig = ''
local wezterm = require("wezterm")
Expand Down
6 changes: 3 additions & 3 deletions hosts/OPL2212-2/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ self, nixpkgs, nix-darwin, home-manager, org-babel, emacs-overlay
, wezterm-flake, neovim-nightly-overlay }:
, neovim-nightly-overlay }:
let
system = "aarch64-darwin";
username = "obara";
Expand All @@ -19,8 +19,8 @@ in {
home-manager.useUserPackages = true;
home-manager.users."${username}" =
import ../../home-manager/advanced.nix {
inherit system nixpkgs emacs-overlay wezterm-flake
neovim-nightly-overlay org-babel;
inherit system nixpkgs emacs-overlay neovim-nightly-overlay
org-babel;
};
}
];
Expand Down
4 changes: 2 additions & 2 deletions hosts/X13Gen2/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ self, nixpkgs, home-manager, org-babel, emacs-overlay, nixos-hardware, xremap
, wezterm-flake, neovim-nightly-overlay, sops-nix }:
, neovim-nightly-overlay, sops-nix }:
let
username = "take";
system = "x86_64-linux";
Expand All @@ -16,7 +16,7 @@ in {
home-manager.useUserPackages = true;
home-manager.users."${username}" =
import ../../home-manager/advanced.nix {
inherit system nixpkgs org-babel emacs-overlay wezterm-flake
inherit system nixpkgs org-babel emacs-overlay
neovim-nightly-overlay;
};
}
Expand Down

0 comments on commit 1401903

Please sign in to comment.