From 5d3bed4c0721443f0be855c7e68a6fb8d5fd7988 Mon Sep 17 00:00:00 2001
From: Julien Malka <julien@malka.sh>
Date: Thu, 9 May 2024 00:26:09 +0200
Subject: [PATCH] chore: remove sops executable from home
---
machines/enigma/home-julien.nix | 177 +++++++++++++++----------------
machines/fischer/home-julien.nix | 144 ++++++++++++-------------
machines/tower/home-julien.nix | 16 ++-
machines/x2100/home-julien.nix | 169 ++++++++++++++---------------
4 files changed, 246 insertions(+), 260 deletions(-)
diff --git a/machines/enigma/home-julien.nix b/machines/enigma/home-julien.nix
index 6d06ffd..b5e6875 100644
--- a/machines/enigma/home-julien.nix
+++ b/machines/enigma/home-julien.nix
@@ -1,102 +1,95 @@
{ pkgs, ... }:
{
- luj.hmgr.julien =
- {
- home.stateVersion = "23.05";
- luj.programs.neovim.enable = true;
- luj.programs.ssh-client.enable = true;
- luj.programs.git.enable = true;
- luj.programs.gtk.enable = true;
- luj.programs.kitty.enable = true;
- luj.programs.emacs.enable = false;
- luj.programs.hyprland.enable = true;
- luj.programs.dunst.enable = true;
- luj.emails.enable = true;
+ luj.hmgr.julien = {
+ home.stateVersion = "23.05";
+ luj.programs.neovim.enable = true;
+ luj.programs.ssh-client.enable = true;
+ luj.programs.git.enable = true;
+ luj.programs.gtk.enable = true;
+ luj.programs.kitty.enable = true;
+ luj.programs.emacs.enable = false;
+ luj.programs.hyprland.enable = true;
+ luj.programs.dunst.enable = true;
+ luj.emails.enable = true;
- luj.programs.waybar = {
+ luj.programs.waybar = {
+ enable = true;
+ interfaceName = "";
+ };
+
+ programs.rofi = {
+ enable = true;
+ package = pkgs.rofi-wayland;
+ font = "Fira Font";
+ theme = "DarkBlue";
+ };
+
+ programs.direnv = {
+ enable = true;
+ enableZshIntegration = true;
+ nix-direnv.enable = true;
+ };
+
+ home.pointerCursor = {
+ gtk.enable = true;
+ name = "Adwaita";
+ package = pkgs.gnome.adwaita-icon-theme;
+ size = 15;
+ x11 = {
enable = true;
- interfaceName = "";
- };
-
- programs.rofi = {
- enable = true;
- package = pkgs.rofi-wayland;
- font = "Fira Font";
- theme = "DarkBlue";
- };
-
- programs.direnv = {
- enable = true;
- enableZshIntegration = true;
- nix-direnv.enable = true;
- };
-
- home.pointerCursor = {
- gtk.enable = true;
- name = "Adwaita";
- package = pkgs.gnome.adwaita-icon-theme;
- size = 15;
- x11 = {
- enable = true;
- defaultCursor = "Adwaita";
- };
- };
-
-
- programs.obs-studio = {
- enable = true;
- plugins = with pkgs; [ obs-studio-plugins.obs-vkcapture ];
- };
-
-
- home.packages = with pkgs;
- [
- du-dust
- kitty
- jq
- lazygit
- fira-code
- feh
- meld
- vlc
- nerdfonts
- jetbrains-mono
- cantarell-fonts
- unstable.nixd
- libreoffice
- unstable.signal-desktop
- font-awesome
- nodejs
- neomutt
- htop
- evince
- mosh
- zotero
- flameshot
- albert
- kitty
- networkmanagerapplet
- element-desktop
- xdg-utils
- sops
- step-cli
- scli
- jftui
- texlive.combined.scheme-full
- ];
-
- fonts.fontconfig.enable = true;
-
- programs.firefox = {
- enable = true;
- package = pkgs.firefox-esr;
- };
-
- home.keyboard = {
- layout = "fr";
+ defaultCursor = "Adwaita";
};
};
+ programs.obs-studio = {
+ enable = true;
+ plugins = with pkgs; [ obs-studio-plugins.obs-vkcapture ];
+ };
+ home.packages = with pkgs; [
+ du-dust
+ kitty
+ jq
+ lazygit
+ fira-code
+ feh
+ meld
+ vlc
+ nerdfonts
+ jetbrains-mono
+ cantarell-fonts
+ unstable.nixd
+ libreoffice
+ unstable.signal-desktop
+ font-awesome
+ nodejs
+ neomutt
+ htop
+ evince
+ mosh
+ zotero
+ flameshot
+ albert
+ kitty
+ networkmanagerapplet
+ element-desktop
+ xdg-utils
+ step-cli
+ scli
+ jftui
+ texlive.combined.scheme-full
+ ];
+
+ fonts.fontconfig.enable = true;
+
+ programs.firefox = {
+ enable = true;
+ package = pkgs.firefox-esr;
+ };
+
+ home.keyboard = {
+ layout = "fr";
+ };
+ };
}
diff --git a/machines/fischer/home-julien.nix b/machines/fischer/home-julien.nix
index 8f6401d..69a694d 100644
--- a/machines/fischer/home-julien.nix
+++ b/machines/fischer/home-julien.nix
@@ -1,84 +1,74 @@
{ pkgs, ... }:
{
- luj.hmgr.julien =
- {
- home.stateVersion = "22.11";
- luj.programs.neovim.enable = true;
- luj.programs.ssh-client.enable = true;
- luj.programs.git.enable = true;
- luj.programs.gtk.enable = true;
- luj.programs.waybar.enable = true;
- luj.programs.waybar.interfaceName = "enp0s13f0u1u4u4";
- luj.programs.kitty.enable = true;
- luj.programs.dunst.enable = true;
- luj.programs.firefox.enable = true;
- luj.emails.enable = true;
- luj.programs.sway = {
- enable = true;
- modifier = "Mod1";
- background = ./wallpaper.jpg;
- };
-
-
- programs.rofi = {
- enable = true;
- package = pkgs.rofi-wayland;
- font = "Fira Font";
- theme = "DarkBlue";
- };
-
-
- home.pointerCursor = {
- name = "Adwaita";
- package = pkgs.gnome.adwaita-icon-theme;
- size = 15;
- };
-
-
- home.packages = with pkgs;
- [
- du-dust
- kitty
- jq
- lazygit
- fira-code
- emacs29-pgtk
- feh
- meld
- vlc
- jftui
- nerdfonts
- cantarell-fonts
- libreoffice
- font-awesome
- nodejs
- neomutt
- htop
- evince
- mosh
- zotero
- flameshot
- networkmanagerapplet
- xdg-utils
- sops
- step-cli
- gh
- gh-dash
- cvc5
- signal-desktop
- scli
- texlive.combined.scheme-full
- ];
-
- fonts.fontconfig.enable = true;
-
- home.keyboard = {
- layout = "fr";
- };
-
-
+ luj.hmgr.julien = {
+ home.stateVersion = "22.11";
+ luj.programs.neovim.enable = true;
+ luj.programs.ssh-client.enable = true;
+ luj.programs.git.enable = true;
+ luj.programs.gtk.enable = true;
+ luj.programs.waybar.enable = true;
+ luj.programs.waybar.interfaceName = "enp0s13f0u1u4u4";
+ luj.programs.kitty.enable = true;
+ luj.programs.dunst.enable = true;
+ luj.programs.firefox.enable = true;
+ luj.emails.enable = true;
+ luj.programs.sway = {
+ enable = true;
+ modifier = "Mod1";
+ background = ./wallpaper.jpg;
};
+ programs.rofi = {
+ enable = true;
+ package = pkgs.rofi-wayland;
+ font = "Fira Font";
+ theme = "DarkBlue";
+ };
+ home.pointerCursor = {
+ name = "Adwaita";
+ package = pkgs.gnome.adwaita-icon-theme;
+ size = 15;
+ };
+
+ home.packages = with pkgs; [
+ du-dust
+ kitty
+ jq
+ lazygit
+ fira-code
+ emacs29-pgtk
+ feh
+ meld
+ vlc
+ jftui
+ nerdfonts
+ cantarell-fonts
+ libreoffice
+ font-awesome
+ nodejs
+ neomutt
+ htop
+ evince
+ mosh
+ zotero
+ flameshot
+ networkmanagerapplet
+ xdg-utils
+ step-cli
+ gh
+ gh-dash
+ cvc5
+ signal-desktop
+ scli
+ texlive.combined.scheme-full
+ ];
+
+ fonts.fontconfig.enable = true;
+
+ home.keyboard = {
+ layout = "fr";
+ };
+ };
}
diff --git a/machines/tower/home-julien.nix b/machines/tower/home-julien.nix
index 1ffb6af..479021b 100644
--- a/machines/tower/home-julien.nix
+++ b/machines/tower/home-julien.nix
@@ -1,15 +1,25 @@
{ pkgs, ... }:
{
-
luj.hmgr.julien = {
- home.packages = with pkgs; [ unstable.deploy-rs nixpkgs-review nixpkgs-fmt gh sops unstable.nix-eval-jobs nix-bisect htop hydrasect tmux lazygit jq ];
+ home.packages = with pkgs; [
+ unstable.deploy-rs
+ nixpkgs-review
+ nixpkgs-fmt
+ gh
+ unstable.nix-eval-jobs
+ nix-bisect
+ htop
+ hydrasect
+ tmux
+ lazygit
+ jq
+ ];
home.stateVersion = "22.11";
luj.programs.neovim.enable = true;
luj.programs.ssh-client.enable = true;
luj.programs.git.enable = true;
luj.programs.fish.enable = true;
luj.programs.pass.enable = true;
-
};
}
diff --git a/machines/x2100/home-julien.nix b/machines/x2100/home-julien.nix
index 9a7db9c..ad9a7f8 100644
--- a/machines/x2100/home-julien.nix
+++ b/machines/x2100/home-julien.nix
@@ -1,95 +1,88 @@
{ pkgs, ... }:
{
- luj.hmgr.julien =
- {
- home.stateVersion = "22.11";
- luj.programs.neovim.enable = true;
- luj.programs.ssh-client.enable = true;
- luj.programs.git.enable = true;
- luj.programs.gtk.enable = true;
- luj.programs.alacritty.enable = true;
- luj.programs.waybar.enable = true;
- luj.programs.waybar.interfaceName = "wlp3s0";
- luj.programs.kitty.enable = true;
- luj.programs.dunst.enable = true;
- luj.emails.enable = true;
- luj.programs.firefox.enable = true;
- luj.programs.pass.enable = true;
- luj.programs.sway = {
- enable = true;
- modifier = "Mod4";
- background = ./wallpaper.jpg;
- };
-
- programs.rofi = {
- enable = true;
- package = pkgs.rofi-wayland;
- font = "Fira Font";
- theme = "DarkBlue";
- };
-
- programs.direnv = {
- enable = true;
- enableZshIntegration = true;
- nix-direnv.enable = true;
- };
-
-
- home.pointerCursor = {
- name = "Adwaita";
- package = pkgs.gnome.adwaita-icon-theme;
- size = 15;
- x11 = {
- enable = true;
- defaultCursor = "Adwaita";
- };
- };
-
- home.packages = with pkgs;
- [
- du-dust
- kitty
- jq
- lazygit
- fira-code
- feh
- meld
- emacs29-pgtk
- vlc
- jftui
- nerdfonts
- libreoffice
- font-awesome
- cantarell-fonts
- roboto
- nodejs
- neomutt
- htop
- evince
- mosh
- zotero
- flameshot
- kitty
- networkmanagerapplet
- xdg-utils
- sops
- step-cli
- gh
- gh-dash
- cvc5
- signal-desktop
- scli
- texlive.combined.scheme-full
- ];
-
- fonts.fontconfig.enable = true;
-
- home.keyboard = {
- layout = "fr";
- };
-
+ luj.hmgr.julien = {
+ home.stateVersion = "22.11";
+ luj.programs.neovim.enable = true;
+ luj.programs.ssh-client.enable = true;
+ luj.programs.git.enable = true;
+ luj.programs.gtk.enable = true;
+ luj.programs.alacritty.enable = true;
+ luj.programs.waybar.enable = true;
+ luj.programs.waybar.interfaceName = "wlp3s0";
+ luj.programs.kitty.enable = true;
+ luj.programs.dunst.enable = true;
+ luj.emails.enable = true;
+ luj.programs.firefox.enable = true;
+ luj.programs.pass.enable = true;
+ luj.programs.sway = {
+ enable = true;
+ modifier = "Mod4";
+ background = ./wallpaper.jpg;
};
+ programs.rofi = {
+ enable = true;
+ package = pkgs.rofi-wayland;
+ font = "Fira Font";
+ theme = "DarkBlue";
+ };
+ programs.direnv = {
+ enable = true;
+ enableZshIntegration = true;
+ nix-direnv.enable = true;
+ };
+
+ home.pointerCursor = {
+ name = "Adwaita";
+ package = pkgs.gnome.adwaita-icon-theme;
+ size = 15;
+ x11 = {
+ enable = true;
+ defaultCursor = "Adwaita";
+ };
+ };
+
+ home.packages = with pkgs; [
+ du-dust
+ kitty
+ jq
+ lazygit
+ fira-code
+ feh
+ meld
+ emacs29-pgtk
+ vlc
+ jftui
+ nerdfonts
+ libreoffice
+ font-awesome
+ cantarell-fonts
+ roboto
+ nodejs
+ neomutt
+ htop
+ evince
+ mosh
+ zotero
+ flameshot
+ kitty
+ networkmanagerapplet
+ xdg-utils
+ step-cli
+ gh
+ gh-dash
+ cvc5
+ signal-desktop
+ scli
+ texlive.combined.scheme-full
+ ];
+
+ fonts.fontconfig.enable = true;
+
+ home.keyboard = {
+ layout = "fr";
+ };
+ };
}