diff options
| author | Alejandro Soto <alejandro@34project.org> | 2022-03-05 00:40:32 -0600 |
|---|---|---|
| committer | Alejandro Soto <alejandro@34project.org> | 2022-03-05 00:40:32 -0600 |
| commit | 5dc85e72a002efce36b440a98b17a6c80234a142 (patch) | |
| tree | 11f0d3af31b88c079d1598a5842dc47d9e024aa9 /home | |
| parent | 743a205dd9bff31e0ed63ebba8dd3327614ac188 (diff) | |
Restructure flake source hierarchy
Diffstat (limited to '')
| -rw-r--r-- | home/alacritty.nix (renamed from alacritty.nix) | 0 | ||||
| -rw-r--r-- | home/default.nix (renamed from home.nix) | 8 | ||||
| -rw-r--r-- | home/i3-config.nix (renamed from i3-config.nix) | 0 | ||||
| -rw-r--r-- | home/path.nix (renamed from path.nix) | 4 | ||||
| -rw-r--r-- | home/unfree.nix (renamed from unfree.nix) | 0 | ||||
| -rw-r--r-- | home/zshrc.nix (renamed from zshrc.nix) | 0 |
6 files changed, 5 insertions, 7 deletions
diff --git a/alacritty.nix b/home/alacritty.nix index 7a40b67..7a40b67 100644 --- a/alacritty.nix +++ b/home/alacritty.nix diff --git a/home.nix b/home/default.nix index c18e3e5..abd034b 100644 --- a/home.nix +++ b/home/default.nix @@ -1,6 +1,4 @@ -{ lib, config, pkgs, ... }: let - local = import ./pkgs.nix pkgs; -in { +{ lib, config, pkgs, ... }: { imports = [ ./unfree.nix ]; home = { @@ -35,7 +33,7 @@ in { ".xinitrc".text = "exec ${pkgs.i3-gaps}/bin/i3"; }; - packages = import ./path.nix { inherit pkgs local; }; + packages = import ./path.nix pkgs; }; fonts.fontconfig.enable = true; @@ -73,7 +71,7 @@ in { "i3/config".text = import ./i3-config.nix { inherit (pkgs) i3lock-color xautolock; inherit (pkgs.xorg) setxkbmap; - inherit (local) tmux-lift; + inherit (pkgs.local) tmux-lift; alacritty = config.programs.alacritty.package; i3status-rust = config.programs.i3status-rust.package; diff --git a/i3-config.nix b/home/i3-config.nix index 846e59a..846e59a 100644 --- a/i3-config.nix +++ b/home/i3-config.nix @@ -1,4 +1,4 @@ -{ pkgs, local }: let +pkgs: let py = pkgs.python39Packages; in [ pkgs.calc @@ -18,7 +18,7 @@ in [ pkgs.rustup pkgs.signal-desktop pkgs.tdesktop - local.tmux-lift + pkgs.local.tmux-lift pkgs.units pkgs.unzip pkgs.zip diff --git a/unfree.nix b/home/unfree.nix index 1bb3788..1bb3788 100644 --- a/unfree.nix +++ b/home/unfree.nix diff --git a/zshrc.nix b/home/zshrc.nix index 134ee5a..134ee5a 100644 --- a/zshrc.nix +++ b/home/zshrc.nix |