feat: pinned mapilary version downloader

feat: created user ivy
This commit is contained in:
Leyla Becker 2025-10-08 13:05:08 -05:00
parent 44922dfcd5
commit 76d3c488db
9 changed files with 172 additions and 7 deletions

View file

@ -8,5 +8,6 @@
in {
leyla = lib.mkIf users.leyla.isNormalUser (import ./leyla);
eve = lib.mkIf users.eve.isNormalUser (import ./eve);
ivy = lib.mkIf users.ivy.isNormalUser (import ./ivy);
git = lib.mkIf (osConfig.services.forgejo.enable or false) (import ./git);
}

View file

@ -0,0 +1,55 @@
{osConfig, ...}: let
userConfig = osConfig.host.users.ivy;
in {
imports = [
./packages.nix
];
home = {
username = userConfig.name;
homeDirectory = osConfig.users.users.ivy.home;
# This value determines the Home Manager release that your configuration is
# compatible with. This helps avoid breakage when a new Home Manager release
# introduces backwards incompatible changes.
#
# You should not change this value, even if you update Home Manager. If you do
# want to update the value, then make sure to first check the Home Manager
# release notes.
stateVersion = "23.11"; # Please read the comment before changing.
# Home Manager is pretty good at managing dotfiles. The primary way to manage
# plain files is through 'home.file'.
file = {
# # Building this configuration will create a copy of 'dotfiles/screenrc' in
# # the Nix store. Activating the configuration will then make '~/.screenrc' a
# # symlink to the Nix store copy.
# ".screenrc".source = dotfiles/screenrc;
# # You can also set the file content immediately.
# ".gradle/gradle.properties".text = ''
# org.gradle.console=verbose
# org.gradle.daemon.idletimeout=3600000
# '';
};
# Home Manager can also manage your environment variables through
# 'home.sessionVariables'. If you don't want to manage your shell through Home
# Manager then you have to manually source 'hm-session-vars.sh' located at
# either
#
# ~/.nix-profile/etc/profile.d/hm-session-vars.sh
#
# or
#
# ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh
#
# or
#
# /etc/profiles/per-user/ivy/etc/profile.d/hm-session-vars.sh
#
sessionVariables = {
# EDITOR = "emacs";
};
};
}

View file

@ -0,0 +1,73 @@
{
lib,
pkgs,
config,
osConfig,
...
}: {
config = {
nixpkgs.config = {
allowUnfree = true;
};
# Programs that need to be installed with some extra configuration
programs = lib.mkMerge [
{
# Let Home Manager install and manage itself.
home-manager.enable = true;
}
(lib.mkIf (config.user.isDesktopUser || config.user.isTerminalUser) {
# git = {
# enable = true;
# userName = "Ivy";
# userEmail = "ivy@example.com"; # Update this with actual email
# extraConfig.init.defaultBranch = "main";
# };
openssh = {
enable = true;
hostKeys = [
{
type = "ed25519";
path = "${config.home.username}_${osConfig.networking.hostName}_ed25519";
}
];
};
})
(lib.mkIf config.user.isDesktopUser {
vscode = {
enable = true;
package = pkgs.vscodium;
mutableExtensionsDir = false;
profiles.default = {
enableUpdateCheck = false;
enableExtensionUpdateCheck = false;
extraExtensions = {
# Cline extension (Claude AI assistant)
claudeDev.enable = true;
# Auto Rename Tag
autoRenameTag.enable = true;
# Live Server
liveServer.enable = true;
};
extensions = let
extension-pkgs = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version;
in (
with extension-pkgs.open-vsx; [
streetsidesoftware.code-spell-checker
]
);
};
};
firefox.enable = true;
discord.enable = true;
signal-desktop-bin.enable = true;
claude-code.enable = true;
})
];
};
}

View file

@ -32,6 +32,7 @@
isPrincipleUser = true;
};
eve.isDesktopUser = true;
ivy.isDesktopUser = true;
};
hardware = {

8
flake.lock generated
View file

@ -369,11 +369,11 @@
"secrets": {
"flake": false,
"locked": {
"lastModified": 1752531440,
"narHash": "sha256-04tQ3EUrtmZ7g6fVUkZC4AbAG+Z7lng79qU3jsiqWJY=",
"lastModified": 1759945215,
"narHash": "sha256-xmUzOuhJl6FtTjR5++OQvSoAnXe7/VA5QFCZDyFwBXo=",
"ref": "refs/heads/main",
"rev": "f016767c13aa36dde91503f7a9f01bdd02468045",
"revCount": 20,
"rev": "444229a105445339fb028d15a8d866063c5f8141",
"revCount": 21,
"type": "git",
"url": "ssh://git@git.jan-leila.com/jan-leila/nix-config-secrets.git"
},

View file

@ -4,10 +4,10 @@
appimageTools,
}: let
pname = "mapillary-uploader";
version = "4.7.2"; # Based on the application output
version = "4.7.2";
src = fetchurl {
url = "https://tools.mapillary.com/uploader/download/linux";
url = "http://tools.mapillary.com/uploader/download/linux/${version}";
name = "mapillary-uploader.AppImage";
sha256 = "sha256-Oyx7AIdA/2mwBaq7UzXOoyq/z2SU2sViMN40sY2RCQw=";
};

View file

@ -15,6 +15,7 @@
uids = {
leyla = 1000;
eve = 1002;
ivy = 1004;
jellyfin = 2000;
forgejo = 2002;
hass = 2004;
@ -33,6 +34,7 @@
gids = {
leyla = 1000;
eve = 1002;
ivy = 1004;
users = 100;
jellyfin_media = 2001;
jellyfin = 2000;
@ -53,6 +55,7 @@
users = config.users.users;
leyla = users.leyla.name;
eve = users.eve.name;
ivy = users.ivy.name;
in {
config = lib.mkMerge [
{
@ -90,6 +93,10 @@ in {
neededForUsers = true;
sopsFile = "${inputs.secrets}/user-passwords.yaml";
};
"passwords/ivy" = {
neededForUsers = true;
sopsFile = "${inputs.secrets}/user-passwords.yaml";
};
};
};
@ -123,6 +130,19 @@ in {
group = config.users.users.eve.name;
};
ivy = {
uid = lib.mkForce uids.ivy;
name = lib.mkForce host.users.ivy.name;
description = "Ivy";
extraGroups =
lib.optionals host.users.ivy.isNormalUser ["networkmanager"]
++ (lib.lists.optionals host.users.ivy.isPrincipleUser ["wheel"]);
hashedPasswordFile = config.sops.secrets."passwords/ivy".path;
isNormalUser = host.users.ivy.isNormalUser;
isSystemUser = !host.users.ivy.isNormalUser;
group = config.users.users.ivy.name;
};
jellyfin = {
uid = lib.mkForce uids.jellyfin;
isSystemUser = true;
@ -218,11 +238,19 @@ in {
];
};
ivy = {
gid = lib.mkForce gids.ivy;
members = [
ivy
];
};
users = {
gid = lib.mkForce gids.users;
members = [
leyla
eve
ivy
];
};
@ -235,6 +263,7 @@ in {
users.bazarr.name
leyla
eve
ivy
];
};
@ -268,6 +297,7 @@ in {
users.syncthing.name
leyla
eve
ivy
];
};

View file

@ -89,6 +89,11 @@ in {
isDesktopUser = lib.mkDefault false;
isTerminalUser = lib.mkDefault false;
};
ivy = {
isPrincipleUser = lib.mkDefault false;
isDesktopUser = lib.mkDefault false;
isTerminalUser = lib.mkDefault false;
};
};
assertions =

@ -1 +1 @@
Subproject commit f016767c13aa36dde91503f7a9f01bdd02468045
Subproject commit 444229a105445339fb028d15a8d866063c5f8141