mirror of
https://git.lgmrszd.xyz/Lgmrszd/nix-cfg.git
synced 2025-12-16 16:38:19 +01:00
Compare commits
No commits in common. "75958b0566666d6047e19836daeea2be4c300bfb" and "5543cf819fa3a81eebeecc1048cd19677b9fb593" have entirely different histories.
75958b0566
...
5543cf819f
7 changed files with 53 additions and 82 deletions
76
flake.lock
generated
76
flake.lock
generated
|
|
@ -18,11 +18,11 @@
|
|||
"uv2nix": "uv2nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1749129962,
|
||||
"narHash": "sha256-gc1l5z5dWw9a9DWsrp0ZiD+SSMsNpEwMEiRi8K5sh5c=",
|
||||
"lastModified": 1747386678,
|
||||
"narHash": "sha256-+4pIDo56iXWUklX1U+biw/cfC8TiSXTMh2N6V/+JMUg=",
|
||||
"owner": "nix-community",
|
||||
"repo": "authentik-nix",
|
||||
"rev": "271a38f7c4e2551f0674b894e2adf7cd1ddb8168",
|
||||
"rev": "f20474660332903be6b47f3c1fdfc531f6f75f1d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -34,16 +34,16 @@
|
|||
"authentik-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1749043670,
|
||||
"narHash": "sha256-gwHngqb23U8By7jhxFWQZOXy+vPQApJSkvr4gHI5ifQ=",
|
||||
"lastModified": 1747329052,
|
||||
"narHash": "sha256-idShMSYIrf3ViG9VFNGNu6TSjBz3Q+GJMMeCzcJwfG4=",
|
||||
"owner": "goauthentik",
|
||||
"repo": "authentik",
|
||||
"rev": "bda30c5ad5838fea36dc0a06f8580cca437f0fc0",
|
||||
"rev": "ae47624761f05040149d856d5e55a90cd7492740",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "goauthentik",
|
||||
"ref": "version/2025.4.2",
|
||||
"ref": "version/2025.4.1",
|
||||
"repo": "authentik",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -100,11 +100,11 @@
|
|||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1748821116,
|
||||
"narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=",
|
||||
"lastModified": 1743550720,
|
||||
"narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1",
|
||||
"rev": "c621e8422220273271f52058f618c94e405bb0f5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -242,11 +242,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1749243446,
|
||||
"narHash": "sha256-P1gumhZN5N9q+39ndePHYrtwOwY1cGx+VoXGl+vTm7A=",
|
||||
"lastModified": 1747439237,
|
||||
"narHash": "sha256-5rCGrnkglKKj4cav1U3HC+SIUNJh08pqOK4spQv9RjA=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "2d7d65f65b61fdfce23278e59ca266ddd0ef0a36",
|
||||
"rev": "ae755329092c87369b9e9a1510a8cf1ce2b1c708",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -284,7 +284,7 @@
|
|||
"narHash": "sha256-11R4K3iAx4tLXjUs+hQ5K90JwDABD/XHhsM9nkeS5N8=",
|
||||
"rev": "cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc.tar.gz?rev=cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc"
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
|
|
@ -301,14 +301,14 @@
|
|||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"nixpkgs-25_05": "nixpkgs-25_05"
|
||||
"nixpkgs-24_11": "nixpkgs-24_11"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1749244584,
|
||||
"narHash": "sha256-BGmEptAyP2NrP4gX7VMYWo53h5e8r2iE/uo2+YPMcfo=",
|
||||
"lastModified": 1747320434,
|
||||
"narHash": "sha256-wOW99SCOovRlX5y8+W1cRrS3mEN1QA0XTHMRfr3NMB8=",
|
||||
"owner": "simple-nixos-mailserver",
|
||||
"repo": "nixos-mailserver",
|
||||
"rev": "8b27add0883067e990bff4f847b6f7b6f53324b9",
|
||||
"rev": "433520257af7170824ab6e567d49b8e305e776e9",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -361,11 +361,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1749143949,
|
||||
"narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=",
|
||||
"lastModified": 1747327360,
|
||||
"narHash": "sha256-LSmTbiq/nqZR9B2t4MRnWG7cb0KVNU70dB7RT4+wYK4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d",
|
||||
"rev": "e06158e58f3adee28b139e9c2bcfcc41f8625b46",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -375,29 +375,29 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-25_05": {
|
||||
"nixpkgs-24_11": {
|
||||
"locked": {
|
||||
"lastModified": 1747610100,
|
||||
"narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=",
|
||||
"lastModified": 1747209494,
|
||||
"narHash": "sha256-fLise+ys+bpyjuUUkbwqo5W/UyIELvRz9lPBPoB0fbM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "ca49c4304acf0973078db0a9d200fd2bae75676d",
|
||||
"rev": "5d736263df906c5da72ab0f372427814de2f52f8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-25.05",
|
||||
"ref": "nixos-24.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"lastModified": 1748740939,
|
||||
"narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=",
|
||||
"lastModified": 1743296961,
|
||||
"narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"rev": "656a64127e9d791a334452c6b6606d17539476e2",
|
||||
"rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -438,11 +438,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1748562898,
|
||||
"narHash": "sha256-STk4QklrGpM3gliPKNJdBLSQvIrqRuwHI/rnYb/5rh8=",
|
||||
"lastModified": 1744599653,
|
||||
"narHash": "sha256-nysSwVVjG4hKoOjhjvE6U5lIKA8sEr1d1QzEfZsannU=",
|
||||
"owner": "pyproject-nix",
|
||||
"repo": "build-system-pkgs",
|
||||
"rev": "33bd58351957bb52dd1700ea7eeefe34de06a892",
|
||||
"rev": "7dba6dbc73120e15b558754c26024f6c93015dd7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -496,11 +496,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747603214,
|
||||
"narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=",
|
||||
"lastModified": 1746485181,
|
||||
"narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd",
|
||||
"rev": "e93ee1d900ad264d65e9701a5c6f895683433386",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -566,11 +566,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1748916602,
|
||||
"narHash": "sha256-GiwjjmPIISDFD0uQ1DqQ+/38hZ+2z1lTKVj/TkKaWwQ=",
|
||||
"lastModified": 1746649034,
|
||||
"narHash": "sha256-gmv+ZiY3pQnwgI0Gm3Z1tNSux1CnOJ0De+xeDOol1+0=",
|
||||
"owner": "pyproject-nix",
|
||||
"repo": "uv2nix",
|
||||
"rev": "a4dd471de62b27928191908f57bfcd702ec2bfc9",
|
||||
"rev": "fe540e91c26f378c62bf6da365a97e848434d0cd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ in
|
|||
{
|
||||
imports = [
|
||||
./thinkfan.nix
|
||||
./jdks.nix
|
||||
./mounts.nix
|
||||
./akkotest.nix
|
||||
];
|
||||
|
|
@ -129,10 +128,8 @@ in
|
|||
open = false;
|
||||
# Enable the nvidia settings menu
|
||||
nvidiaSettings = true;
|
||||
powerManagement.enable = true;
|
||||
powerManagement.finegrained = false;
|
||||
# Optionally, you may need to select the appropriate driver version for your specific GPU.
|
||||
package = config.boot.kernelPackages.nvidiaPackages.beta;
|
||||
package = config.boot.kernelPackages.nvidiaPackages.stable;
|
||||
};
|
||||
# NVIDIA
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ in
|
|||
boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "ahci" "nvme" "usbhid" "uas" "usb_storage" "rtsx_pci_sdmmc" ];
|
||||
boot.initrd.kernelModules = [ "dm-snapshot" ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.kernelParams = [ "i915.enable_psr=0" "nvidia.NVreg_PreserveVideoMemoryAllocations=1" ];
|
||||
boot.kernelParams = [ "i915.enable_psr=0" ];
|
||||
boot.extraModulePackages = with config.boot.kernelPackages; [ acpi_call ];
|
||||
|
||||
fileSystems."/" =
|
||||
|
|
|
|||
|
|
@ -97,26 +97,20 @@
|
|||
# dev
|
||||
# Wrap idea-community to add libraries required for Minecraft Moddev
|
||||
jetbrains.idea-community
|
||||
(mylib.appwrapper {
|
||||
(mylib.IDEAappwrapper {
|
||||
inherit pkgs;
|
||||
inputpkg = jetbrains.idea-community;
|
||||
pkgsuffix = "mcdev-jbr17";
|
||||
libraries = with pkgs; [libpulseaudio libGL glfw openal stdenv.cc.cc.lib];
|
||||
jdk = pkgs.jetbrains.jdk-no-jcef-17;
|
||||
})
|
||||
(mylib.IDEAappwrapper {
|
||||
inherit pkgs;
|
||||
inputpkg = jetbrains.idea-community;
|
||||
pkgsuffix = "mcdev-jbr21";
|
||||
libraries = with pkgs; [libpulseaudio libGL glfw openal stdenv.cc.cc.lib];
|
||||
jdk = pkgs.jetbrains.jdk-no-jcef;
|
||||
})
|
||||
# (mylib.IDEAappwrapper {
|
||||
# inherit pkgs;
|
||||
# inputpkg = jetbrains.idea-community;
|
||||
# pkgsuffix = "mcdev-jbr17";
|
||||
# libraries = with pkgs; [libpulseaudio libGL glfw openal stdenv.cc.cc.lib];
|
||||
# jdk = pkgs.jetbrains.jdk-no-jcef-17;
|
||||
# })
|
||||
# (mylib.IDEAappwrapper {
|
||||
# inherit pkgs;
|
||||
# inputpkg = jetbrains.idea-community;
|
||||
# pkgsuffix = "mcdev-jbr21";
|
||||
# libraries = with pkgs; [libpulseaudio libGL glfw openal stdenv.cc.cc.lib];
|
||||
# jdk = pkgs.jetbrains.jdk-no-jcef;
|
||||
# })
|
||||
packwiz
|
||||
# vscodium # see programs.vscode
|
||||
#nnn # terminal file manager
|
||||
|
|
@ -231,7 +225,6 @@
|
|||
init = {
|
||||
defaultBranch = "main";
|
||||
};
|
||||
worktree.useRelativePaths = true;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
# https://discourse.nixos.org/t/system-wide-installation-of-gradle-and-jdk/11305/4
|
||||
{ config, pkgs, ...}:
|
||||
let
|
||||
jdkEnv = pkgs.runCommand "jdk-env" {
|
||||
buildInputs = with pkgs; [
|
||||
pkgs.jetbrains.jdk-no-jcef
|
||||
pkgs.jetbrains.jdk-no-jcef-17
|
||||
];
|
||||
} ''
|
||||
mkdir -p $out/jdks
|
||||
ln -s ${pkgs.jetbrains.jdk-no-jcef}/lib/openjdk $out/jdks/jdk-no-jcef
|
||||
ln -s ${pkgs.jetbrains.jdk-no-jcef-17}/lib/openjdk $out/jdks/jdk-no-jcef-17
|
||||
'';
|
||||
in {
|
||||
environment.systemPackages = [
|
||||
jdkEnv
|
||||
];
|
||||
systemd.tmpfiles.rules = [
|
||||
"d /opt 755 root root -"
|
||||
"L+ /opt/java - - - - ${jdkEnv}/jdks"
|
||||
];
|
||||
}
|
||||
|
|
@ -51,6 +51,7 @@ in
|
|||
|
||||
services.vscode-server = {
|
||||
enable = true;
|
||||
nodejsPackage = pkgs.nodejs_18;
|
||||
installPath = "$HOME/.vscodium-server";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
inputpkg,
|
||||
pkgsuffix,
|
||||
libraries,
|
||||
extrapathpkgs
|
||||
}: with pkgs; let
|
||||
name = "${inputpkg.pname}-${pkgsuffix}";
|
||||
in stdenv.mkDerivation {
|
||||
|
|
@ -16,7 +17,8 @@
|
|||
mkdir -p $out/share/applications
|
||||
cp ${inputpkg}/share/applications/${inputpkg.pname}.desktop $out/share/applications/${name}.desktop
|
||||
makeWrapper ${inputpkg}/bin/${inputpkg.pname} $out/bin/${name} \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath libraries}"
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath libraries}" \
|
||||
--prefix PATH : "${lib.makeBinPath extrapathpkgs}"
|
||||
substituteInPlace $out/share/applications/${name}.desktop \
|
||||
--replace-fail "=${inputpkg.pname}" "=${name}"
|
||||
sed -i -E "s/^Name=(.*)/Name=\1 (${pkgsuffix})/g" "$out/share/applications/${name}.desktop"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue