nix: revamp home-manager profiles
authorJulien Moutinho <julm+julm-nix@sourcephile.fr>
Mon, 22 Nov 2021 04:53:23 +0000 (05:53 +0100)
committerJulien Moutinho <julm+julm-nix@sourcephile.fr>
Wed, 24 Nov 2021 10:14:36 +0000 (11:14 +0100)
76 files changed:
.reuse/dep5
home-manager/options.nix [moved from homes/options.nix with 100% similarity]
home-manager/profiles/Xmodmap [moved from homes/programs/Xmodmap with 100% similarity]
home-manager/profiles/aria2c.nix [new file with mode: 0644]
home-manager/profiles/bash.nix [moved from homes/programs/bash.nix with 97% similarity]
home-manager/profiles/chat.nix [moved from profiles/chat.nix with 100% similarity]
home-manager/profiles/developing.nix [moved from profiles/developing.nix with 72% similarity]
home-manager/profiles/direnv.nix [moved from homes/programs/direnv.nix with 92% similarity]
home-manager/profiles/drawing.nix [moved from profiles/drawing.nix with 100% similarity]
home-manager/profiles/emacs.nix [moved from homes/programs/emacs.nix with 74% similarity]
home-manager/profiles/emacs/cli.el [moved from homes/programs/emacs/cli.el with 100% similarity]
home-manager/profiles/emacs/config.el [moved from homes/programs/emacs/config.el with 99% similarity]
home-manager/profiles/emacs/custom.el [moved from homes/programs/emacs/custom.el with 100% similarity]
home-manager/profiles/emacs/elfeed.org [moved from homes/programs/emacs/elfeed.org with 100% similarity]
home-manager/profiles/emacs/init.el [moved from homes/programs/emacs/init.el with 100% similarity]
home-manager/profiles/emacs/packages.el [moved from homes/programs/emacs/packages.el with 100% similarity]
home-manager/profiles/essential.nix [new file with mode: 0644]
home-manager/profiles/firefox.nix [moved from homes/programs/firefox.nix with 97% similarity]
home-manager/profiles/firefox/userChrome.css [moved from homes/programs/firefox/userChrome.css with 100% similarity]
home-manager/profiles/gaming.nix [moved from profiles/gaming.nix with 100% similarity]
home-manager/profiles/ghc.nix [moved from homes/programs/ghc.nix with 100% similarity]
home-manager/profiles/git.nix [moved from homes/programs/git.nix with 99% similarity]
home-manager/profiles/gnupg.nix [moved from homes/programs/gnupg.nix with 96% similarity]
home-manager/profiles/gnupg/keyserver.pem [moved from homes/programs/gnupg/keyserver.pem with 100% similarity]
home-manager/profiles/graphical.nix [moved from profiles/graphical.nix with 96% similarity]
home-manager/profiles/htop.nix [moved from homes/programs/htop.nix with 94% similarity]
home-manager/profiles/irssi.nix [moved from homes/programs/irssi.nix with 97% similarity]
home-manager/profiles/irssi/default.theme [moved from homes/programs/irssi/default.theme with 100% similarity]
home-manager/profiles/latex.nix [moved from profiles/latex.nix with 100% similarity]
home-manager/profiles/mcabberrc [moved from homes/programs/mcabberrc with 100% similarity]
home-manager/profiles/mpv.nix [moved from homes/programs/mpv.nix with 85% similarity]
home-manager/profiles/mutt.nix [new file with mode: 0644]
home-manager/profiles/networking.nix [moved from profiles/networking.nix with 90% similarity]
home-manager/profiles/office.nix [moved from profiles/office.nix with 68% similarity]
home-manager/profiles/redshift.nix [moved from homes/programs/redshift.nix with 93% similarity]
home-manager/profiles/sharing.nix [moved from profiles/sharing.nix with 100% similarity]
home-manager/profiles/ssh.nix [moved from homes/programs/ssh.nix with 100% similarity]
home-manager/profiles/stack/config.yaml [moved from homes/programs/stack/config.yaml with 100% similarity]
home-manager/profiles/tmux.conf [moved from homes/programs/tmux.conf with 100% similarity]
home-manager/profiles/tmux.nix [moved from homes/programs/tmux.nix with 84% similarity]
home-manager/profiles/urxvt.nix [moved from homes/programs/urxvt.nix with 98% similarity]
home-manager/profiles/video.nix [moved from profiles/video.nix with 80% similarity]
home-manager/profiles/vim.nix [moved from homes/programs/vim.nix with 99% similarity]
home-manager/profiles/vim/LanguageClient.vim [moved from homes/programs/vim/LanguageClient.vim with 100% similarity]
home-manager/profiles/vim/ale.vim [moved from homes/programs/vim/ale.vim with 100% similarity]
home-manager/profiles/vim/coc-settings.json [moved from homes/programs/vim/coc-settings.json with 100% similarity]
home-manager/profiles/vim/coc.vim [moved from homes/programs/vim/coc.vim with 100% similarity]
home-manager/profiles/vim/init.vim [moved from homes/programs/vim/init.vim with 100% similarity]
home-manager/profiles/vim/syntastic.vim [moved from homes/programs/vim/syntastic.vim with 100% similarity]
home-manager/profiles/web.nix [moved from profiles/web.nix with 100% similarity]
home-manager/profiles/xfce.nix [moved from profiles/xfce.nix with 100% similarity]
home-manager/profiles/xmonad.nix [moved from homes/programs/xmonad.nix with 87% similarity]
home-manager/profiles/xmonad/xmobar.hs [moved from homes/programs/xmonad/xmobar.hs with 100% similarity]
home-manager/profiles/xmonad/xmonad.hs [moved from homes/programs/xmonad/xmonad.hs with 100% similarity]
home-manager/profiles/zsh.nix [moved from homes/programs/zsh.nix with 100% similarity]
homes/julm.nix
homes/julm/emacs/config.el
homes/julm/emacs/init.el [deleted file]
homes/julm/emacs/packages.el [deleted file]
homes/julm/hosts/carotte.nix
homes/julm/hosts/losurdo.nix
homes/julm/hosts/mermet.nix
homes/julm/hosts/oignon.nix
homes/julm/mutt.nix
homes/programs.nix [deleted file]
homes/programs/aria2c.nix [deleted file]
homes/sevy.nix
homes/sevy/hosts/patate.nix
hosts/patate.nix
private/root/oignon/nix/binary-cache/priv.pem [new file with mode: 0644]
private/root/oignon/nix/binary-cache/pub.pem [new file with mode: 0644]
private/root/oignon/wireguard/wg-intra/privateKey [new file with mode: 0644]
private/root/patate/wireguard/wg-intra/privateKey [new file with mode: 0644]
profiles/essential.nix [deleted file]
profiles/security.nix [deleted file]
profiles/system.nix [deleted file]

index a0c9c9878f56b1ce769b5dddf803b242b2a8ec85..34ffe54f01c6b956f357d0234a630c29a92ffdd3 100644 (file)
@@ -7,7 +7,7 @@ Files: *.lock *.pem .envrc .gitattributes .gitignore .gitmodules install Makefil
 Copyright: Julien Moutinho <julm+julm-nix@sourcephile.fr>
 License: CC0-1.0
 
-Files: *.nix homes/* hosts/* nixos/*
+Files: *.nix homes/* home-manager/* hosts/* nixos/*
 Copyright: Julien Moutinho <julm+julm-nix@sourcephile.fr>
 License: AGPL-3.0-or-later
 
similarity index 100%
rename from homes/options.nix
rename to home-manager/options.nix
diff --git a/home-manager/profiles/aria2c.nix b/home-manager/profiles/aria2c.nix
new file mode 100644 (file)
index 0000000..dd2ac1b
--- /dev/null
@@ -0,0 +1,11 @@
+{ pkgs, lib, config, ... }:
+{
+home.packages = [ pkgs.aria2 ];
+xdg.configFile."aria2/aria2.conf".text = ''
+  continue=true
+  # Usually not great for compression by the filesystem (ZFS/Btrfs).
+  file-allocation=none
+  max-connection-per-server=16
+  min-split-size=1M
+'';
+}
similarity index 97%
rename from homes/programs/bash.nix
rename to home-manager/profiles/bash.nix
index db8cb2fc0360eeebedb2dd41aec26fffe49a3d0d..6aaf62d44d5c4841b092090f14a99bb84253791f 100644 (file)
@@ -1,6 +1,7 @@
 { pkgs, lib, config, ... }:
 {
 programs.bash = {
+  enable = lib.mkDefault true;
   shellAliases = {
     cl = "clear";
     eic = "edit-in-commit";
@@ -20,6 +21,7 @@ programs.bash = {
     nixos-clean="sudo nix-collect-garbage -d";
     nixos-history="sudo nix-env --list-generations --profile /nix/var/nix/profiles/system";
     nixos-rollback="sudo nixos-rebuild switch --rollback";
+    pass-gen = "tr -d -C A-Za-z0-9_- </dev/urandom | head -c";
     rsync = "rsync --no-inc-recursive --info=progress2 --inplace --partial";
     s="sudo systemctl";
     st="sudo systemctl status";
@@ -105,7 +107,7 @@ home.sessionVariables = {
   PS1 = ''\[\033[1;32m\]\[\e]0;\u@\h: \w\a\]\W\[\033[0m\] \$(e=\$?; if [ \$e != 0 ]; then echo '\[\e[0;91m\]'\$e'\[\e[0m\]'; fi)\$ '';
 };
 programs.readline = {
-  enable = lib.mkDefault config.programs.bash.enable;
+  enable = lib.mkDefault true;
   includeSystemConfig = true;
   bindings = {
     "\\eOF"    = "end-of-line";
similarity index 72%
rename from profiles/developing.nix
rename to home-manager/profiles/developing.nix
index c11190de183e6516686f7fa5145db40f34c051d4..241d317ca625e8366a035622112619a16a8d0bd6 100644 (file)
@@ -1,16 +1,9 @@
 { pkgs, lib, config, nixosConfig, ... }:
 {
 manual.manpages.enable = lib.mkDefault true;
-programs.direnv.enable = lib.mkDefault true;
-programs.doom-emacs.enable = lib.mkDefault true;
-programs.git.enable = lib.mkDefault true;
-programs.gpg.enable = lib.mkDefault true;
+programs.git.package = pkgs.gitFull;
 programs.man.enable = lib.mkDefault true;
-#programs.neovim.enable = lib.mkDefault true;
-programs.vim.enable = lib.mkDefault true;
-services.gpg-agent.enable = lib.mkDefault config.programs.gpg.enable;
 home.packages = [
-  pkgs.binutils
   pkgs.binwalk
   pkgs.cachix
   pkgs.exa
similarity index 92%
rename from homes/programs/direnv.nix
rename to home-manager/profiles/direnv.nix
index 7c3e8f0a21b8f437a9d8ec804cf0469cd89f58af..93f5c8991f7d5f2687f50e044a5f5e781f1c4ebe 100644 (file)
@@ -1,4 +1,8 @@
 {
+programs.direnv.enable = true;
+programs.direnv.nix-direnv.enable = true;
+programs.direnv.nix-direnv.enableFlakes = true;
+
 xdg.configFile."direnv/direnvrc".text = ''
   : ''${XDG_CACHE_HOME:=$HOME/.cache}
   declare -A direnv_layout_dirs
@@ -9,6 +13,4 @@ xdg.configFile."direnv/direnvrc".text = ''
       )}"
   }
 '';
-programs.direnv.nix-direnv.enable = true;
-programs.direnv.nix-direnv.enableFlakes = true;
 }
similarity index 74%
rename from homes/programs/emacs.nix
rename to home-manager/profiles/emacs.nix
index ff5f4066fe41f0075e87fec13884036826070c6a..2056dac36dd159e615aff2ee93cc44e84de01fbd 100644 (file)
@@ -1,9 +1,5 @@
 { inputs, pkgs, lib, config, ... }:
 {
-options.programs.doom-emacs = {
-  enable = lib.mkEnableOption "doom-emacs";
-};
-config = lib.mkIf config.programs.doom-emacs.enable {
 /*
 imports = [
   inputs.nix-doom-emacs.hmModule
@@ -15,12 +11,12 @@ programs.doom-emacs = {
 };
 */
 services.emacs = {
-  enable = config.programs.doom-emacs.enable;
+  enable = true;
   package = config.programs.emacs.package;
   client.enable = true;
   socketActivation.enable = true;
 };
-fonts.fontconfig.enable = lib.mkDefault config.programs.doom-emacs.enable;
+fonts.fontconfig.enable = lib.mkDefault true;
 home.packages = with pkgs; [
   # DOOM Emacs dependencies
   binutils
@@ -42,10 +38,10 @@ home.sessionVariables = {
   DOOMLOCALDIR = "${config.xdg.configHome}/doom-local";
 };
 xdg.configFile = {
-  "doom-config/cli.el".source = emacs/cli.el;
-  "doom-config/config.el".source = emacs/config.el;
-  "doom-config/init.el".source = emacs/init.el;
-  "doom-config/packages.el".source = emacs/packages.el;
+  "doom-config/cli.el".text = lib.readFile emacs/cli.el;
+  "doom-config/config.el".text = lib.readFile emacs/config.el;
+  "doom-config/init.el".text = lib.readFile emacs/init.el;
+  "doom-config/packages.el".text = lib.readFile emacs/packages.el;
   "emacs" = {
     source = inputs.doom-emacs;
     onChange = "${pkgs.writeShellScript "doom-change" ''
@@ -62,5 +58,4 @@ xdg.configFile = {
 xresources.properties = {
   #"Emacs.FontBackend" = "xft";
 };
-};
 }
similarity index 99%
rename from homes/programs/emacs/config.el
rename to home-manager/profiles/emacs/config.el
index 3e7c997cf7a03cf6f07848412351e9feea92843a..ba79f2d9a27bbf3a3b7641b2412ff062d47973a5 100644 (file)
@@ -3,10 +3,6 @@
 ;; DOC: https://git.v0.io/hlissner/doom-emacs/src/commit/a680a4c96d2b57fcb75635bd1a918e1235e72890/docs/api.org
 ;; DOC: https://github.com/daviwil/emacs-from-scratch
 
-(setq user-full-name "Julien Moutinho"
-      user-mail-address "julm@sourcephile.fr"
-      )
-
 ;; Line numbers are pretty slow all around. The performance boost of
 ;; disabling them outweighs the utility of always keeping them on.
 (setq display-line-numbers-type nil)
diff --git a/home-manager/profiles/essential.nix b/home-manager/profiles/essential.nix
new file mode 100644 (file)
index 0000000..078bbc4
--- /dev/null
@@ -0,0 +1,61 @@
+{ pkgs, lib, config, nixosConfig, ... }:
+{
+imports = [
+  ./bash.nix
+  ./direnv.nix
+  ./git.nix
+  ./gnupg.nix
+  ./htop.nix
+  ./ssh.nix
+  ./tmux.nix
+];
+programs.bat.enable = lib.mkDefault true;
+programs.git.package = lib.mkDefault pkgs.gitMinimal;
+programs.home-manager.enable = true;
+home.packages = [
+  nixosConfig.boot.kernelPackages.cpupower
+  pkgs.acpi
+  pkgs.binutils
+  pkgs.cryptsetup
+  pkgs.dstat
+  pkgs.e2fsprogs
+  pkgs.file
+  pkgs.hwinfo
+  pkgs.iotop
+  pkgs.lf
+  pkgs.lm_sensors
+  pkgs.lsof
+  pkgs.lsscsi
+  pkgs.mkpasswd
+  pkgs.multitail
+  pkgs.ncdu
+  pkgs.nix-du
+  pkgs.nload
+  pkgs.parted
+  pkgs.pass
+  pkgs.pciutils
+  pkgs.powertop
+  pkgs.procps
+  pkgs.pstree
+  pkgs.pv
+  pkgs.smartmontools
+  pkgs.smem
+  pkgs.strace
+  pkgs.stress-ng
+  pkgs.tree
+  pkgs.usbutils
+  pkgs.utillinux
+  pkgs.which
+  pkgs.xdg_utils
+] ++ lib.optionals nixosConfig.services.xserver.enable [
+  pkgs.gparted
+];
+home.sessionPath = [ "${config.home.homeDirectory}/bin" ];
+home.sessionVariables = {
+  EDITOR = "vim";
+  LANG = "fr_FR.UTF-8";
+  LESS = "-FRSX";
+  LOCALE_ARCHIVE = "${pkgs.glibcLocales}/lib/locale/locale-archive";
+  MANPAGER = "less";
+};
+}
similarity index 97%
rename from homes/programs/firefox.nix
rename to home-manager/profiles/firefox.nix
index 6fa363d045e8a70e869cae4df34b08854b9529ed..39143156e07d404feea66448128e4c0048e734bd 100644 (file)
@@ -4,6 +4,7 @@ home.packages = lib.mkIf config.programs.firefox.enable [
   pkgs.tor-browser-bundle-bin
 ];
 programs.firefox = {
+  enable = lib.mkDefault true;
   /*
   extensions =
     with pkgs.nur.repos.rycee.firefox-addons; [
similarity index 99%
rename from homes/programs/git.nix
rename to home-manager/profiles/git.nix
index d0910637995a3fc2bb55d1b17a5be5ce39232fd9..8f32b910bc6caac70fd1dab0dcfae73a4ab967e5 100644 (file)
@@ -1,6 +1,7 @@
 { pkgs, lib, config, ... }:
 {
 programs.git = {
+  enable = true;
   ignores = [ "*~" "*.swp" ];
   package = lib.mkDefault pkgs.gitFull;
   aliases = {
similarity index 96%
rename from homes/programs/gnupg.nix
rename to home-manager/profiles/gnupg.nix
index 7b7dc2b0ae44d9cd69e8565b4a52d2fc695572dd..7b1ae77594a4066281d63944e714b231bd01ddcf 100644 (file)
@@ -6,10 +6,12 @@ home.activation.gnupg = lib.hm.dag.entryAfter ["writeBoundary"] ''
 '';
 */
 services.gpg-agent = {
+  enable = true;
   enableSshSupport = true;
   enableExtraSocket = true;
   pinentryFlavor = lib.mkDefault (if nixosConfig.services.xserver.enable then "gtk2" else "curses");
 };
+programs.gpg.enable = true;
 programs.gpg.settings = {
   #auto-key-locate = "keyserver";
   auto-key-locate = false;
similarity index 96%
rename from profiles/graphical.nix
rename to home-manager/profiles/graphical.nix
index 020eff7bdccba4de7763d731b740460a15de5361..623b87e0ad58053ae972e2016efeeff4ba4cfaa6 100644 (file)
@@ -1,5 +1,8 @@
 { pkgs, lib, config, ... }:
 {
+imports = [
+  ./redshift.nix
+];
 gtk.enable = true;
 home.packages = [
   pkgs.arandr
@@ -16,9 +19,6 @@ home.packages = [
   pkgs.xsecurelock
   pkgs.xss-lock
 ];
-home.sessionVariables = {
-  EDITOR = "vim -g";
-};
 services.redshift.enable = lib.mkDefault true;
 services.screen-locker = {
   enable = true;
similarity index 94%
rename from homes/programs/htop.nix
rename to home-manager/profiles/htop.nix
index 143bf14bdc3e0e2aa03000cca0c17478de35f9fa..232246868244555a61f7eb32db9b7e3fc31a9a6b 100644 (file)
@@ -1,10 +1,12 @@
-{ lib, ...}:
+{ pkgs, lib, config, ...}:
 {
 # This must appear before "column_meters_*" options
 xdg.configFile."htop/htoprc".text = lib.mkBefore ''
   header_layout=two_50_50
 '';
+home.packages = [ pkgs.htop ];
 programs.htop = {
+  enable = lib.mkDefault true;
   settings = {
     account_guest_in_cpu_meter = false;
     all_branches_collapsed = false;
similarity index 97%
rename from homes/programs/irssi.nix
rename to home-manager/profiles/irssi.nix
index 95171ead008207346b820c6a2349952c649eea5c..506c965c2c22da3eed19e2790df5cfa3021212eb 100644 (file)
@@ -1,5 +1,6 @@
 { pkgs, lib, config, ... }:
 {
+programs.irssi.enable = true;
 home.file.".irssi/default.theme".source = irssi/default.theme;
 home.file.".irssi/startup".text = ''
   load otr
similarity index 85%
rename from homes/programs/mpv.nix
rename to home-manager/profiles/mpv.nix
index b6c15fc085fabb199b79c5cad7a72df01ac61a35..607d208104fdc917797a00ba7685eaf600718d3e 100644 (file)
@@ -1,4 +1,8 @@
+{ pkgs, lib, config, ... }:
 {
+home.packages = [
+  pkgs.mpv
+];
 xdg.configFile."mpv/mpv.conf".text = ''
   hwdec=auto-safe
   profile=gpu-hq
diff --git a/home-manager/profiles/mutt.nix b/home-manager/profiles/mutt.nix
new file mode 100644 (file)
index 0000000..da85b2b
--- /dev/null
@@ -0,0 +1,6 @@
+{ pkgs, lib, config, ... }:
+{
+home.packages = [
+  pkgs.neomutt
+];
+}
similarity index 90%
rename from profiles/networking.nix
rename to home-manager/profiles/networking.nix
index 013301134abd903f4726fe9ed5d231714eaf29c2..249de5ac4f2b6a45e5eb510ac33527dab0d94e46 100644 (file)
@@ -1,6 +1,5 @@
 { pkgs, lib, config, ... }:
 {
-programs.git.enable = lib.mkDefault true;
 programs.ssh.enable = lib.mkDefault true;
 home.packages = [
   pkgs.bmon
similarity index 68%
rename from profiles/office.nix
rename to home-manager/profiles/office.nix
index f54602364a6bb33ba529a73832c8fb1191162a63..fa859a6dbdbdc8fdcfbc31f6d171ea68f49735ac 100644 (file)
@@ -3,18 +3,27 @@
 home.packages = [
   pkgs.aspell
   pkgs.aspellDicts.fr
+  pkgs.convmv
+  pkgs.git-crypt
+  pkgs.go-mtpfs
   pkgs.hunspell
   pkgs.hunspellDicts.fr-moderne
+  pkgs.ntfs3g
+  pkgs.p7zip
   pkgs.pdftk
   pkgs.poppler_utils
+  pkgs.rdfind
+  pkgs.yubikey-personalization
 ] ++ lib.optionals nixosConfig.services.xserver.enable [
   pkgs.calibre
   pkgs.djview
   pkgs.evince
   pkgs.geeqie
   pkgs.gpicview
+  pkgs.keepass
   pkgs.libreoffice
   pkgs.thunderbird
   pkgs.xsane
+  pkgs.yubikey-personalization-gui
 ];
 }
similarity index 93%
rename from homes/programs/redshift.nix
rename to home-manager/profiles/redshift.nix
index d226c5809990ca5b457b0c763dcf2f55c73937d0..9abdbf7cb5476f763387eb83bd77862ed631d595 100644 (file)
@@ -1,6 +1,7 @@
 { pkgs, lib, config, ... }:
 {
 services.redshift = {
+  enable = true;
   latitude = lib.mkDefault "-45.7800";
   longitude = lib.mkDefault "1.9700";
   temperature.day = lib.mkDefault 6500;
similarity index 84%
rename from homes/programs/tmux.nix
rename to home-manager/profiles/tmux.nix
index 0a2aeed1b71e948c4c336dfd5b8ec102883a4208..6d2639506f1a7ff22db10199a7653fc83198dc77 100644 (file)
@@ -1,5 +1,7 @@
+{ pkgs, lib, config, ... }:
 {
 programs.tmux = {
+  enable = lib.mkDefault true;
   baseIndex = 1;
   clock24 = true;
   customPaneNavigationAndResize = true;
similarity index 98%
rename from homes/programs/urxvt.nix
rename to home-manager/profiles/urxvt.nix
index fff32f878ab20e5b6d601c08bf230f9a81f8807a..7cfda46885ddb33dc30318f3c5a4a5911d6c70a1 100644 (file)
@@ -1,4 +1,8 @@
+{ pkgs, lib, config, ... }:
 {
+home.packages = [
+  pkgs.rxvt-unicode
+];
 xresources.properties = {
   "URxvt*background" = "black";
   "URxvt*buffered" = "true";
similarity index 80%
rename from profiles/video.nix
rename to home-manager/profiles/video.nix
index 30b18e1ec4a5d2c2c2308006e0fc7be17bf47652..d92699049c5cd71e90bdaef5644f6fa5d9aa683d 100644 (file)
@@ -1,12 +1,14 @@
 { pkgs, lib, config, ... }:
 {
+imports = [
+  ./aria2c.nix
+  ./mpv.nix
+];
 home.packages = [
-  pkgs.aria2
   pkgs.ffmpeg
   pkgs.gtk-pipe-viewer
   pkgs.libdvdcss
   pkgs.mplayer
-  pkgs.mpv
   pkgs.opusTools
   pkgs.podl
   pkgs.vlc
similarity index 99%
rename from homes/programs/vim.nix
rename to home-manager/profiles/vim.nix
index 433fb8d201fd134881b3980e573b72ca031235dd..87b0158d2c99e7084ad20723ecc84c281d4d0900 100644 (file)
@@ -2,6 +2,7 @@
 let inherit (builtins) readFile; in
 {
 programs.vim = {
+  enable = true;
   extraConfig =
     readFile vim/init.vim
     #+ readFile home/vim/syntastic.vim
similarity index 87%
rename from homes/programs/xmonad.nix
rename to home-manager/profiles/xmonad.nix
index c4780eced6748a219ef2324eff8174d84f2cee6f..1e7754462fe4cf70dec5dad1ace5dac5eb25e4d8 100644 (file)
@@ -1,10 +1,8 @@
 { pkgs, lib, config, ... }:
 {
-config = lib.mkIf config.xsession.windowManager.xmonad.enable {
-home.file = {
-  ".xmonad/xmobar.hs".source = xmonad/xmobar.hs;
-};
+home.file.".xmonad/xmobar.hs".source = xmonad/xmobar.hs;
 xsession = {
+  enable = true;
   scriptPath = ".hm-xsession";
   initExtra = ''
     xset dpms 380 640 1200
@@ -14,6 +12,7 @@ xsession = {
     ${pkgs.pasystray}/bin/pasystray &
   '';
   windowManager.xmonad = {
+    enable = true;
     haskellPackages = pkgs.haskellPackages;
     #extraPackages = haskellPackages: [ ];
     enableContribAndExtras = true;
@@ -27,7 +26,6 @@ home.packages = [
   pkgs.light
   pkgs.mate.caja-with-extensions
   (pkgs.writeShellScriptBin "mate-terminal" ''exec ${pkgs.rxvt-unicode}/bin/urxvtc -hold "$@"'')
-  pkgs.rxvt-unicode
   pkgs.scrot
   pkgs.stalonetray
   pkgs.wmname
@@ -45,5 +43,4 @@ xresources.properties = {
   "Xft.rgba" = "rgb";
   #"Xft.embolden" = true;
 };
-};
 }
index 7ebfe3f6bd4ff60863d53ac9e7c77778ba92a4c3..1c59b9bf5858b02b6b3b27c2d8464e7c903cdfb5 100644 (file)
@@ -1,8 +1,9 @@
 { pkgs, lib, config, hostName, ... }:
 {
 imports = [
-  ./programs.nix
-  ./options.nix
+  ../home-manager/profiles/essential.nix
+  ../home-manager/profiles/vim.nix
+  ../home-manager/options.nix
   julm/mutt.nix
   (import (julm/hosts + "/${hostName}.nix"))
 ];
@@ -18,7 +19,7 @@ programs.firefox.profiles =
       "security.identityblock.show_extended_validation" = true;
       "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
     };
-    userChrome = builtins.readFile programs/firefox/userChrome.css;
+    userChrome = lib.readFile ../home-manager/profiles/firefox/userChrome.css;
   }; in {
   "rp4xy6ye.2021" = lib.mkMerge [defaultProfile {
     id = 0;
@@ -44,7 +45,7 @@ services.gpg-agent.sshKeys = [
   #                SHA256:bCfwfC8MQTjm6c1HcMLtzvGpnWRdqLwe/bvbh2jsNaA
   "F6CCA60CF05FADAE911CFBEC0BCDED22F40A19FD"
 ];
-programs.irssi.extraConfig = builtins.readFile julm/irssi/config;
+programs.irssi.extraConfig = lib.readFile julm/irssi/config;
 home.file.".irssi/passwd".text = ''
   FreeNode   : ${pkgs.pass}/bin/pass freenode.net/irc/julm
   GeekNode   : ${pkgs.pass}/bin/pass geeknode.org/irc/julm
@@ -64,10 +65,6 @@ programs.git = {
   userEmail = "julm@sourcephile.fr";
   signing.key = "0x7182433A39582282929B2A222E3618DD0D087650";
   signing.signByDefault = false;
-  package =
-    if lib.elem hostName [ "losurdo" "oignon" ]
-    then pkgs.gitFull
-    else pkgs.gitMinimal;
   extraConfig = {
     sendemail.smtpEncryption = "ssl"; # Yes, "ssl", not "tls" which does not work because it expects STARTTLS.
     sendemail.smtpServer = "mail.sourcephile.fr";
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..c2d631ba98fb3e60415fed4a20c4c34bd637c801 100644 (file)
@@ -0,0 +1,4 @@
+(setq user-full-name "Julien Moutinho"
+      user-mail-address "julm@sourcephile.fr"
+      )
+
diff --git a/homes/julm/emacs/init.el b/homes/julm/emacs/init.el
deleted file mode 100644 (file)
index 0ba8bda..0000000
+++ /dev/null
@@ -1,210 +0,0 @@
-;;; init.el -*- lexical-binding: t; -*-
-
-;; This file controls what Doom modules are enabled and what order they load
-;; in. Remember to run 'doom sync' after modifying it!
-
-;; NOTE Press 'SPC h d h' (or 'C-h d h' for non-vim users) to access Doom's
-;;      documentation. There you'll find a "Module Index" link where you'll find
-;;      a comprehensive list of Doom's modules and what flags they support.
-
-;; NOTE Move your cursor over a module's name (or its flags) and press 'K' (or
-;;      'C-c c k' for non-vim users) to view its documentation. This works on
-;;      flags as well (those symbols that start with a plus).
-;;
-;;      Alternatively, press 'gd' (or 'C-c c d') on a module to browse its
-;;      directory (for easy access to its source code).
-
-(doom! :input
-  ;;chinese
-  ;;japanese
-  ;;layout            ; auie,ctsrnm is the superior home row
-
-  :completion
-  company           ; the ultimate code completion backend
-  ;;helm              ; the *other* search engine for love and life
-  ;;ido               ; the other *other* search engine...
-  ivy               ; a search engine for love and life
-
-  :ui
-  ;;deft              ; notational velocity for Emacs
-  doom              ; what makes DOOM look the way it does
-  doom-dashboard    ; a nifty splash screen for Emacs
-  doom-quit         ; DOOM quit-message prompts when you quit Emacs
-  ;;(emoji +unicode)  ; 🙂
-  ;;fill-column       ; a `fill-column' indicator
-  hl-todo           ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
-  ;;hydra
-  ;;indent-guides     ; highlighted indent columns
-  ;;ligatures         ; ligatures and symbols to make your code pretty again
-  ;;minimap           ; show a map of the code on the side
-  modeline          ; snazzy, Atom-inspired modeline, plus API
-  ;;nav-flash         ; blink cursor line after big motions
-  ;;neotree           ; a project drawer, like NERDTree for vim
-  ophints           ; highlight the region an operation acts on
-  (popup +defaults)   ; tame sudden yet inevitable temporary windows
-  ;;tabs              ; a tab bar for Emacs
-  (treemacs +lsp)     ; a project drawer, like neotree but cooler
-  ;;unicode           ; extended unicode support for various languages
-  vc-gutter         ; vcs diff in the fringe
-  vi-tilde-fringe   ; fringe tildes to mark beyond EOB
-  ;;window-select     ; visually switch windows
-  workspaces        ; tab emulation, persistence & separate workspaces
-  ;;zen               ; distraction-free coding or writing
-
-  :editor
-  (evil +everywhere); come to the dark side, we have cookies
-  file-templates    ; auto-snippets for empty files
-  fold              ; (nigh) universal code folding
-  ;;(format +onsave)  ; automated prettiness
-  ;;god               ; run Emacs commands without modifier keys
-  ;;lispy             ; vim for lisp, for people who don't like vim
-  ;;multiple-cursors  ; editing in many places at once
-  ;;objed             ; text object editing for the innocent
-  ;;parinfer          ; turn lisp into python, sort of
-  ;;rotate-text       ; cycle region at point between text candidates
-  snippets          ; my elves. They type so I don't have to
-  ;;word-wrap         ; soft wrapping with language-aware indent
-
-  :emacs
-  dired             ; making dired pretty [functional]
-  electric          ; smarter, keyword-based electric-indent
-  ;;ibuffer         ; interactive buffer management
-  undo              ; persistent, smarter undo for your inevitable mistakes
-  vc                ; version-control and Emacs, sitting in a tree
-
-  :term
-  ;;eshell            ; the elisp shell that works everywhere
-  ;;shell             ; simple shell REPL for Emacs
-  ;;term              ; basic terminal emulator for Emacs
-  ;;vterm             ; the best terminal emulation in Emacs
-
-  :checkers
-  syntax              ; tasing you for every semicolon you forget
-  ;;(spell +flyspell) ; tasing you for misspelling mispelling
-  ;;grammar           ; tasing grammar mistake every you make
-
-  :tools
-  ;;ansible
-  ;;debugger          ; FIXME stepping through code, to help you add bugs
-  ;;direnv
-  ;;docker
-  ;;editorconfig      ; let someone else argue about tabs vs spaces
-  ;;ein               ; tame Jupyter notebooks with emacs
-  (eval +overlay)     ; run code, run (also, repls)
-  ;;gist              ; interacting with github gists
-  lookup              ; navigate your code and its documentation
-  lsp
-  magit             ; a git porcelain for Emacs
-  ;;make              ; run make tasks from Emacs
-  ;;pass              ; password manager for nerds
-  ;;pdf               ; pdf enhancements
-  ;;prodigy           ; FIXME managing external services & code builders
-  ;;rgb               ; creating color strings
-  ;;taskrunner        ; taskrunner for all your projects
-  ;;terraform         ; infrastructure as code
-  ;;tmux              ; an API for interacting with tmux
-  ;;upload            ; map local to remote projects via ssh/ftp
-
-  :os
-  (:if IS-MAC macos)  ; improve compatibility with macOS
-  ;;tty               ; improve the terminal Emacs experience
-
-  :lang
-  ;;agda              ; types of types of types of types...
-  ;;beancount         ; mind the GAAP
-  ;;cc                ; C > C++ == 1
-  ;;clojure           ; java with a lisp
-  ;;common-lisp       ; if you've seen one lisp, you've seen them all
-  ;;coq               ; proofs-as-programs
-  ;;crystal           ; ruby at the speed of c
-  ;;csharp            ; unity, .NET, and mono shenanigans
-  ;;data              ; config/data formats
-  ;;(dart +flutter)   ; paint ui and not much else
-  ;;elixir            ; erlang done right
-  ;;elm               ; care for a cup of TEA?
-  emacs-lisp        ; drown in parentheses
-  ;;erlang            ; an elegant language for a more civilized age
-  ;;ess               ; emacs speaks statistics
-  ;;factor
-  ;;faust             ; dsp, but you get to keep your soul
-  ;;fsharp            ; ML stands for Microsoft's Language
-  ;;fstar             ; (dependent) types and (monadic) effects and Z3
-  ;;gdscript          ; the language you waited for
-  ;;(go +lsp)         ; the hipster dialect
-  (haskell +lsp)  ; a language that's lazier than I am
-  ;;hy                ; readability of scheme w/ speed of python
-  ;;idris             ; a language you can depend on
-  ;;json              ; At least it ain't XML
-  ;;(java +meghanada) ; the poster child for carpal tunnel syndrome
-  ;;javascript        ; all(hope(abandon(ye(who(enter(here))))))
-  ;;julia             ; a better, faster MATLAB
-  ;;kotlin            ; a better, slicker Java(Script)
-  ;;latex             ; writing papers in Emacs has never been so fun
-  ;;lean              ; for folks with too much to prove
-  ;;ledger            ; be audit you can be
-  ;;lua               ; one-based indices? one-based indices
-  markdown          ; writing docs for people to ignore
-  ;;nim               ; python + lisp at the speed of c
-  nix               ; I hereby declare "nix geht mehr!"
-  ;;ocaml             ; an objective camel
-  org               ; organize your plain life in plain text
-  ;;php               ; perl's insecure younger brother
-  ;;plantuml          ; diagrams for confusing people more
-  ;;purescript        ; javascript, but functional
-  ;;python            ; beautiful is better than ugly
-  ;;qt                ; the 'cutest' gui framework ever
-  ;;racket            ; a DSL for DSLs
-  ;;raku              ; the artist formerly known as perl6
-  ;;rest              ; Emacs as a REST client
-  ;;rst               ; ReST in peace
-  ;;(ruby +rails)     ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
-  ;;rust              ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
-  ;;scala             ; java, but good
-  ;;(scheme +guile)   ; a fully conniving family of lisps
-  sh                ; she sells {ba,z,fi}sh shells on the C xor
-  ;;sml
-  ;;solidity          ; do you need a blockchain? No.
-  ;;swift             ; who asked for emoji variables?
-  ;;terra             ; Earth and Moon in alignment for performance.
-  ;;web               ; the tubes
-  ;;yaml              ; JSON, but readable
-  ;;zig               ; C, but simpler
-
-  :email
-  ;;(mu4e +gmail)
-  ;;notmuch
-  ;;(wanderlust +gmail)
-
-  :app
-  ;;calendar
-  ;;emms
-  ;;everywhere        ; *leave* Emacs!? You must be joking
-  ;;irc               ; how neckbeards socialize
-  ;;(rss +org)        ; emacs as an RSS reader
-  ;;twitter           ; twitter client https://twitter.com/vnought
-
-  :config
-  ;;literate
-  (default +bindings +smartparens)
-
-  (setq doom-theme 'doom-vibrant)
-  (custom-theme-set-faces! 'doom-vibrant
-    '(cursor                 ((t (:background "green"))))
-    '(font-lock-comment-face ((t (:foreground "cyan" :italic t :slant oblique))))
-    '(font-lock-comment-delimiter-face ((t (:foreground "cyan"))))
-    '(fringe                 ((t (:foreground "red" :background "black"))))
-    '(region                 ((t (:background "yellow4"))))
-    '(whitespace-indentation ((t (:foreground "gray50" :bold t))))
-    '(whitespace-space       ((t (:foreground "black" :bold t))))
-    '(whitespace-tab         ((t (:foreground "gray50" :bold t))))
-    '(whitespace-trailing    ((t (:foreground "red" :bold t))))
-    '(font-lock-builtin-face ((t (:foreground "yellow" :weight bold))))
-    '(font-lock-keyword-face ((t (:foreground "yellow" :weight bold))))
-    '(font-lock-string-face  ((t (:foreground "magenta"))))
-    '(font-lock-variable-name-face ((t (:foreground "SpringGreen3" :weight bold))))
-    '(nix-antiquote-face     ((t (:foreground "blue"))))
-    '(mode-line              ((t (:background "darkblue" :foreground "white" :box (:line-width 1 :color "blue") :height 1.0))))
-    '(mode-line-inactive     ((t (:background "grey30" :foreground "white" :box (:line-width 1 :color "grey30") :weight light :height 1.0))))
-  )
-)
-
diff --git a/homes/julm/emacs/packages.el b/homes/julm/emacs/packages.el
deleted file mode 100644 (file)
index e69de29..0000000
index 46f678701c31223b11fe324c2bfeb26717f89db5..f81dbb7a73f393d139810b62f2e94baff712caf7 100644 (file)
@@ -3,8 +3,6 @@
 imports = [
   ../../../profiles/graphical.nix
   ../../../profiles/networking.nix
-  ../../../profiles/security.nix
-  ../../../profiles/system.nix
 ];
 services.gpg-agent.pinentryFlavor = lib.mkForce "curses";
 # Does not cross-compile:
index 51d35d29dc6c8032fd6a7b1ba6da3c4dbe4eddd9..11a2ff74e5dde5c0bc8295bf535b1cd7956752e4 100644 (file)
@@ -1,14 +1,12 @@
 { pkgs, lib, config, ... }:
 {
 imports = [
-  #../../../profiles/chat.nix
-  ../../../profiles/developing.nix
-  ../../../profiles/graphical.nix
-  ../../../profiles/networking.nix
-  ../../../profiles/sharing.nix
-  ../../../profiles/security.nix
-  ../../../profiles/system.nix
-  ../../../profiles/video.nix
+  #../../../home-manager/profiles/chat.nix
+  ../../../home-manager/profiles/developing.nix
+  ../../../home-manager/profiles/graphical.nix
+  ../../../home-manager/profiles/networking.nix
+  ../../../home-manager/profiles/sharing.nix
+  ../../../home-manager/profiles/video.nix
 ];
 services.gpg-agent.pinentryFlavor = lib.mkForce "curses";
 xsession.enable = true;
index 2cdd3df1d3b5bfacd079ee0badb7252a0d061ce0..f0a44cdc0e9ebe4b4d464f680c08fb0abb3e919b 100644 (file)
@@ -1,13 +1,9 @@
 { pkgs, lib, config, ... }:
 {
 imports = [
-  ../../../profiles/networking.nix
-  ../../../profiles/security.nix
-  ../../../profiles/system.nix
-];
-programs.irssi.enable = true;
-programs.vim.enable = true;
-home.packages = [
-  pkgs.neomutt
+  ../../../home-manager/profiles/irssi.nix
+  ../../../home-manager/profiles/mutt.nix
+  ../../../home-manager/profiles/networking.nix
+  ../../../home-manager/profiles/vim.nix
 ];
 }
index 6c24cf8817172ead09fd14e2cb64ee97c14f97d9..90569b344687db05435b82dec82d2b8d6d2273f1 100644 (file)
@@ -1,18 +1,21 @@
 { pkgs, lib, config, ... }:
 {
 imports = [
-  ../../../profiles/chat.nix
-  ../../../profiles/developing.nix
-  ../../../profiles/drawing.nix
-  ../../../profiles/gaming.nix
-  ../../../profiles/graphical.nix
-  ../../../profiles/networking.nix
-  ../../../profiles/office.nix
-  ../../../profiles/security.nix
-  ../../../profiles/sharing.nix
-  ../../../profiles/system.nix
-  ../../../profiles/video.nix
-  ../../../profiles/web.nix
+  ../../../home-manager/profiles/chat.nix
+  ../../../home-manager/profiles/developing.nix
+  ../../../home-manager/profiles/drawing.nix
+  ../../../home-manager/profiles/gaming.nix
+  ../../../home-manager/profiles/graphical.nix
+  ../../../home-manager/profiles/networking.nix
+  ../../../home-manager/profiles/office.nix
+  ../../../home-manager/profiles/sharing.nix
+  ../../../home-manager/profiles/video.nix
+
+  ../../../home-manager/profiles/emacs.nix
+  ../../../home-manager/profiles/firefox.nix
+  ../../../home-manager/profiles/xmonad.nix
+  ../../../home-manager/profiles/ghc.nix
+  ../../../home-manager/profiles/urxvt.nix
 ];
 programs.bash.shellAliases.riseup = "sudo ip netns exec riseup sudo -u $USER PULSE_SERVER=/run/user/$(id -u $USER)/pulse/native";
 programs.bash.shellAliases.firefox = "riseup firefox";
@@ -28,7 +31,7 @@ home.packages = [
   ]); })
   #pkgs.libva-utils
   #pkgs.ristretto
+  pkgs.xfce.mousepad
+  #pkgs.mate.pluma
 ];
-xsession.enable = true;
-xsession.windowManager.xmonad.enable = true;
 }
index fa60698a5c9c7721f6744506db8b8a400282f3d2..a31f850ddad2c98efb657e94af5973731b4bb45d 100644 (file)
@@ -1,5 +1,8 @@
 { pkgs, lib, config, ... }:
 {
+imports = [
+  ../../home-manager/profiles/mutt.nix
+];
 home.activation.createMuttDirectories =
   let mkdir = dir: ''$DRY_RUN_CMD mkdir -p $VERBOSE_ARG "${dir}"''; in
   lib.hm.dag.entryAfter [ "writeBoundary" ]
diff --git a/homes/programs.nix b/homes/programs.nix
deleted file mode 100644 (file)
index 881bde8..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-imports = [
-  programs/aria2c.nix
-  programs/bash.nix
-  programs/direnv.nix
-  programs/emacs.nix
-  programs/firefox.nix
-  programs/ghc.nix
-  programs/git.nix
-  programs/gnupg.nix
-  programs/htop.nix
-  programs/irssi.nix
-  programs/mpv.nix
-  programs/redshift.nix
-  programs/ssh.nix
-  programs/tmux.nix
-  programs/urxvt.nix
-  programs/vim.nix
-  programs/xmonad.nix
-  programs/zsh.nix
-];
-}
diff --git a/homes/programs/aria2c.nix b/homes/programs/aria2c.nix
deleted file mode 100644 (file)
index 738cbef..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-xdg.configFile."aria2/aria2.conf".text = ''
-continue=true
-# Usually not great for compression by the filesystem (ZFS/Btrfs).
-file-allocation=none
-max-connection-per-server=16
-min-split-size=1M
-'';
-}
index d3df46f0dfd2438e0dc0a8fed92fc394f09eb0d9..818e95d8eb3570fda3f165195f44570e9169faf2 100644 (file)
@@ -1,13 +1,9 @@
 { pkgs, lib, config, hostName, ... }:
 {
 imports = [
-  ./programs.nix
-  ./options.nix
+  ../home-manager/profiles/essential.nix
+  ../home-manager/profiles/vim.nix
+  ../home-manager/options.nix
   (import (sevy/hosts + "/${hostName}.nix"))
 ];
-programs.git.enable = true;
-programs.git.package = pkgs.gitMinimal;
-home.sessionVariables = {
-  EDITOR = "vim -g";
-};
 }
index 8ed7a3d760664649513abadc75f8e752570bf73e..c06a39acb39ea6f30266e628aa8af4420774b5dc 100644 (file)
@@ -1,26 +1,20 @@
 { pkgs, lib, config, ... }:
 {
 imports = [
-  ../../../profiles/chat.nix
-  ../../../profiles/developing.nix
-  ../../../profiles/drawing.nix
-  ../../../profiles/gaming.nix
-  ../../../profiles/graphical.nix
-  ../../../profiles/networking.nix
-  ../../../profiles/office.nix
-  ../../../profiles/security.nix
-  ../../../profiles/sharing.nix
-  ../../../profiles/system.nix
-  ../../../profiles/video.nix
-  ../../../profiles/web.nix
-  ../../../profiles/xfce.nix
+  ../../../home-manager/profiles/chat.nix
+  ../../../home-manager/profiles/developing.nix
+  ../../../home-manager/profiles/drawing.nix
+  ../../../home-manager/profiles/emacs.nix
+  ../../../home-manager/profiles/firefox.nix
+  ../../../home-manager/profiles/gaming.nix
+  ../../../home-manager/profiles/graphical.nix
+  ../../../home-manager/profiles/networking.nix
+  ../../../home-manager/profiles/office.nix
+  ../../../home-manager/profiles/sharing.nix
+  ../../../home-manager/profiles/video.nix
+  ../../../home-manager/profiles/xfce.nix
 ];
-programs.direnv.enable = true;
-programs.doom-emacs.enable = true;
 programs.firefox.enable = false; # error: attribute 'gtk3' missing
-programs.git.enable = true;
-home.sessionVariables = {
-};
 home.packages = [
   pkgs.chromium
   pkgs.firefox
index c9974a0a236828afa005522da47bdb271d6312a0..51c686e8f2b51ec03084a053ef6989657971e283 100644 (file)
@@ -16,7 +16,7 @@ imports = [
 
 home-manager.users.sevy = {
   imports = [ ../homes/sevy.nix ];
-  host.hardware = ["ThinkPad" "X200"];
+  host.hardware = [ "ThinkPad" "X200" ];
 };
 systemd.services.home-manager-sevy.postStart = ''
   ${pkgs.nix}/bin/nix-env --delete-generations +1 --profile /nix/var/nix/profiles/per-user/sevy/home-manager
diff --git a/private/root/oignon/nix/binary-cache/priv.pem b/private/root/oignon/nix/binary-cache/priv.pem
new file mode 100644 (file)
index 0000000..c79390e
Binary files /dev/null and b/private/root/oignon/nix/binary-cache/priv.pem differ
diff --git a/private/root/oignon/nix/binary-cache/pub.pem b/private/root/oignon/nix/binary-cache/pub.pem
new file mode 100644 (file)
index 0000000..66be1b8
Binary files /dev/null and b/private/root/oignon/nix/binary-cache/pub.pem differ
diff --git a/private/root/oignon/wireguard/wg-intra/privateKey b/private/root/oignon/wireguard/wg-intra/privateKey
new file mode 100644 (file)
index 0000000..1c74c2d
Binary files /dev/null and b/private/root/oignon/wireguard/wg-intra/privateKey differ
diff --git a/private/root/patate/wireguard/wg-intra/privateKey b/private/root/patate/wireguard/wg-intra/privateKey
new file mode 100644 (file)
index 0000000..8b1e3ee
Binary files /dev/null and b/private/root/patate/wireguard/wg-intra/privateKey differ
diff --git a/profiles/essential.nix b/profiles/essential.nix
deleted file mode 100644 (file)
index 5b1e68b..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-{ pkgs, lib, config, ... }:
-{
-programs.bash.enable = lib.mkDefault true;
-programs.home-manager.enable = true;
-programs.htop.enable = lib.mkDefault true;
-programs.tmux.enable = lib.mkDefault true;
-home.packages = [
-  pkgs.cryptsetup
-  pkgs.lf
-  pkgs.multitail
-  pkgs.ncdu
-  pkgs.nix-du
-  pkgs.procps
-  pkgs.smem
-  pkgs.strace
-  pkgs.tree
-  pkgs.utillinux
-  pkgs.which
-];
-home.sessionPath = [ "${config.home.homeDirectory}/bin" ];
-home.sessionVariables = {
-  EDITOR = "vim";
-  LANG = "fr_FR.UTF-8";
-  LESS = "-FRSX";
-  LOCALE_ARCHIVE = "${pkgs.glibcLocales}/lib/locale/locale-archive";
-  MANPAGER = "less";
-};
-}
diff --git a/profiles/security.nix b/profiles/security.nix
deleted file mode 100644 (file)
index 535f0b1..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-{ pkgs, lib, config, nixosConfig, ... }:
-{
-programs.gpg.enable = true;
-services.gpg-agent.enable = true;
-home.packages = [
-  pkgs.mkpasswd
-  pkgs.pass
-  pkgs.yubikey-personalization
-] ++ lib.optionals nixosConfig.services.xserver.enable [
-  pkgs.keepass
-  pkgs.yubikey-personalization-gui
-];
-}
diff --git a/profiles/system.nix b/profiles/system.nix
deleted file mode 100644 (file)
index 334cd43..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-{ pkgs, lib, config, nixosConfig, ... }:
-{
-imports = [
-  ./essential.nix
-];
-#programs.broot.enable = lib.mkDefault true;
-programs.bat.enable = lib.mkDefault true;
-home.packages = [
-  #pkgs.glib # gio
-  #pkgs.go-mtpfs
-  #pkgs.gvfs
-  nixosConfig.boot.kernelPackages.cpupower
-  pkgs.acpi
-  pkgs.bc
-  pkgs.convmv
-  pkgs.dstat
-  pkgs.e2fsprogs
-  pkgs.file
-  pkgs.hwinfo
-  pkgs.iotop
-  pkgs.lm_sensors
-  pkgs.lsof
-  pkgs.lsscsi
-  pkgs.nload
-  pkgs.ntfs3g
-  pkgs.p7zip
-  pkgs.parted
-  pkgs.pciutils
-  pkgs.powertop
-  pkgs.pstree
-  pkgs.pv
-  pkgs.rdfind
-  pkgs.smartmontools
-  pkgs.stress-ng
-  pkgs.usbutils
-  pkgs.xdg_utils
-] ++ lib.optionals nixosConfig.services.xserver.enable [
-  pkgs.gparted
-];
-}