nydragon/nix-da
1
Fork 0
Code Issues Pull requests Activity Actions 1

feat: add grayjay-desktop and move all user specific packages out of hm
Some checks failed
/ test (push) Failing after 1s
Details

Browse source
This commit is contained in:
nydragon 2025-02-04 19:35:34 +01:00
parent ea7dd623ed
commit d205d32a5f
Signed by: nydragon
SSH key fingerprint: SHA256:WcjW5NJPQ8Dx4uQDmoIlVPLWE27Od3fxoe0IUvuoPHE
7 changed files with 223 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

156
flake.lock generated
View file

@ -65,6 +65,22 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1650374568,
"narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "b4a34015c698c7793d592d66adbab377907a2be8",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
@ -103,6 +119,43 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils-plus": {
"inputs": {
"flake-utils": "flake-utils"
},
"locked": {
"lastModified": 1715533576,
"narHash": "sha256-fT4ppWeCJ0uR300EH3i7kmgRZnAVxrH+XtK09jQWihk=",
"owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus",
"rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f",
"type": "github"
},
"original": {
"owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus",
"rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -183,6 +236,44 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": {
"locked": {
"lastModified": 1738297584,
"narHash": "sha256-AYvaFBzt8dU0fcSK2jKD0Vg23K2eIRxfsVXIPCW9a0E=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9189ac18287c599860e878e905da550aa6dec1cd",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nur": {
"inputs": {
"flake-parts": "flake-parts_2",
"nixpkgs": [
"nixpkgs"
],
"quasigod": "quasigod"
},
"locked": {
"lastModified": 1738585852,
"narHash": "sha256-Z+cDls2k+57lAFU+/EwRcjutgCI2iRMRpGlXHMkVcz8=",
"ref": "refs/heads/master",
"rev": "60d71b8a446906db16b33bc3081507d077d39b6c",
"revCount": 5,
"type": "git",
"url": "https://git.ccnlc.eu/nydragon/nur.git"
},
"original": {
"type": "git",
"url": "https://git.ccnlc.eu/nydragon/nur.git"
}
},
"nysh": { "nysh": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -204,25 +295,23 @@
"url": "https://git.ccnlc.eu/nydragon/nysh.git" "url": "https://git.ccnlc.eu/nydragon/nysh.git"
} }
}, },
"packages": { "quasigod": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_2", "nixpkgs": "nixpkgs_3",
"nixpkgs": [ "snowfall-lib": "snowfall-lib"
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1736286786, "lastModified": 1738444760,
"narHash": "sha256-OXG6hpb7cu182+/5N9B34Kk10+2r89/XIjn4NW/pgI8=", "narHash": "sha256-MbAyUUHtiByivJLDKLO5fu3goxeHxQHQxqCzhAZ3F14=",
"ref": "refs/heads/master", "ref": "refs/heads/main",
"rev": "9208515d0f98f26291a023c4b5ca6e546784da74", "rev": "a1db39ff40250211485a98853c6d71ac42d79026",
"revCount": 3, "revCount": 16,
"type": "git", "type": "git",
"url": "https://git.ccnlc.eu/nydragon/packages.git" "url": "https://codeberg.org/quasigod/nur.git"
}, },
"original": { "original": {
"type": "git", "type": "git",
"url": "https://git.ccnlc.eu/nydragon/packages.git" "url": "https://codeberg.org/quasigod/nur.git"
} }
}, },
"quickshell": { "quickshell": {
@ -254,8 +343,32 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nysh": "nysh", "nur": "nur",
"packages": "packages" "nysh": "nysh"
}
},
"snowfall-lib": {
"inputs": {
"flake-compat": "flake-compat",
"flake-utils-plus": "flake-utils-plus",
"nixpkgs": [
"nur",
"quasigod",
"nixpkgs"
]
},
"locked": {
"lastModified": 1736130495,
"narHash": "sha256-4i9nAJEZFv7vZMmrE0YG55I3Ggrtfo5/T07JEpEZ/RM=",
"owner": "snowfallorg",
"repo": "lib",
"rev": "02d941739f98a09e81f3d2d9b3ab08918958beac",
"type": "github"
},
"original": {
"owner": "snowfallorg",
"repo": "lib",
"type": "github"
} }
}, },
"systems": { "systems": {
@ -272,6 +385,21 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

4
flake.nix
View file

@ -31,8 +31,8 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
packages = { nur = {
url = "git+https://git.ccnlc.eu/nydragon/packages.git"; url = "git+https://git.ccnlc.eu/nydragon/nur.git";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };

4
hosts/brontes/default.nix
View file

@ -2,6 +2,7 @@
{ {
pkgs, pkgs,
config, config,
inputs',
... ...
}: }:
let let
@ -103,6 +104,9 @@ in
users = { users = {
defaultUserShell = pkgs.fish; defaultUserShell = pkgs.fish;
users.${username} = { users.${username} = {
packages = [
inputs'.nur.packages.grayjay-desktop
];
isNormalUser = true; isNormalUser = true;
createHome = true; createHome = true;
extraGroups = [ extraGroups = [

16
hosts/marr/default.nix
View file

@ -1,17 +1,14 @@
# vim:fileencoding=utf-8:foldmethod=marker # vim:fileencoding=utf-8:foldmethod=marker
{ {
config,
pkgs, pkgs,
inputs, inputs,
... ...
}: }:
let
inherit (config.modules.meta) username;
in
{ {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
./home.nix ./home.nix
./ny.nix
]; ];
time.timeZone = "Europe/Paris"; time.timeZone = "Europe/Paris";
@ -141,17 +138,6 @@ in
users = { users = {
defaultUserShell = pkgs.fish; defaultUserShell = pkgs.fish;
users.${username} = {
isNormalUser = true;
createHome = true;
extraGroups = [
"networkmanager"
"wheel"
"audio"
"libvirtd"
"dialout" # Necessary for serial port interactions
];
};
}; };
environment.variables = { environment.variables = {

50
hosts/marr/home.nix
View file

@ -1,5 +1,4 @@
{ {
pkgs,
config, config,
inputs, inputs,
... ...
@ -44,54 +43,7 @@ in
home = { home = {
inherit username; inherit username;
stateVersion = config.system.stateVersion; inherit (config.system) stateVersion;
packages = with pkgs; [
digikam
fragments
element-desktop
loupe
seahorse
gimp
thunderbird
keepassxc
protonmail-bridge-gui
varia
signal-desktop
onlyoffice-desktopeditors
picard
simple-scan
insomnia
beekeeper-studio
# Proprietary
postman
mongodb-compass
obsidian
# CLI tools
jhead
fdupes
exiftool
sshfs
lazygit
swaybg
wl-clipboard
# custom
nysh
scripts.screenshot
scripts.nixedit
scripts.set-background
scripts.rpaste
scripts.nrun
scripts.nruni
scripts.genswitch
scripts.gentest
scripts.editsym
scripts.deployswitch
scripts.deploytest
];
}; };
}; };
} }

71
hosts/marr/ny.nix Normal file
View file

@ -0,0 +1,71 @@
{
pkgs,
config,
inputs',
...
}:
let
inherit (config.modules.meta) username;
in
{
config = {
users.users.${username} = {
packages =
[
inputs'.nur.packages.grayjay-desktop
]
++ (with pkgs; [
digikam
fragments
element-desktop
loupe
seahorse
gimp
thunderbird
keepassxc
protonmail-bridge-gui
varia
signal-desktop
onlyoffice-desktopeditors
picard
simple-scan
insomnia
beekeeper-studio
# Proprietary
postman
mongodb-compass
obsidian
# CLI tools
jhead
fdupes
exiftool
sshfs
lazygit
wl-clipboard
# custom
nysh
scripts.screenshot
scripts.nixedit
scripts.set-background
scripts.rpaste
scripts.nrun
scripts.nruni
scripts.genswitch
scripts.gentest
scripts.editsym
scripts.deployswitch
scripts.deploytest
]);
isNormalUser = true;
createHome = true;
extraGroups = [
"networkmanager"
"audio"
"libvirtd"
];
};
};
}

3
hosts/raptus/default.nix
View file

@ -37,7 +37,7 @@ in
modules = { modules = {
server.rustypaste = { server.rustypaste = {
enable = true; enable = true;
package = inputs'.packages.packages.rustypaste; package = inputs'.nur.packages.rustypaste;
authTokenFile = config.age.secrets.rustypaste.path; authTokenFile = config.age.secrets.rustypaste.path;
settings = { settings = {
server = { server = {
@ -129,6 +129,7 @@ in
host = "0.0.0.0"; host = "0.0.0.0";
port = 4739; port = 4739;
protocolUseSSL = true; protocolUseSSL = true;
allowEmailRegister = false;
}; };
}; };