From d205d32a5f2ab8e8f018e2c2e7efe5afdba72406 Mon Sep 17 00:00:00 2001 From: nydragon Date: Tue, 4 Feb 2025 19:35:34 +0100 Subject: [PATCH] feat: add grayjay-desktop and move all user specific packages out of hm --- flake.lock | 156 ++++++++++++++++++++++++++++++++++---- flake.nix | 4 +- hosts/brontes/default.nix | 4 + hosts/marr/default.nix | 16 +--- hosts/marr/home.nix | 50 +----------- hosts/marr/ny.nix | 71 +++++++++++++++++ hosts/raptus/default.nix | 3 +- 7 files changed, 223 insertions(+), 81 deletions(-) create mode 100644 hosts/marr/ny.nix diff --git a/flake.lock b/flake.lock index 92b9e1f..f0cf3f6 100644 --- a/flake.lock +++ b/flake.lock @@ -65,6 +65,22 @@ "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": { "inputs": { "nixpkgs-lib": [ @@ -103,6 +119,43 @@ "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": { "inputs": { "nixpkgs": [ @@ -183,6 +236,44 @@ "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": { "inputs": { "nixpkgs": [ @@ -204,25 +295,23 @@ "url": "https://git.ccnlc.eu/nydragon/nysh.git" } }, - "packages": { + "quasigod": { "inputs": { - "flake-parts": "flake-parts_2", - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_3", + "snowfall-lib": "snowfall-lib" }, "locked": { - "lastModified": 1736286786, - "narHash": "sha256-OXG6hpb7cu182+/5N9B34Kk10+2r89/XIjn4NW/pgI8=", - "ref": "refs/heads/master", - "rev": "9208515d0f98f26291a023c4b5ca6e546784da74", - "revCount": 3, + "lastModified": 1738444760, + "narHash": "sha256-MbAyUUHtiByivJLDKLO5fu3goxeHxQHQxqCzhAZ3F14=", + "ref": "refs/heads/main", + "rev": "a1db39ff40250211485a98853c6d71ac42d79026", + "revCount": 16, "type": "git", - "url": "https://git.ccnlc.eu/nydragon/packages.git" + "url": "https://codeberg.org/quasigod/nur.git" }, "original": { "type": "git", - "url": "https://git.ccnlc.eu/nydragon/packages.git" + "url": "https://codeberg.org/quasigod/nur.git" } }, "quickshell": { @@ -254,8 +343,32 @@ "home-manager": "home-manager", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", - "nysh": "nysh", - "packages": "packages" + "nur": "nur", + "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": { @@ -272,6 +385,21 @@ "repo": "default", "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", diff --git a/flake.nix b/flake.nix index 460630c..ffc2360 100644 --- a/flake.nix +++ b/flake.nix @@ -31,8 +31,8 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - packages = { - url = "git+https://git.ccnlc.eu/nydragon/packages.git"; + nur = { + url = "git+https://git.ccnlc.eu/nydragon/nur.git"; inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/hosts/brontes/default.nix b/hosts/brontes/default.nix index 880faf9..c85205a 100644 --- a/hosts/brontes/default.nix +++ b/hosts/brontes/default.nix @@ -2,6 +2,7 @@ { pkgs, config, + inputs', ... }: let @@ -103,6 +104,9 @@ in users = { defaultUserShell = pkgs.fish; users.${username} = { + packages = [ + inputs'.nur.packages.grayjay-desktop + ]; isNormalUser = true; createHome = true; extraGroups = [ diff --git a/hosts/marr/default.nix b/hosts/marr/default.nix index 5e2e13f..6e871ff 100644 --- a/hosts/marr/default.nix +++ b/hosts/marr/default.nix @@ -1,17 +1,14 @@ # vim:fileencoding=utf-8:foldmethod=marker { - config, pkgs, inputs, ... }: -let - inherit (config.modules.meta) username; -in { imports = [ ./hardware-configuration.nix ./home.nix + ./ny.nix ]; time.timeZone = "Europe/Paris"; @@ -141,17 +138,6 @@ in users = { defaultUserShell = pkgs.fish; - users.${username} = { - isNormalUser = true; - createHome = true; - extraGroups = [ - "networkmanager" - "wheel" - "audio" - "libvirtd" - "dialout" # Necessary for serial port interactions - ]; - }; }; environment.variables = { diff --git a/hosts/marr/home.nix b/hosts/marr/home.nix index a607674..3c348bc 100644 --- a/hosts/marr/home.nix +++ b/hosts/marr/home.nix @@ -1,5 +1,4 @@ { - pkgs, config, inputs, ... @@ -44,54 +43,7 @@ in home = { inherit username; - stateVersion = 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 - ]; + inherit (config.system) stateVersion; }; }; } diff --git a/hosts/marr/ny.nix b/hosts/marr/ny.nix new file mode 100644 index 0000000..e859060 --- /dev/null +++ b/hosts/marr/ny.nix @@ -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" + ]; + }; + }; +} diff --git a/hosts/raptus/default.nix b/hosts/raptus/default.nix index 10a720e..167008e 100644 --- a/hosts/raptus/default.nix +++ b/hosts/raptus/default.nix @@ -37,7 +37,7 @@ in modules = { server.rustypaste = { enable = true; - package = inputs'.packages.packages.rustypaste; + package = inputs'.nur.packages.rustypaste; authTokenFile = config.age.secrets.rustypaste.path; settings = { server = { @@ -129,6 +129,7 @@ in host = "0.0.0.0"; port = 4739; protocolUseSSL = true; + allowEmailRegister = false; }; };