Compare commits
6 commits
9113777d05
...
22161de954
| Author | SHA1 | Date | |
|---|---|---|---|
| 22161de954 | |||
| df42da3459 | |||
| cc79ca09ac | |||
| f98f054353 | |||
| 0c66b86941 | |||
| 19c842c00f |
6 changed files with 47 additions and 51 deletions
|
|
@ -10,15 +10,6 @@
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
nix.settings.trusted-users = [ "@wheel" ];
|
nix.settings.trusted-users = [ "@wheel" ];
|
||||||
|
|
||||||
# Dependency of jellyfin-media-player, which hasn't upgraded to Qt6 yet
|
|
||||||
# Related tickets:
|
|
||||||
# - https://github.com/NixOS/nixpkgs/pull/435067
|
|
||||||
# - https://github.com/NixOS/nixpkgs/issues/437865
|
|
||||||
# - https://github.com/jellyfin/jellyfin-media-player/issues/282
|
|
||||||
nixpkgs.config.permittedInsecurePackages = [
|
|
||||||
"qtwebengine-5.15.19"
|
|
||||||
];
|
|
||||||
|
|
||||||
nix.package = pkgs.lixPackageSets.stable.lix;
|
nix.package = pkgs.lixPackageSets.stable.lix;
|
||||||
nixpkgs.overlays = [
|
nixpkgs.overlays = [
|
||||||
(final: prev: {
|
(final: prev: {
|
||||||
|
|
|
||||||
66
flake.lock
generated
66
flake.lock
generated
|
|
@ -10,11 +10,11 @@
|
||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1761656077,
|
"lastModified": 1762618334,
|
||||||
"narHash": "sha256-lsNWuj4Z+pE7s0bd2OKicOFq9bK86JE0ZGeKJbNqb94=",
|
"narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=",
|
||||||
"owner": "ryantm",
|
"owner": "ryantm",
|
||||||
"repo": "agenix",
|
"repo": "agenix",
|
||||||
"rev": "9ba0d85de3eaa7afeab493fed622008b6e4924f5",
|
"rev": "fcdea223397448d35d9b31f798479227e80183f6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -52,11 +52,11 @@
|
||||||
"nixpkgs-lib": "nixpkgs-lib"
|
"nixpkgs-lib": "nixpkgs-lib"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1762440070,
|
"lastModified": 1763759067,
|
||||||
"narHash": "sha256-xxdepIcb39UJ94+YydGP221rjnpkDZUlykKuF54PsqI=",
|
"narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "26d05891e14c88eb4a5d5bee659c0db5afb609d8",
|
"rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -87,16 +87,16 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1758463745,
|
"lastModified": 1764866045,
|
||||||
"narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
|
"narHash": "sha256-0GsEtXV9OquDQ1VclQfP16cU5VZh7NEVIOjSH4UaJuM=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
|
"rev": "f63d0fe9d81d36e5fc95497217a72e02b8b7bcab",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "release-25.05",
|
"ref": "release-25.11",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
@ -108,11 +108,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1762463325,
|
"lastModified": 1764952935,
|
||||||
"narHash": "sha256-33YUsWpPyeBZEWrKQ2a1gkRZ7i0XCC/2MYpU6BVeQSU=",
|
"narHash": "sha256-cRPB2zESVMjIGxJ49qj4t4qnT0ae44E+fS/mkfOS/BY=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "0562fef070a1027325dd4ea10813d64d2c967b39",
|
"rev": "519828bf1c97f8bc2ed2d3b79214067047d3c67d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -123,16 +123,16 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1762498405,
|
"lastModified": 1764831616,
|
||||||
"narHash": "sha256-Zg/SCgCaAioc0/SVZQJxuECGPJy+OAeBcGeA5okdYDc=",
|
"narHash": "sha256-OtzF5wBvO0jgW1WW1rQU9cMGx7zuvkF7CAVJ1ypzkxA=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "6faeb062ee4cf4f105989d490831713cc5a43ee1",
|
"rev": "c97c47f2bac4fa59e2cbdeba289686ae615f8ed4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-25.05",
|
"ref": "nixos-25.11",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
@ -154,27 +154,27 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-small": {
|
"nixpkgs-small": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1762511465,
|
"lastModified": 1764952718,
|
||||||
"narHash": "sha256-9U/5vEE3NPJNTkSmQ6hKI8iOcwTDDAP3ChBwEohAdHg=",
|
"narHash": "sha256-Gf75RCbeYcfXGNb9hHQ7DsVNsxU+TNWivose3JT53QY=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "8660acf86a1f5a14dacf049f9a5b8aff143e9111",
|
"rev": "d355f89e0014e51c9511298089d7ab55fd6f7056",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-25.05-small",
|
"ref": "nixos-25.11-small",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1762363567,
|
"lastModified": 1764667669,
|
||||||
"narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=",
|
"narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4",
|
"rev": "418468ac9527e799809c900eda37cbff999199b6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -186,11 +186,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable-small": {
|
"nixpkgs-unstable-small": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1762580002,
|
"lastModified": 1764945329,
|
||||||
"narHash": "sha256-RyQ8FpohhQumkR7+Yoj4FyUyRQ5A0vJnJ2ZUEtYAMUQ=",
|
"narHash": "sha256-hHzryWFOvCnUfiQvsHEjVpAECIXB977Owi1Gno7YwYc=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "8a0ddfe5e62a2814979672aa1afd54dfb4aa345a",
|
"rev": "21f4f13e179ba2b3d84d844b697612fa1b695b85",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -210,11 +210,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1762274591,
|
"lastModified": 1763909441,
|
||||||
"narHash": "sha256-Vbhluvk15qwiyNDyPd9tjJh9gxIfUjbKVT79c05Pd3I=",
|
"narHash": "sha256-56LwV51TX/FhgX+5LCG6akQ5KrOWuKgcJa+eUsRMxsc=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "plasma-manager",
|
"repo": "plasma-manager",
|
||||||
"rev": "6296d7100cc84b2ff732b7c103a50c2856974cf6",
|
"rev": "b24ed4b272256dfc1cc2291f89a9821d5f9e14b4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -226,11 +226,11 @@
|
||||||
"randomcat": {
|
"randomcat": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1762566840,
|
"lastModified": 1764900354,
|
||||||
"narHash": "sha256-PJIdcs6R80yZipKwD0K/yuahwNpanx1AxCRfsRQ/dXo=",
|
"narHash": "sha256-/pWRIVfDkF26gaYGVc68Xo4WvDSXs+Chbr2iKcOESbc=",
|
||||||
"owner": "randomnetcat",
|
"owner": "randomnetcat",
|
||||||
"repo": "nix-configs",
|
"repo": "nix-configs",
|
||||||
"rev": "7a30bbc509329db6e4aa56c3e4dcb44971f4baa3",
|
"rev": "03e246bb10c135386455af0e88899df2ca10495d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
10
flake.nix
10
flake.nix
|
|
@ -1,12 +1,12 @@
|
||||||
{
|
{
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
|
||||||
nixpkgs-small.url = "github:NixOS/nixpkgs/nixos-25.05-small";
|
nixpkgs-small.url = "github:NixOS/nixpkgs/nixos-25.11-small";
|
||||||
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
|
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||||
nixpkgs-unstable-small.url = "github:NixOS/nixpkgs/nixos-unstable-small";
|
nixpkgs-unstable-small.url = "github:NixOS/nixpkgs/nixos-unstable-small";
|
||||||
|
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager/release-25.05";
|
url = "github:nix-community/home-manager/release-25.11";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -114,7 +114,7 @@
|
||||||
meta = {
|
meta = {
|
||||||
nixpkgs = import nixpkgs-unstable { system = "x86_64-linux"; };
|
nixpkgs = import nixpkgs-unstable { system = "x86_64-linux"; };
|
||||||
nodeNixpkgs = {
|
nodeNixpkgs = {
|
||||||
kilgharrah = import nixpkgs-unstable { system = "x86_64-linux"; };
|
kilgharrah = import nixpkgs { system = "x86_64-linux"; };
|
||||||
tohru = import nixpkgs { system = "x86_64-linux"; };
|
tohru = import nixpkgs { system = "x86_64-linux"; };
|
||||||
elucredassa = import nixpkgs-small { system = "x86_64-linux"; };
|
elucredassa = import nixpkgs-small { system = "x86_64-linux"; };
|
||||||
yevaud = import nixpkgs-small { system = "x86_64-linux"; };
|
yevaud = import nixpkgs-small { system = "x86_64-linux"; };
|
||||||
|
|
@ -143,7 +143,7 @@
|
||||||
tohru.deployment.targetHost = null; # disable remote deployment
|
tohru.deployment.targetHost = null; # disable remote deployment
|
||||||
elucredassa.deployment.targetHost = "100.73.34.182"; # TODO: no fqdn yet
|
elucredassa.deployment.targetHost = "100.73.34.182"; # TODO: no fqdn yet
|
||||||
|
|
||||||
kilgharrah.imports = [ ./hosts/kilgharrah home-manager-unstable ];
|
kilgharrah.imports = [ ./hosts/kilgharrah home-manager ];
|
||||||
tohru.imports = [ ./hosts/tohru home-manager ];
|
tohru.imports = [ ./hosts/tohru home-manager ];
|
||||||
elucredassa.imports = [ ./hosts/elucredassa home-manager ];
|
elucredassa.imports = [ ./hosts/elucredassa home-manager ];
|
||||||
yevaud.imports = [ ./hosts/yevaud home-manager ];
|
yevaud.imports = [ ./hosts/yevaud home-manager ];
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,6 @@ in
|
||||||
discord
|
discord
|
||||||
# https://github.com/NixOS/nixpkgs/issues/427155
|
# https://github.com/NixOS/nixpkgs/issues/427155
|
||||||
# gimp-with-plugins
|
# gimp-with-plugins
|
||||||
jellyfin-media-player
|
|
||||||
tor-browser
|
tor-browser
|
||||||
zoom-us
|
zoom-us
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -56,13 +56,19 @@ in
|
||||||
};
|
};
|
||||||
qenya.services.jellyfin = {
|
qenya.services.jellyfin = {
|
||||||
enable = true;
|
enable = true;
|
||||||
domain = "jellyfin.qenya.tel";
|
domain = "tv.qenya.tel";
|
||||||
};
|
};
|
||||||
qenya.services.navidrome = {
|
qenya.services.navidrome = {
|
||||||
enable = true;
|
enable = true;
|
||||||
domain = "music.qenya.tel";
|
domain = "music.qenya.tel";
|
||||||
dataDir = "/srv/music";
|
dataDir = "/srv/music";
|
||||||
};
|
};
|
||||||
|
fountain.services.web-redirect = {
|
||||||
|
enable = true;
|
||||||
|
domains = {
|
||||||
|
"jellyfin.qenya.tel" = "tv.qenya.tel";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
system.stateVersion = "24.05";
|
system.stateVersion = "24.05";
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -10,8 +10,8 @@
|
||||||
nixpkgs.config.cudaSupport = true;
|
nixpkgs.config.cudaSupport = true;
|
||||||
nix.settings = {
|
nix.settings = {
|
||||||
# Community cache with prebuilt packages with cudaSupport enabled
|
# Community cache with prebuilt packages with cudaSupport enabled
|
||||||
substituters = [ "https://nix-community.cachix.org" ];
|
substituters = [ "https://cache.nixos-cuda.org" ];
|
||||||
trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" ];
|
trusted-public-keys = [ "cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M=" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
# # Downgrade to driver version 535 as 550 has problems with Wayland
|
# # Downgrade to driver version 535 as 550 has problems with Wayland
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue