added zotero package and persist cinnamon-monitors.xml
This commit is contained in:
parent
f60f4bee7a
commit
861f58946b
|
@ -1,4 +1,4 @@
|
||||||
{pkgs, ... }: {
|
{ pkgs, ... }: {
|
||||||
imports = [
|
imports = [
|
||||||
./firefox.nix
|
./firefox.nix
|
||||||
./alacritty.nix
|
./alacritty.nix
|
||||||
|
@ -11,5 +11,6 @@
|
||||||
pkgs.zathura
|
pkgs.zathura
|
||||||
pkgs.xfce.thunar
|
pkgs.xfce.thunar
|
||||||
pkgs.kcolorchooser
|
pkgs.kcolorchooser
|
||||||
|
pkgs.zotero
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,15 +1,11 @@
|
||||||
{
|
{ inputs
|
||||||
pkgs,
|
, ...
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}: {
|
}: {
|
||||||
imports = [
|
imports = [
|
||||||
# Import users
|
# Import users
|
||||||
./users/media
|
./users/media
|
||||||
|
|
||||||
./common/core
|
./common/core
|
||||||
./common/optional/sops.nix
|
|
||||||
|
|
||||||
# Import optional
|
# Import optional
|
||||||
./common/optional/git.nix
|
./common/optional/git.nix
|
||||||
|
@ -17,4 +13,6 @@
|
||||||
./common/optional/desktop/cinnamon
|
./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);
|
openssh.authorizedKeys.keys = lib.lists.forEach pubKeys (key: builtins.readFile key);
|
||||||
|
|
||||||
extraGroups =
|
extraGroups =
|
||||||
[
|
[
|
||||||
"wheel"
|
"wheel"
|
||||||
];
|
];
|
||||||
|
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
flatpak
|
flatpak
|
||||||
|
@ -28,19 +28,20 @@ in
|
||||||
|
|
||||||
environment.persistence."/persist" = {
|
environment.persistence."/persist" = {
|
||||||
hideMounts = true;
|
hideMounts = true;
|
||||||
users.${username}= {
|
users.${username} = {
|
||||||
directories = [
|
directories = [
|
||||||
"Sync"
|
"Sync"
|
||||||
"Keep"
|
"Keep"
|
||||||
".ssh"
|
".ssh"
|
||||||
".config/dconf"
|
".config/dconf"
|
||||||
".config/cinnamon"
|
".config/cinnamon"
|
||||||
".config/nemo"
|
".config/nemo"
|
||||||
".mozilla"
|
".mozilla"
|
||||||
".local"
|
".local"
|
||||||
];
|
];
|
||||||
files = [
|
files = [
|
||||||
];
|
".config/cinnamon-monitors.xml"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -53,7 +54,7 @@ in
|
||||||
path = "/home/${username}/.ssh/id_ed25519";
|
path = "/home/${username}/.ssh/id_ed25519";
|
||||||
mode = "0600";
|
mode = "0600";
|
||||||
owner = "${username}";
|
owner = "${username}";
|
||||||
};
|
};
|
||||||
"ssh_keys/${username}/id_ed25519.pub" = {
|
"ssh_keys/${username}/id_ed25519.pub" = {
|
||||||
path = "/home/${username}/.ssh/id_ed25519.pub";
|
path = "/home/${username}/.ssh/id_ed25519.pub";
|
||||||
mode = "0644";
|
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 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...
|
# 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
|
# FIXME: We might not need this depending on how https://github.com/Mic92/sops-nix/issues/381 is fixed
|
||||||
system.activationScripts.sopsSetSshOwnwership = let
|
system.activationScripts.sopsSetSshOwnwership =
|
||||||
sshFolder = "/home/${username}/.ssh";
|
let
|
||||||
user = config.users.users.${username}.name;
|
sshFolder = "/home/${username}/.ssh";
|
||||||
group = config.users.users.${username}.group;
|
user = config.users.users.${username}.name;
|
||||||
in ''
|
group = config.users.users.${username}.group;
|
||||||
mkdir -p ${sshFolder} || true
|
in
|
||||||
chown -R ${user}:${group} /home/${username}/.ssh
|
''
|
||||||
'';
|
mkdir -p ${sshFolder} || true
|
||||||
|
chown -R ${user}:${group} /home/${username}/.ssh
|
||||||
|
'';
|
||||||
|
|
||||||
services.flatpak.enable = true;
|
services.flatpak.enable = true;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue