NixOS/FxNet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Flake update, use goland and rust from stable, add kdenlive for fenix@fenixpc

Browse Source
This commit is contained in:
derFenix
2025-10-14 18:02:42 +03:00
parent 9b71a9e223
commit 9d8a66facd
4 changed files with 46 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
flake.lock generated
View File

@@ -28,11 +28,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1759843719, "lastModified": 1760312644,
"narHash": "sha256-uDCZabbZYy7i5OBF+zORWzbEQsmcq1sdvFVA/94jGDg=", "narHash": "sha256-U9SkK45314urw9P7MmjhEgiQwwD/BTj+T3HTuz1JU1Q=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "5443ca20ed5c5da327de37a09910dc1c66fc3712", "rev": "e121f3773fa596ecaba5b22e518936a632d72a90",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -77,11 +77,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1759582739, "lastModified": 1760106635,
"narHash": "sha256-spZegilADH0q5OngM86u6NmXxduCNv5eX9vCiUPhOYc=", "narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "3441b5242af7577230a78ffb03542add264179ab", "rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -93,11 +93,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1759733170, "lastModified": 1760284886,
"narHash": "sha256-TXnlsVb5Z8HXZ6mZoeOAIwxmvGHp1g4Dw89eLvIwKVI=", "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8913c168d1c56dc49a7718685968f38752171c3b", "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -107,13 +107,29 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1759735786, "lastModified": 1760449308,
"narHash": "sha256-a0+h02lyP2KwSNrZz4wLJTu9ikujNsTWIC874Bv7IJ0=", "narHash": "sha256-axQMo8QCJ8tljW/xOFqW8aLdiwgxlC8Vh8mpY75ThJ4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "20c4598c84a671783f741e02bf05cbfaf4907cff", "rev": "6523c0d29f7f8dc4e4d3b7a19ff319aa1ccc6a54",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1760139962,
"narHash": "sha256-4xggC56Rub3WInz5eD7EZWXuLXpNvJiUPahGtMkwtuc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "7e297ddff44a3cc93673bb38d0374df8d0ad73e4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -179,6 +195,7 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-master": "nixpkgs-master",
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable",
"photocatalog": "photocatalog", "photocatalog": "photocatalog",
"raspberry-pi-nix": "raspberry-pi-nix" "raspberry-pi-nix": "raspberry-pi-nix"

10
flake.nix
View File

@@ -4,6 +4,7 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.05"; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.05";
nixpkgs-master.url = "github:NixOS/nixpkgs/master";
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@@ -30,6 +31,7 @@
self, self,
nixpkgs, nixpkgs,
nixpkgs-stable, nixpkgs-stable,
nixpkgs-master,
... ...
}@inputs: }@inputs:
let let
@@ -57,6 +59,12 @@
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
pkgsMasterSettings =
system:
import nixpkgs-master {
inherit system;
config.allowUnfree = true;
};
hosts = import ./hosts.nix; hosts = import ./hosts.nix;
hostNames = builtins.attrNames hosts; hostNames = builtins.attrNames hosts;
@@ -82,6 +90,7 @@
extraSpecialArgs = { extraSpecialArgs = {
inherit inputs; inherit inputs;
pkgsStable = pkgsStableSettings pkgs.system; pkgsStable = pkgsStableSettings pkgs.system;
pkgsMaster = pkgsMasterSettings pkgs.system;
hosts = hosts; hosts = hosts;
}; };
}; };
@@ -107,6 +116,7 @@
specialArgs = { specialArgs = {
inherit inputs; inherit inputs;
pkgsStable = pkgsStableSettings host.system; pkgsStable = pkgsStableSettings host.system;
pkgsMaster = pkgsMasterSettings host.system;
hosts = hosts; hosts = hosts;
quirks = (quirks: (import ./quirks { inherit quirks; })); quirks = (quirks: (import ./quirks { inherit quirks; }));
}; };

6
hosts/fenixpc/fenix.nix
View File

@@ -1,5 +1,6 @@
{ {
pkgs, pkgs,
pkgsStable,
lib, lib,
config, config,
... ...
@@ -18,6 +19,7 @@ in
spotify spotify
obsidian obsidian
transmission_4-qt6 transmission_4-qt6
kdePackages.kdenlive
# Games # Games
steam steam
@@ -31,8 +33,8 @@ in
direnv direnv
yaml-language-server yaml-language-server
plantuml plantuml
jetbrains.goland pkgsStable.jetbrains.goland
jetbrains.rust-rover pkgsStable.jetbrains.rust-rover
rustup rustup
gcc gcc
gnumake gnumake

4
modules/sys/calibre-web.nix
View File

@@ -1,10 +1,10 @@
{ pkgsStable, lib, ... }: { pkgs, lib, ... }:
{ {
services = { services = {
calibre-web = { calibre-web = {
listen.port = lib.mkDefault 8091; listen.port = lib.mkDefault 8091;
listen.ip = lib.mkDefault "0.0.0.0"; listen.ip = lib.mkDefault "0.0.0.0";
package = pkgsStable.calibre-web; package = pkgs.calibre-web;
options = { options = {
enableBookUploading = true; enableBookUploading = true;
enableBookConversion = true; enableBookConversion = true;