diff options
-rw-r--r-- | users/common/desktop/default.nix | 7 | ||||
-rw-r--r-- | users/fcuny/cli/default.nix | 15 | ||||
-rw-r--r-- | users/fcuny/cli/git.nix (renamed from users/fcuny/git.nix) | 0 | ||||
-rw-r--r-- | users/fcuny/cli/go.nix (renamed from users/fcuny/go.nix) | 0 | ||||
-rw-r--r-- | users/fcuny/cli/tmux.nix (renamed from users/fcuny/tmux.nix) | 0 | ||||
-rw-r--r-- | users/fcuny/cli/zsh.nix (renamed from users/fcuny/zsh.nix) | 0 | ||||
-rw-r--r-- | users/fcuny/default.nix | 21 | ||||
-rw-r--r-- | users/fcuny/desktop/browser.nix (renamed from users/common/desktop/browser.nix) | 0 | ||||
-rw-r--r-- | users/fcuny/desktop/default.nix | 20 | ||||
-rw-r--r-- | users/fcuny/desktop/gtk.nix (renamed from users/fcuny/desktop.nix) | 21 | ||||
-rw-r--r-- | users/fcuny/desktop/i3.nix (renamed from users/fcuny/i3.nix) | 0 | ||||
-rw-r--r-- | users/fcuny/desktop/media.nix (renamed from users/fcuny/media.nix) | 0 | ||||
-rw-r--r-- | users/fcuny/desktop/pass.nix (renamed from users/fcuny/pass.nix) | 0 | ||||
-rw-r--r-- | users/fcuny/desktop/terminal.nix (renamed from users/fcuny/terminal.nix) | 0 | ||||
-rw-r--r-- | users/fcuny/desktop/xdg.nix | 18 |
15 files changed, 58 insertions, 44 deletions
diff --git a/users/common/desktop/default.nix b/users/common/desktop/default.nix deleted file mode 100644 index c7ac619..0000000 --- a/users/common/desktop/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ ... }: - -{ - imports = [ - ./browser.nix - ]; -} diff --git a/users/fcuny/cli/default.nix b/users/fcuny/cli/default.nix new file mode 100644 index 0000000..ff2b89f --- /dev/null +++ b/users/fcuny/cli/default.nix @@ -0,0 +1,15 @@ +{ config, lib, pkgs, ...}: + +{ + imports = [ + ./git.nix + ./go.nix + ./tmux.nix + ./zsh.nix + ]; + + home.packages = [ + pkgs.jq + pkgs.ripgrep + ]; +} diff --git a/users/fcuny/git.nix b/users/fcuny/cli/git.nix index f7aeb27..f7aeb27 100644 --- a/users/fcuny/git.nix +++ b/users/fcuny/cli/git.nix diff --git a/users/fcuny/go.nix b/users/fcuny/cli/go.nix index 990b2ae..990b2ae 100644 --- a/users/fcuny/go.nix +++ b/users/fcuny/cli/go.nix diff --git a/users/fcuny/tmux.nix b/users/fcuny/cli/tmux.nix index 1a9a2d4..1a9a2d4 100644 --- a/users/fcuny/tmux.nix +++ b/users/fcuny/cli/tmux.nix diff --git a/users/fcuny/zsh.nix b/users/fcuny/cli/zsh.nix index 6b56d35..6b56d35 100644 --- a/users/fcuny/zsh.nix +++ b/users/fcuny/cli/zsh.nix diff --git a/users/fcuny/default.nix b/users/fcuny/default.nix index 9d2f194..755f59e 100644 --- a/users/fcuny/default.nix +++ b/users/fcuny/default.nix @@ -1,12 +1,11 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, desktop, ... }: { - programs.home-manager.enable = true; + imports = + [./cli ] + ++ (if desktop then [./desktop] else [ ]); - home.packages = [ - pkgs.jq - pkgs.ripgrep - ]; + programs.home-manager.enable = true; home.sessionVariables = { LANG = "en_US.UTF-8"; @@ -14,14 +13,4 @@ LC_ALL = "en_US.UTF-8"; EDITOR = "vim"; }; - - imports = [ - ../common/desktop - ./git.nix - ./go.nix - ./tmux.nix - ./zsh.nix - ./desktop.nix - ./pass.nix - ]; } diff --git a/users/common/desktop/browser.nix b/users/fcuny/desktop/browser.nix index cbd8d29..cbd8d29 100644 --- a/users/common/desktop/browser.nix +++ b/users/fcuny/desktop/browser.nix diff --git a/users/fcuny/desktop/default.nix b/users/fcuny/desktop/default.nix new file mode 100644 index 0000000..9f0bcf3 --- /dev/null +++ b/users/fcuny/desktop/default.nix @@ -0,0 +1,20 @@ +{ config, lib, pkgs, ... }: + +{ + imports = [ + ./browser.nix + ./i3.nix + ./media.nix + ./pass.nix + ./terminal.nix + ./gtk.nix + ./xdg.nix + ]; + + home.packages = [ + pkgs.gnome3.eog + pkgs.gnome3.evince + pkgs.gnome3.nautilus + pkgs.transmission-remote-gtk + ]; +} diff --git a/users/fcuny/desktop.nix b/users/fcuny/desktop/gtk.nix index b1f4caa..492c331 100644 --- a/users/fcuny/desktop.nix +++ b/users/fcuny/desktop/gtk.nix @@ -1,21 +1,6 @@ { config, lib, pkgs, ... }: { - xdg.enable = true; - - xdg.userDirs = { - enable = true; - createDirectories = true; - desktop = "\$HOME/documents"; - documents = "\$HOME/documents"; - download = "\$HOME/downloads"; - music = "\$HOME/media/music"; - pictures = "\$HOME/media/pictures"; - publicShare = "\$HOME/documents/public"; - templates = "\$HOME/documents/templates"; - videos = "\$HOME/media/videos"; - }; - # This is required for the gtk configuration below home.packages = [ pkgs.gnome3.dconf @@ -48,10 +33,4 @@ }; }; }; - - imports = [ - ./i3.nix - ./media.nix - ./terminal.nix - ]; } diff --git a/users/fcuny/i3.nix b/users/fcuny/desktop/i3.nix index dd01348..dd01348 100644 --- a/users/fcuny/i3.nix +++ b/users/fcuny/desktop/i3.nix diff --git a/users/fcuny/media.nix b/users/fcuny/desktop/media.nix index 57d0dd2..57d0dd2 100644 --- a/users/fcuny/media.nix +++ b/users/fcuny/desktop/media.nix diff --git a/users/fcuny/pass.nix b/users/fcuny/desktop/pass.nix index d430ec8..d430ec8 100644 --- a/users/fcuny/pass.nix +++ b/users/fcuny/desktop/pass.nix diff --git a/users/fcuny/terminal.nix b/users/fcuny/desktop/terminal.nix index ca3b2e8..ca3b2e8 100644 --- a/users/fcuny/terminal.nix +++ b/users/fcuny/desktop/terminal.nix diff --git a/users/fcuny/desktop/xdg.nix b/users/fcuny/desktop/xdg.nix new file mode 100644 index 0000000..7390811 --- /dev/null +++ b/users/fcuny/desktop/xdg.nix @@ -0,0 +1,18 @@ +{ config, lib, pkgs, ... }: + +{ + xdg.enable = true; + + xdg.userDirs = { + enable = true; + createDirectories = true; + desktop = "\$HOME/documents"; + documents = "\$HOME/documents"; + download = "\$HOME/downloads"; + music = "\$HOME/media/music"; + pictures = "\$HOME/media/pictures"; + publicShare = "\$HOME/documents/public"; + templates = "\$HOME/documents/templates"; + videos = "\$HOME/media/videos"; + }; +} |