added zotero package and persist cinnamon-monitors.xml
This commit is contained in:
parent
f60f4bee7a
commit
861f58946b
|
@ -1,4 +1,4 @@
|
|||
{pkgs, ... }: {
|
||||
{ pkgs, ... }: {
|
||||
imports = [
|
||||
./firefox.nix
|
||||
./alacritty.nix
|
||||
|
@ -11,5 +11,6 @@
|
|||
pkgs.zathura
|
||||
pkgs.xfce.thunar
|
||||
pkgs.kcolorchooser
|
||||
pkgs.zotero
|
||||
];
|
||||
}
|
||||
|
|
|
@ -1,15 +1,11 @@
|
|||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
{ inputs
|
||||
, ...
|
||||
}: {
|
||||
imports = [
|
||||
# Import users
|
||||
./users/media
|
||||
|
||||
./common/core
|
||||
./common/optional/sops.nix
|
||||
|
||||
# Import optional
|
||||
./common/optional/git.nix
|
||||
|
@ -17,4 +13,6 @@
|
|||
./common/optional/desktop/cinnamon
|
||||
|
||||
];
|
||||
|
||||
colorScheme = inputs.nix-colors.colorSchemes.kanagawa;
|
||||
}
|
||||
|
|
|
@ -16,9 +16,9 @@ in
|
|||
openssh.authorizedKeys.keys = lib.lists.forEach pubKeys (key: builtins.readFile key);
|
||||
|
||||
extraGroups =
|
||||
[
|
||||
"wheel"
|
||||
];
|
||||
[
|
||||
"wheel"
|
||||
];
|
||||
|
||||
packages = with pkgs; [
|
||||
flatpak
|
||||
|
@ -28,19 +28,20 @@ in
|
|||
|
||||
environment.persistence."/persist" = {
|
||||
hideMounts = true;
|
||||
users.${username}= {
|
||||
directories = [
|
||||
"Sync"
|
||||
"Keep"
|
||||
".ssh"
|
||||
".config/dconf"
|
||||
".config/cinnamon"
|
||||
".config/nemo"
|
||||
".mozilla"
|
||||
".local"
|
||||
];
|
||||
files = [
|
||||
];
|
||||
users.${username} = {
|
||||
directories = [
|
||||
"Sync"
|
||||
"Keep"
|
||||
".ssh"
|
||||
".config/dconf"
|
||||
".config/cinnamon"
|
||||
".config/nemo"
|
||||
".mozilla"
|
||||
".local"
|
||||
];
|
||||
files = [
|
||||
".config/cinnamon-monitors.xml"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -53,7 +54,7 @@ in
|
|||
path = "/home/${username}/.ssh/id_ed25519";
|
||||
mode = "0600";
|
||||
owner = "${username}";
|
||||
};
|
||||
};
|
||||
"ssh_keys/${username}/id_ed25519.pub" = {
|
||||
path = "/home/${username}/.ssh/id_ed25519.pub";
|
||||
mode = "0644";
|
||||
|
@ -64,14 +65,16 @@ in
|
|||
# The containing ssh folders are created as root and if this is the first ~/.ssh/ entry when writing keys,
|
||||
# the ownership is busted and home-manager can't target because it can't write into .ssh...
|
||||
# FIXME: We might not need this depending on how https://github.com/Mic92/sops-nix/issues/381 is fixed
|
||||
system.activationScripts.sopsSetSshOwnwership = let
|
||||
sshFolder = "/home/${username}/.ssh";
|
||||
user = config.users.users.${username}.name;
|
||||
group = config.users.users.${username}.group;
|
||||
in ''
|
||||
mkdir -p ${sshFolder} || true
|
||||
chown -R ${user}:${group} /home/${username}/.ssh
|
||||
'';
|
||||
system.activationScripts.sopsSetSshOwnwership =
|
||||
let
|
||||
sshFolder = "/home/${username}/.ssh";
|
||||
user = config.users.users.${username}.name;
|
||||
group = config.users.users.${username}.group;
|
||||
in
|
||||
''
|
||||
mkdir -p ${sshFolder} || true
|
||||
chown -R ${user}:${group} /home/${username}/.ssh
|
||||
'';
|
||||
|
||||
services.flatpak.enable = true;
|
||||
|
||||
|
|
Loading…
Reference in New Issue