remove config.sane.home-manager.enable as it was always set anyway

This commit is contained in:
Colin 2023-01-30 02:10:12 +00:00
parent 39effa15ad
commit 216c812f7b
18 changed files with 17 additions and 44 deletions

View File

@ -16,7 +16,6 @@
./vpn.nix ./vpn.nix
]; ];
sane.home-manager.enable = true;
sane.nixcache.enable-trusted-keys = true; sane.nixcache.enable-trusted-keys = true;
sane.packages.enableConsolePkgs = true; sane.packages.enableConsolePkgs = true;
sane.packages.enableSystemPkgs = true; sane.packages.enableSystemPkgs = true;

View File

@ -1,7 +1,6 @@
# Terminal UI mail client # Terminal UI mail client
{ config, lib, sane-lib, ... }: { config, sane-lib, ... }:
lib.mkIf config.sane.home-manager.enable
{ {
sops.secrets."aerc_accounts" = { sops.secrets."aerc_accounts" = {
owner = config.users.users.colin.name; owner = config.users.users.colin.name;

View File

@ -145,7 +145,7 @@ in
}; };
}; };
config = lib.mkIf config.sane.home-manager.enable { config = {
# uBlock filter list configuration. # uBlock filter list configuration.
# specifically, enable the GDPR cookie prompt blocker. # specifically, enable the GDPR cookie prompt blocker.

View File

@ -1,9 +1,8 @@
{ config, lib, pkgs, sane-lib, ... }: { lib, pkgs, sane-lib, ... }:
let let
mkCfg = lib.generators.toINI { }; mkCfg = lib.generators.toINI { };
in in
lib.mkIf config.sane.home-manager.enable
{ {
sane.fs."/home/colin/.config/git/config" = sane-lib.fs.wantedText (mkCfg { sane.fs."/home/colin/.config/git/config" = sane-lib.fs.wantedText (mkCfg {
user.name = "Colin"; user.name = "Colin";

View File

@ -1,6 +1,5 @@
{ config, lib, sane-lib, ... }: { config, sane-lib, ... }:
lib.mkIf config.sane.home-manager.enable
{ {
sane.persist.home.private = [ ".local/share/keyrings" ]; sane.persist.home.private = [ ".local/share/keyrings" ];

View File

@ -1,6 +1,5 @@
{ config, lib, pkgs, sane-lib, ... }: { pkgs, sane-lib, ... }:
lib.mkIf config.sane.home-manager.enable
{ {
sane.fs."/home/colin/.config/kitty/kitty.conf" = sane-lib.fs.wantedText '' sane.fs."/home/colin/.config/kitty/kitty.conf" = sane-lib.fs.wantedText ''
# docs: https://sw.kovidgoyal.net/kitty/conf/ # docs: https://sw.kovidgoyal.net/kitty/conf/

View File

@ -1,6 +1,5 @@
{ config, lib, sane-lib, ... }: { sane-lib, ... }:
lib.mkIf config.sane.home-manager.enable
{ {
# libreoffice: disable first-run stuff # libreoffice: disable first-run stuff
sane.fs."/home/colin/.config/libreoffice/4/user/registrymodifications.xcu" = sane-lib.fs.wantedText '' sane.fs."/home/colin/.config/libreoffice/4/user/registrymodifications.xcu" = sane-lib.fs.wantedText ''

View File

@ -1,4 +1,4 @@
{ config, lib, sane-lib, ...}: { config, sane-lib, ...}:
let let
www = config.sane.web-browser.browser.desktop; www = config.sane.web-browser.browser.desktop;
@ -9,7 +9,6 @@ let
# audio = "mpv.desktop"; # audio = "mpv.desktop";
audio = "vlc.desktop"; audio = "vlc.desktop";
in in
lib.mkIf config.sane.home-manager.enable
{ {
# the xdg mime type for a file can be found with: # the xdg mime type for a file can be found with:

View File

@ -1,6 +1,5 @@
{ config, lib, sane-lib, ... }: { sane-lib, ... }:
lib.mkIf config.sane.home-manager.enable
{ {
# format is <key>=%<length>%<value> # format is <key>=%<length>%<value>
sane.fs."/home/colin/.config/mpv/mpv.conf" = sane-lib.fs.wantedText '' sane.fs."/home/colin/.config/mpv/mpv.conf" = sane-lib.fs.wantedText ''

View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { lib, pkgs, ... }:
let let
inherit (builtins) map; inherit (builtins) map;
@ -70,7 +70,6 @@ let
plugin-config-tex = concatMapStrings (p: optionalString (p.type or "" == "viml") p.config) plugins; plugin-config-tex = concatMapStrings (p: optionalString (p.type or "" == "viml") p.config) plugins;
plugin-config-lua = concatMapStrings (p: optionalString (p.type or "" == "lua") p.config) plugins; plugin-config-lua = concatMapStrings (p: optionalString (p.type or "" == "lua") p.config) plugins;
in in
lib.mkIf config.sane.home-manager.enable
{ {
# private because there could be sensitive things in the swap # private because there could be sensitive things in the swap
sane.persist.home.private = [ ".cache/vim-swap" ]; sane.persist.home.private = [ ".cache/vim-swap" ];

View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, sane-lib, ... }: { config, lib, sane-lib, ... }:
with lib; with lib;
let let
@ -9,7 +9,8 @@ let
"\n" "\n"
(map (k: k.asHostKey) host-keys) (map (k: k.asHostKey) host-keys)
; ;
in lib.mkIf config.sane.home-manager.enable { in
{
# ssh key is stored in private storage # ssh key is stored in private storage
sane.persist.home.private = [ ".ssh/id_ed25519" ]; sane.persist.home.private = [ ".ssh/id_ed25519" ];
sane.fs."/home/colin/.ssh/id_ed25519.pub" = sane-lib.fs.wantedText user-pubkey; sane.fs."/home/colin/.ssh/id_ed25519.pub" = sane-lib.fs.wantedText user-pubkey;

View File

@ -1,6 +1,5 @@
{ config, lib, sane-lib, ... }: { config, sane-lib, ... }:
lib.mkIf config.sane.home-manager.enable
{ {
# TODO: this should only be shipped on gui platforms # TODO: this should only be shipped on gui platforms
sops.secrets."sublime_music_config" = { sops.secrets."sublime_music_config" = {

View File

@ -8,7 +8,6 @@ let
builtins.map (feed: feed.url) wanted-feeds builtins.map (feed: feed.url) wanted-feeds
); );
in in
lib.mkIf config.sane.home-manager.enable
{ {
sane.fs."/home/colin/.config/vlc/vlcrc" = sane-lib.fs.wantedText '' sane.fs."/home/colin/.config/vlc/vlcrc" = sane-lib.fs.wantedText ''
[podcast] [podcast]

View File

@ -1,6 +1,5 @@
{ config, lib, sane-lib, ...}: { lib, sane-lib, ...}:
lib.mkIf config.sane.home-manager.enable
{ {
# XDG defines things like ~/Desktop, ~/Downloads, etc. # XDG defines things like ~/Desktop, ~/Downloads, etc.
# these clutter the home, so i mostly don't use them. # these clutter the home, so i mostly don't use them.

View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, sane-lib, ... }: { pkgs, sane-lib, ... }:
let let
# powerlevel10k prompt config # powerlevel10k prompt config
@ -25,7 +25,6 @@ let
source ${pkgs.zsh-prezto}/share/zsh-prezto/init.zsh source ${pkgs.zsh-prezto}/share/zsh-prezto/init.zsh
''; '';
in in
lib.mkIf config.sane.home-manager.enable
{ {
sane.persist.home.plaintext = [ sane.persist.home.plaintext = [
# we don't need to full zsh dir -- just the history file -- # we don't need to full zsh dir -- just the history file --

View File

@ -4,7 +4,6 @@
imports = [ imports = [
./feeds.nix ./feeds.nix
./fs ./fs
./home-manager
./ids.nix ./ids.nix
./packages.nix ./packages.nix
./image.nix ./image.nix

View File

@ -1,14 +0,0 @@
{ lib, config, pkgs, ... }:
with lib;
let
cfg = config.sane.home-manager;
in
{
options = {
sane.home-manager.enable = mkOption {
default = false;
type = types.bool;
};
};
}

View File

@ -129,7 +129,7 @@ let
".local/share/nheko" # per-account state database ".local/share/nheko" # per-account state database
]; } ]; }
# settings (electron app). TODO: can i manage these settings with home-manager? # settings (electron app)
{ pkg = obsidian; dir = [ ".config/obsidian" ]; } { pkg = obsidian; dir = [ ".config/obsidian" ]; }
pavucontrol pavucontrol
@ -186,7 +186,7 @@ let
# creds, media # creds, media
{ pkg = signal-desktop; private = [ ".config/Signal" ]; } { pkg = signal-desktop; private = [ ".config/Signal" ]; }
# creds. TODO: can i manage this with home-manager? # creds, widevine .so download. TODO: could easily manage these statically.
{ pkg = spotify; dir = [ ".config/spotify" ]; } { pkg = spotify; dir = [ ".config/spotify" ]; }
# hardenedMalloc solves a crash at startup # hardenedMalloc solves a crash at startup