gerg-l/nixos
1
0
Fork 0
mirror of https://github.com/Gerg-L/nixos.git synced 2025-12-10 00:43:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: gerg-l:99f42f5841e391109a937050375e1c897a6dd2b1
Branches Tags
gerg-l:master
...
compare: gerg-l:619a1c09dc98893749fc94e40ea585c9e30d7adc
Branches Tags
gerg-l:master

7 commits
99f42f5841 ... 619a1c09dc

Author SHA1 Message Date
Gerg-L
619a1c09dc
gerg-desktop: fix secondary monitor position 2025-01-13 20:22:43 -05:00
Gerg-L
5f3f4e9fd0
gerg-desktop: fix mouse acceleration and screen blanking 2025-01-13 20:11:54 -05:00
Gerg-L
d54be846e5
gerg-desktop: remove vfio pain 2025-01-13 19:51:23 -05:00
Gerg-L
9908662e8a
flake.lock: Update 
Flake lock file updates:

• Updated input 'nvim-flake':
    'github:Gerg-L/nvim-flake/7b2cbea0895cc98fdeefd957b6edef36ee2c837b?narHash=sha256-G5ZsiqzjIICWQQemgDKPBgI1K%2BvlYGqbc42gqQW5s/Q%3D' (2025-01-13)
  → 'github:Gerg-L/nvim-flake/00404b2c890470649d7cea6e2fb596875531add9?narHash=sha256-gkW0sjhr%2BPqdcvnIP3WnJvTcKEFtbo147IfKC2zbKZw%3D' (2025-01-13)
 2025-01-13 19:32:31 -05:00
Gerg-L
6d187cd057
use switch-to-configuration-ng and nixos-rebuild-ng 
migrate secureboot key /etc/secureboot -> /var/lib/sbctl

hardware.pulseaudio -> services.pulseaudio

enable machine-learning for immich
 2025-01-13 19:31:19 -05:00
Gerg-L
8a55bc5ebd
update nix 2025-01-13 17:48:07 -05:00
Gerg-L
1713fbb4d2
set higher nginx timout for immich 2025-01-13 17:44:09 -05:00
10 changed files with 82 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

32
flake.lock generated
View file

@ -385,23 +385,6 @@
"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": {
"locked": {
"lastModified": 1736742312,
@ -478,7 +461,6 @@
"flake-compat": "flake-compat_2",
"flake-parts": "flake-parts_2",
"git-hooks-nix": "git-hooks-nix",
"libgit2": "libgit2",
"nixpkgs": [
"stable"
],
@ -486,16 +468,16 @@
"nixpkgs-regression": "nixpkgs-regression"
},
"locked": {
"lastModified": 1732892090,
"narHash": "sha256-Ka/uNdaqpTAiVL++4MPHg8fG5o1tiJeY6G2t5UiKhd8=",
"lastModified": 1736798728,
"narHash": "sha256-Em+CXWHBgLG2m106Hs11FmVlsCr3ZQedTosJvRF2gnE=",
"owner": "NixOS",
"repo": "nix",
"rev": "64000481168d1da9d2519f055dd1fdee22275c21",
"rev": "2cb0ddfe4eb216fab6d826c1056743c152722720",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "64000481168d1da9d2519f055dd1fdee22275c21",
"ref": "2cb0ddfe4eb216fab6d826c1056743c152722720",
"repo": "nix",
"type": "github"
}
@ -680,11 +662,11 @@
]
},
"locked": {
"lastModified": 1736742095,
"narHash": "sha256-G5ZsiqzjIICWQQemgDKPBgI1K+vlYGqbc42gqQW5s/Q=",
"lastModified": 1736799472,
"narHash": "sha256-gkW0sjhr+PqdcvnIP3WnJvTcKEFtbo147IfKC2zbKZw=",
"owner": "Gerg-L",
"repo": "nvim-flake",
"rev": "7b2cbea0895cc98fdeefd957b6edef36ee2c837b",
"rev": "00404b2c890470649d7cea6e2fb596875531add9",
"type": "github"
},
"original": {

2
flake.nix
View file

@ -24,7 +24,7 @@
type = "github";
owner = "NixOS";
repo = "nix";
ref = "64000481168d1da9d2519f055dd1fdee22275c21";
ref = "2cb0ddfe4eb216fab6d826c1056743c152722720";
inputs.nixpkgs.follows = "stable";
};
nixos-generators = {

10
hosts/gerg-desktop/vfio.nix → hosts/gerg-desktop/_vfio.nix
View file

@ -26,6 +26,14 @@ let
};
in
{
#hardware.amdgpu = {
# amdvlk = {
# enable = true;
# support32Bit.enable = true;
# };
# initrd.enable = true;
# opencl.enable = true;
#};
environment.etc = {
"Xorg/1_mon.conf".source = "${_dir}/1_mon.conf";
"Xorg/2_mon.conf".source = "${_dir}/2_mon.conf";
@ -33,6 +41,8 @@ in
services.xserver = {
videoDrivers = [ "amdgpu" ];
displayManager.setupCommands = lib.mkBefore ''
if ! [ -e "/etc/Xorg/ONE_MONITOR" ] ; then
${lib.getExe cfg_monitors}

5
hosts/gerg-desktop/boot.nix
View file

@ -23,6 +23,9 @@ in
reboot
'')
];
systemd.tmpfiles.rules = [
"L+ /var/lib/sbctl - - - - /persist/secureboot"
];
boot = {
initrd = {
@ -58,7 +61,7 @@ in
lanzaboote = {
enable = true;
pkiBundle = "/etc/secureboot";
pkiBundle = "/var/lib/sbctl";
configurationLimit = 10;
package = lib.mkForce (
pkgs.writeShellApplication {

32
hosts/gerg-desktop/main.nix
View file

@ -75,19 +75,31 @@
#sync.enable = true;
};
};
services.xserver.videoDrivers = [
services.xserver = {
videoDrivers = [
"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 = {
amdvlk = {
enable = true;
support32Bit.enable = true;
};
initrd.enable = true;
opencl.enable = true;
};
services.libinput.mouse.accelProfile = "flat";
programs = {
steam.enable = true;

2
hosts/gerg-desktop/services/immich.nix
View file

@ -9,7 +9,7 @@
createDB = true;
};
mediaLocation = "/persist/services/immich";
machine-learning.enable = false;
machine-learning.enable = true;
settings = null;
port = 2283;
host = "0.0.0.0";

1
hosts/gerg-desktop/services/nginx.nix
View file

@ -41,6 +41,7 @@
recommendedTlsSettings = true;
# For immich
clientMaxBodySize = "50000M";
proxyTimeout = "600s";
virtualHosts =
builtins.mapAttrs
(

2
hosts/gerg-desktop/zfs.nix
View file

@ -6,9 +6,7 @@
{
#link some stuff
systemd.tmpfiles.rules = [
"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.pub - - - - /persist/ssh/ssh_host_ed25519_key.pub"
"L /etc/nixos/flake.nix - - - - /home/gerg/Projects/nixos/flake.nix"

6
modules/hardware.nix
View file

@ -16,8 +16,9 @@ in
})
(lib.mkIf (!cfg.sound.disable) {
security.rtkit.enable = true;
hardware.pulseaudio.enable = lib.mkForce false; # disable pulseAudio
services.pipewire = {
services = {
pulseaudio.enable = lib.mkForce false; # disable pulseAudio
pipewire = {
enable = true;
alsa = {
enable = true;
@ -26,6 +27,7 @@ in
pulse.enable = true;
jack.enable = false;
};
};
})
{

23
modules/misc.nix
View file

@ -11,24 +11,20 @@
};
config = {
nixpkgs.config = {
allowAliases = false;
allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) config.local.allowedUnfree;
};
programs.git.enable = true;
# Mr sandro why
services.libinput.enable = true;
programs.nano.enable = false;
environment.defaultPackages = lib.mkForce (
builtins.attrValues {
local.packages = {
inherit (pkgs)
bottom # view tasks
efibootmgr # efi editor
nix-output-monitor # nom nom nom nom;
nix-tree # view packages
pciutils # lspci
nixos-rebuild-ng
;
nix-janitor = pkgs.symlinkJoin {
name = "nix-janitor";
@ -39,8 +35,15 @@
--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
programs.mtr.enable = true; # ping and traceroute
@ -78,5 +81,7 @@
documentation.nixos.enable = false;
# Useless with flakes (without configuring)
programs.command-not-found.enable = false;
system.switch.enableNg = true;
};
}