mirror of
https://github.com/Gerg-L/nixos.git
synced 2025-12-10 00:43:56 -05:00
Compare commits
7 commits
99f42f5841
...
619a1c09dc
| Author | SHA1 | Date | |
|---|---|---|---|
| 619a1c09dc | |||
| 5f3f4e9fd0 | |||
| d54be846e5 | |||
| 9908662e8a | |||
| 6d187cd057 | |||
| 8a55bc5ebd | |||
| 1713fbb4d2 |
10 changed files with 82 additions and 69 deletions
32
flake.lock
generated
32
flake.lock
generated
|
|
@ -385,23 +385,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"libgit2": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1715853528,
|
|
||||||
"narHash": "sha256-J2rCxTecyLbbDdsyBWn9w7r3pbKRMkI9E7RvRgAqBdY=",
|
|
||||||
"owner": "libgit2",
|
|
||||||
"repo": "libgit2",
|
|
||||||
"rev": "36f7e21ad757a3dacc58cf7944329da6bc1d6e96",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "libgit2",
|
|
||||||
"ref": "v1.8.1",
|
|
||||||
"repo": "libgit2",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"master": {
|
"master": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1736742312,
|
"lastModified": 1736742312,
|
||||||
|
|
@ -478,7 +461,6 @@
|
||||||
"flake-compat": "flake-compat_2",
|
"flake-compat": "flake-compat_2",
|
||||||
"flake-parts": "flake-parts_2",
|
"flake-parts": "flake-parts_2",
|
||||||
"git-hooks-nix": "git-hooks-nix",
|
"git-hooks-nix": "git-hooks-nix",
|
||||||
"libgit2": "libgit2",
|
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"stable"
|
"stable"
|
||||||
],
|
],
|
||||||
|
|
@ -486,16 +468,16 @@
|
||||||
"nixpkgs-regression": "nixpkgs-regression"
|
"nixpkgs-regression": "nixpkgs-regression"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732892090,
|
"lastModified": 1736798728,
|
||||||
"narHash": "sha256-Ka/uNdaqpTAiVL++4MPHg8fG5o1tiJeY6G2t5UiKhd8=",
|
"narHash": "sha256-Em+CXWHBgLG2m106Hs11FmVlsCr3ZQedTosJvRF2gnE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nix",
|
"repo": "nix",
|
||||||
"rev": "64000481168d1da9d2519f055dd1fdee22275c21",
|
"rev": "2cb0ddfe4eb216fab6d826c1056743c152722720",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "64000481168d1da9d2519f055dd1fdee22275c21",
|
"ref": "2cb0ddfe4eb216fab6d826c1056743c152722720",
|
||||||
"repo": "nix",
|
"repo": "nix",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
@ -680,11 +662,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1736742095,
|
"lastModified": 1736799472,
|
||||||
"narHash": "sha256-G5ZsiqzjIICWQQemgDKPBgI1K+vlYGqbc42gqQW5s/Q=",
|
"narHash": "sha256-gkW0sjhr+PqdcvnIP3WnJvTcKEFtbo147IfKC2zbKZw=",
|
||||||
"owner": "Gerg-L",
|
"owner": "Gerg-L",
|
||||||
"repo": "nvim-flake",
|
"repo": "nvim-flake",
|
||||||
"rev": "7b2cbea0895cc98fdeefd957b6edef36ee2c837b",
|
"rev": "00404b2c890470649d7cea6e2fb596875531add9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@
|
||||||
type = "github";
|
type = "github";
|
||||||
owner = "NixOS";
|
owner = "NixOS";
|
||||||
repo = "nix";
|
repo = "nix";
|
||||||
ref = "64000481168d1da9d2519f055dd1fdee22275c21";
|
ref = "2cb0ddfe4eb216fab6d826c1056743c152722720";
|
||||||
inputs.nixpkgs.follows = "stable";
|
inputs.nixpkgs.follows = "stable";
|
||||||
};
|
};
|
||||||
nixos-generators = {
|
nixos-generators = {
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,14 @@ let
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
#hardware.amdgpu = {
|
||||||
|
# amdvlk = {
|
||||||
|
# enable = true;
|
||||||
|
# support32Bit.enable = true;
|
||||||
|
# };
|
||||||
|
# initrd.enable = true;
|
||||||
|
# opencl.enable = true;
|
||||||
|
#};
|
||||||
environment.etc = {
|
environment.etc = {
|
||||||
"Xorg/1_mon.conf".source = "${_dir}/1_mon.conf";
|
"Xorg/1_mon.conf".source = "${_dir}/1_mon.conf";
|
||||||
"Xorg/2_mon.conf".source = "${_dir}/2_mon.conf";
|
"Xorg/2_mon.conf".source = "${_dir}/2_mon.conf";
|
||||||
|
|
@ -33,6 +41,8 @@ in
|
||||||
|
|
||||||
services.xserver = {
|
services.xserver = {
|
||||||
|
|
||||||
|
videoDrivers = [ "amdgpu" ];
|
||||||
|
|
||||||
displayManager.setupCommands = lib.mkBefore ''
|
displayManager.setupCommands = lib.mkBefore ''
|
||||||
if ! [ -e "/etc/Xorg/ONE_MONITOR" ] ; then
|
if ! [ -e "/etc/Xorg/ONE_MONITOR" ] ; then
|
||||||
${lib.getExe cfg_monitors}
|
${lib.getExe cfg_monitors}
|
||||||
|
|
@ -23,6 +23,9 @@ in
|
||||||
reboot
|
reboot
|
||||||
'')
|
'')
|
||||||
];
|
];
|
||||||
|
systemd.tmpfiles.rules = [
|
||||||
|
"L+ /var/lib/sbctl - - - - /persist/secureboot"
|
||||||
|
];
|
||||||
|
|
||||||
boot = {
|
boot = {
|
||||||
initrd = {
|
initrd = {
|
||||||
|
|
@ -58,7 +61,7 @@ in
|
||||||
|
|
||||||
lanzaboote = {
|
lanzaboote = {
|
||||||
enable = true;
|
enable = true;
|
||||||
pkiBundle = "/etc/secureboot";
|
pkiBundle = "/var/lib/sbctl";
|
||||||
configurationLimit = 10;
|
configurationLimit = 10;
|
||||||
package = lib.mkForce (
|
package = lib.mkForce (
|
||||||
pkgs.writeShellApplication {
|
pkgs.writeShellApplication {
|
||||||
|
|
|
||||||
|
|
@ -75,19 +75,31 @@
|
||||||
#sync.enable = true;
|
#sync.enable = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
services.xserver.videoDrivers = [
|
services.xserver = {
|
||||||
|
videoDrivers = [
|
||||||
"nvidia"
|
"nvidia"
|
||||||
"amdgpu"
|
|
||||||
];
|
];
|
||||||
|
displayManager.setupCommands = lib.mkBefore ''
|
||||||
|
${lib.getExe pkgs.xorg.xrandr} \
|
||||||
|
--output DP-0 \
|
||||||
|
--mode 3440x1440 \
|
||||||
|
--rate 120 \
|
||||||
|
--primary \
|
||||||
|
--pos 0x0 \
|
||||||
|
--output HDMI-0 \
|
||||||
|
--mode 1920x1080 \
|
||||||
|
--rate 120 \
|
||||||
|
--pos 3440x360
|
||||||
|
'';
|
||||||
|
serverFlagsSection = ''
|
||||||
|
Option "StandbyTime" "0"
|
||||||
|
Option "SuspendTime" "0"
|
||||||
|
Option "OffTime" "0"
|
||||||
|
Option "BlankTime" "0"
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
hardware.amdgpu = {
|
services.libinput.mouse.accelProfile = "flat";
|
||||||
amdvlk = {
|
|
||||||
enable = true;
|
|
||||||
support32Bit.enable = true;
|
|
||||||
};
|
|
||||||
initrd.enable = true;
|
|
||||||
opencl.enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
steam.enable = true;
|
steam.enable = true;
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
createDB = true;
|
createDB = true;
|
||||||
};
|
};
|
||||||
mediaLocation = "/persist/services/immich";
|
mediaLocation = "/persist/services/immich";
|
||||||
machine-learning.enable = false;
|
machine-learning.enable = true;
|
||||||
settings = null;
|
settings = null;
|
||||||
port = 2283;
|
port = 2283;
|
||||||
host = "0.0.0.0";
|
host = "0.0.0.0";
|
||||||
|
|
|
||||||
|
|
@ -41,6 +41,7 @@
|
||||||
recommendedTlsSettings = true;
|
recommendedTlsSettings = true;
|
||||||
# For immich
|
# For immich
|
||||||
clientMaxBodySize = "50000M";
|
clientMaxBodySize = "50000M";
|
||||||
|
proxyTimeout = "600s";
|
||||||
virtualHosts =
|
virtualHosts =
|
||||||
builtins.mapAttrs
|
builtins.mapAttrs
|
||||||
(
|
(
|
||||||
|
|
|
||||||
|
|
@ -6,9 +6,7 @@
|
||||||
{
|
{
|
||||||
#link some stuff
|
#link some stuff
|
||||||
systemd.tmpfiles.rules = [
|
systemd.tmpfiles.rules = [
|
||||||
|
|
||||||
"L+ /etc/zfs/zpool.cache - - - - /persist/zfs/zpool.cache"
|
"L+ /etc/zfs/zpool.cache - - - - /persist/zfs/zpool.cache"
|
||||||
"L+ /etc/secureboot - - - - /persist/secureboot"
|
|
||||||
"L+ /etc/ssh/ssh_host_ed25519_key - - - - /persist/ssh/ssh_host_ed25519_key"
|
"L+ /etc/ssh/ssh_host_ed25519_key - - - - /persist/ssh/ssh_host_ed25519_key"
|
||||||
"L+ /etc/ssh/ssh_host_ed25519_key.pub - - - - /persist/ssh/ssh_host_ed25519_key.pub"
|
"L+ /etc/ssh/ssh_host_ed25519_key.pub - - - - /persist/ssh/ssh_host_ed25519_key.pub"
|
||||||
"L /etc/nixos/flake.nix - - - - /home/gerg/Projects/nixos/flake.nix"
|
"L /etc/nixos/flake.nix - - - - /home/gerg/Projects/nixos/flake.nix"
|
||||||
|
|
|
||||||
|
|
@ -16,8 +16,9 @@ in
|
||||||
})
|
})
|
||||||
(lib.mkIf (!cfg.sound.disable) {
|
(lib.mkIf (!cfg.sound.disable) {
|
||||||
security.rtkit.enable = true;
|
security.rtkit.enable = true;
|
||||||
hardware.pulseaudio.enable = lib.mkForce false; # disable pulseAudio
|
services = {
|
||||||
services.pipewire = {
|
pulseaudio.enable = lib.mkForce false; # disable pulseAudio
|
||||||
|
pipewire = {
|
||||||
enable = true;
|
enable = true;
|
||||||
alsa = {
|
alsa = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
@ -26,6 +27,7 @@ in
|
||||||
pulse.enable = true;
|
pulse.enable = true;
|
||||||
jack.enable = false;
|
jack.enable = false;
|
||||||
};
|
};
|
||||||
|
};
|
||||||
})
|
})
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -11,24 +11,20 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
config = {
|
config = {
|
||||||
|
|
||||||
nixpkgs.config = {
|
nixpkgs.config = {
|
||||||
allowAliases = false;
|
allowAliases = false;
|
||||||
allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) config.local.allowedUnfree;
|
allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) config.local.allowedUnfree;
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.git.enable = true;
|
local.packages = {
|
||||||
# Mr sandro why
|
|
||||||
services.libinput.enable = true;
|
|
||||||
programs.nano.enable = false;
|
|
||||||
|
|
||||||
environment.defaultPackages = lib.mkForce (
|
|
||||||
builtins.attrValues {
|
|
||||||
inherit (pkgs)
|
inherit (pkgs)
|
||||||
bottom # view tasks
|
bottom # view tasks
|
||||||
efibootmgr # efi editor
|
efibootmgr # efi editor
|
||||||
nix-output-monitor # nom nom nom nom;
|
nix-output-monitor # nom nom nom nom;
|
||||||
nix-tree # view packages
|
nix-tree # view packages
|
||||||
pciutils # lspci
|
pciutils # lspci
|
||||||
|
nixos-rebuild-ng
|
||||||
;
|
;
|
||||||
nix-janitor = pkgs.symlinkJoin {
|
nix-janitor = pkgs.symlinkJoin {
|
||||||
name = "nix-janitor";
|
name = "nix-janitor";
|
||||||
|
|
@ -39,8 +35,15 @@
|
||||||
--suffix PATH : ${lib.makeBinPath [ config.nix.package ]}
|
--suffix PATH : ${lib.makeBinPath [ config.nix.package ]}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
}
|
|
||||||
);
|
};
|
||||||
|
|
||||||
|
programs.git.enable = true;
|
||||||
|
# Mr sandro why
|
||||||
|
services.libinput.enable = true;
|
||||||
|
programs.nano.enable = false;
|
||||||
|
|
||||||
|
environment.defaultPackages = lib.mkForce [ ];
|
||||||
|
|
||||||
#enable ssh
|
#enable ssh
|
||||||
programs.mtr.enable = true; # ping and traceroute
|
programs.mtr.enable = true; # ping and traceroute
|
||||||
|
|
@ -78,5 +81,7 @@
|
||||||
documentation.nixos.enable = false;
|
documentation.nixos.enable = false;
|
||||||
# Useless with flakes (without configuring)
|
# Useless with flakes (without configuring)
|
||||||
programs.command-not-found.enable = false;
|
programs.command-not-found.enable = false;
|
||||||
|
|
||||||
|
system.switch.enableNg = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue