refactor: squash env
directory
This commit is contained in:
parent
b26e826b3b
commit
187a52527b
|
@ -30,7 +30,7 @@
|
||||||
systemd.services.freshrss-import-feeds =
|
systemd.services.freshrss-import-feeds =
|
||||||
let
|
let
|
||||||
fresh = config.systemd.services.freshrss-config;
|
fresh = config.systemd.services.freshrss-config;
|
||||||
feeds = import ../../../modules/universal/env/home-manager/feeds.nix { inherit lib; };
|
feeds = import ../../../modules/universal/home-manager/feeds.nix { inherit lib; };
|
||||||
opml = pkgs.writeText "sane-freshrss.opml" (feeds.feedsToOpml feeds.all);
|
opml = pkgs.writeText "sane-freshrss.opml" (feeds.feedsToOpml feeds.all);
|
||||||
in {
|
in {
|
||||||
inherit (fresh) wantedBy environment;
|
inherit (fresh) wantedBy environment;
|
||||||
|
|
|
@ -3,16 +3,24 @@
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./allocations.nix
|
./allocations.nix
|
||||||
./env
|
|
||||||
./fs.nix
|
./fs.nix
|
||||||
|
./home-manager
|
||||||
|
./home-packages.nix
|
||||||
./net.nix
|
./net.nix
|
||||||
./secrets.nix
|
./secrets.nix
|
||||||
|
./system-packages.nix
|
||||||
./users.nix
|
./users.nix
|
||||||
./vpn.nix
|
./vpn.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
time.timeZone = "America/Los_Angeles";
|
time.timeZone = "America/Los_Angeles";
|
||||||
|
|
||||||
|
# allow `nix flake ...` command
|
||||||
|
nix.extraOptions = ''
|
||||||
|
experimental-features = nix-command flakes
|
||||||
|
'';
|
||||||
|
|
||||||
|
# TODO: move this into home-manager?
|
||||||
fonts = {
|
fonts = {
|
||||||
enableDefaultFonts = true;
|
enableDefaultFonts = true;
|
||||||
fonts = with pkgs; [ font-awesome twitter-color-emoji hack-font ];
|
fonts = with pkgs; [ font-awesome twitter-color-emoji hack-font ];
|
||||||
|
@ -25,9 +33,30 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# allow `nix flake ...` command
|
# programs.vim.defaultEditor = true;
|
||||||
nix.extraOptions = ''
|
environment.variables = {
|
||||||
experimental-features = nix-command flakes
|
EDITOR = "vim";
|
||||||
'';
|
# git claims it should use EDITOR, but it doesn't!
|
||||||
|
GIT_EDITOR = "vim";
|
||||||
|
# TODO: these should be moved to `home.sessionVariables` (home-manager)
|
||||||
|
# Electron apps should use native wayland backend:
|
||||||
|
# https://nixos.wiki/wiki/Slack#Wayland
|
||||||
|
# Discord under sway crashes with this.
|
||||||
|
# NIXOS_OZONE_WL = "1";
|
||||||
|
# LIBGL_ALWAYS_SOFTWARE = "1";
|
||||||
|
};
|
||||||
|
# enable zsh completions
|
||||||
|
environment.pathsToLink = [ "/share/zsh" ];
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
# required for pam_mount
|
||||||
|
gocryptfs
|
||||||
|
];
|
||||||
|
|
||||||
|
security.pam.mount.enable = true;
|
||||||
|
# security.pam.mount.debugLevel = 1;
|
||||||
|
# security.pam.enableSSHAgentAuth = true; # ??
|
||||||
|
# needed for `allow_other` in e.g. gocryptfs mounts
|
||||||
|
# or i guess going through mount.fuse sets suid so that's not necessary?
|
||||||
|
# programs.fuse.userAllowOther = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
36
modules/universal/env/default.nix
vendored
36
modules/universal/env/default.nix
vendored
|
@ -1,36 +0,0 @@
|
||||||
{ pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
imports = [
|
|
||||||
./home-manager
|
|
||||||
./home-packages.nix
|
|
||||||
./system-packages.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
# programs.vim.defaultEditor = true;
|
|
||||||
environment.variables = {
|
|
||||||
EDITOR = "vim";
|
|
||||||
# git claims it should use EDITOR, but it doesn't!
|
|
||||||
GIT_EDITOR = "vim";
|
|
||||||
# TODO: these should be moved to `home.sessionVariables` (home-manager)
|
|
||||||
# Electron apps should use native wayland backend:
|
|
||||||
# https://nixos.wiki/wiki/Slack#Wayland
|
|
||||||
# Discord under sway crashes with this.
|
|
||||||
# NIXOS_OZONE_WL = "1";
|
|
||||||
# LIBGL_ALWAYS_SOFTWARE = "1";
|
|
||||||
};
|
|
||||||
# enable zsh completions
|
|
||||||
environment.pathsToLink = [ "/share/zsh" ];
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
# required for pam_mount
|
|
||||||
gocryptfs
|
|
||||||
];
|
|
||||||
|
|
||||||
security.pam.mount.enable = true;
|
|
||||||
# security.pam.mount.debugLevel = 1;
|
|
||||||
# security.pam.enableSSHAgentAuth = true; # ??
|
|
||||||
# needed for `allow_other` in e.g. gocryptfs mounts
|
|
||||||
# or i guess going through mount.fuse sets suid so that's not necessary?
|
|
||||||
# programs.fuse.userAllowOther = true;
|
|
||||||
}
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
{
|
{
|
||||||
sops.secrets."aerc_accounts" = {
|
sops.secrets."aerc_accounts" = {
|
||||||
owner = config.users.users.colin.name;
|
owner = config.users.users.colin.name;
|
||||||
sopsFile = ../../../../secrets/universal/aerc_accounts.conf;
|
sopsFile = ../../../secrets/universal/aerc_accounts.conf;
|
||||||
format = "binary";
|
format = "binary";
|
||||||
};
|
};
|
||||||
home-manager.users.colin = let sysconfig = config; in { config, ... }: {
|
home-manager.users.colin = let sysconfig = config; in { config, ... }: {
|
|
@ -92,7 +92,7 @@ in
|
||||||
initKeyring = {
|
initKeyring = {
|
||||||
after = ["writeBoundary"];
|
after = ["writeBoundary"];
|
||||||
before = [];
|
before = [];
|
||||||
data = "${../../../../scripts/init-keyring}";
|
data = "${../../../scripts/init-keyring}";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
# 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" = {
|
||||||
owner = config.users.users.colin.name;
|
owner = config.users.users.colin.name;
|
||||||
sopsFile = ../../../../secrets/universal/sublime_music_config.json.bin;
|
sopsFile = ../../../secrets/universal/sublime_music_config.json.bin;
|
||||||
format = "binary";
|
format = "binary";
|
||||||
};
|
};
|
||||||
home-manager.users.colin = let sysconfig = config; in { config, ... }: {
|
home-manager.users.colin = let sysconfig = config; in { config, ... }: {
|
Loading…
Reference in New Issue
Block a user