summaryrefslogtreecommitdiff
path: root/machines
diff options
context:
space:
mode:
Diffstat (limited to 'machines')
-rw-r--r--machines/v/home.nix40
-rw-r--r--machines/vm/home.nix (renamed from machines/d/home.nix)10
-rw-r--r--machines/x/configuration.nix13
-rw-r--r--machines/x/home.nix10
4 files changed, 19 insertions, 54 deletions
diff --git a/machines/v/home.nix b/machines/v/home.nix
deleted file mode 100644
index 201d8db..0000000
--- a/machines/v/home.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ pkgs, ... }:
-
-{
- nixpkgs.config.allowUnfree = true;
-
- home = {
- username = "vagrant";
- homeDirectory = "/home/vagrant";
- };
-
- home.packages = with pkgs; [
- wget
-
- tmux
- fzf
- fd
- ripgrep
-
- unzip
- zip
-
- pyright
- git-lfs
- ];
-
- programs.bash.initExtra = ''
- . "$HOME/.nix-profile/etc/profile.d/nix.sh"
- alias ls="ls --color=auto"
- '';
-
- imports = (map (path: ../../config/${path}) [
- "bash.nix"
- "dotfiles.nix"
- "git"
- "nvim"
- ]);
-
- home.stateVersion = "23.11";
- programs.home-manager.enable = true;
-}
diff --git a/machines/d/home.nix b/machines/vm/home.nix
index 41b1380..7aca730 100644
--- a/machines/d/home.nix
+++ b/machines/vm/home.nix
@@ -22,6 +22,16 @@
git-lfs
];
+ programs = {
+ direnv = {
+ enable = true;
+ enableBashIntegration = true;
+ nix-direnv.enable = true;
+ };
+
+ bash.enable = true;
+ };
+
programs.bash.initExtra = ''
. "$HOME/.nix-profile/etc/profile.d/nix.sh"
alias ls="ls --color=auto"
diff --git a/machines/x/configuration.nix b/machines/x/configuration.nix
index fbd553f..c26d6b5 100644
--- a/machines/x/configuration.nix
+++ b/machines/x/configuration.nix
@@ -27,10 +27,10 @@ in {
"virtualization.nix"
"remapcapslock.nix"
- # "wm_utils.nix"
- # "polkit.nix"
+ "wm_utils.nix"
+ "polkit.nix"
"login.nix"
- "plasma.nix"
+ # "plasma.nix"
]);
boot.loader = {
@@ -56,10 +56,6 @@ in {
networking.hostName = "x";
- environment.variables = {
- XCURSOR_SIZE = "16";
- };
-
programs.fuse.userAllowOther = true;
home-manager = {
extraSpecialArgs = { inherit inputs; };
@@ -70,7 +66,6 @@ in {
networking.extraHosts =
''
- 127.0.0.1 download.labsmartlis.local
- 192.168.1.186 cacer.local c
+ 192.168.122.100 android
'';
}
diff --git a/machines/x/home.nix b/machines/x/home.nix
index a769073..6a3cd25 100644
--- a/machines/x/home.nix
+++ b/machines/x/home.nix
@@ -54,11 +54,11 @@
"nvim"
# "qtile"
- # "dwl.nix"
- # "themes.nix"
- # "way-displays"
- # "swaylock"
- # "dunst"
+ "dwl.nix"
+ "themes.nix"
+ "way-displays"
+ "swaylock"
+ "dunst"
"alacritty"
]);