updates
This commit is contained in:
RingOfStorms (Josh)
parent
02a2157733
commit
53e98beb2b
9 changed files with 130 additions and 195 deletions
188
flake.lock
generated
188
flake.lock
generated
|
|
@ -104,6 +104,80 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"gpdPocket3_home-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"gpdPocket3_nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1720042825,
|
||||
"narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-24.05",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"gpdPocket3_nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1722791413,
|
||||
"narHash": "sha256-rCTrlCWvHzMCNcKxPE3Z/mMK2gDZ+BvvpEVyRM4tKmU=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "8b5b6723aca5a51edf075936439d9cd3947b7b2c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-24.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"h002_home-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"h002_nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722630065,
|
||||
"narHash": "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "afc892db74d65042031a093adb6010c4c3378422",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "master",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"h002_nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1722630782,
|
||||
"narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d04953086551086b44b6f3c6b7eeb26294f207da",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -126,39 +200,18 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager_gdpPocket3": {
|
||||
"joe_home-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs_gpdPocket3"
|
||||
"joe_nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1720042825,
|
||||
"narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
|
||||
"lastModified": 1722630065,
|
||||
"narHash": "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-24.05",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager_h002": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs_h002"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721799448,
|
||||
"narHash": "sha256-oh5XwyHB9ExuEW3Jcq7ABAHEYf9LShWn7vddamSYYPY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "465ea1f994a4e2b498b847c35caa205af7b261df",
|
||||
"rev": "afc892db74d65042031a093adb6010c4c3378422",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -168,24 +221,19 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager_joe": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs_joe"
|
||||
]
|
||||
},
|
||||
"joe_nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1721799448,
|
||||
"narHash": "sha256-oh5XwyHB9ExuEW3Jcq7ABAHEYf9LShWn7vddamSYYPY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "465ea1f994a4e2b498b847c35caa205af7b261df",
|
||||
"lastModified": 1722630782,
|
||||
"narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d04953086551086b44b6f3c6b7eeb26294f207da",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "master",
|
||||
"repo": "home-manager",
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
|
|
@ -205,54 +253,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_gpdPocket3": {
|
||||
"locked": {
|
||||
"lastModified": 1721548954,
|
||||
"narHash": "sha256-7cCC8+Tdq1+3OPyc3+gVo9dzUNkNIQfwSDJ2HSi2u3o=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "63d37ccd2d178d54e7fb691d7ec76000740ea24a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-24.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_h002": {
|
||||
"locked": {
|
||||
"lastModified": 1721562059,
|
||||
"narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "68c9ed8bbed9dfce253cc91560bf9043297ef2fe",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_joe": {
|
||||
"locked": {
|
||||
"lastModified": 1721562059,
|
||||
"narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "68c9ed8bbed9dfce253cc91560bf9043297ef2fe",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_stable": {
|
||||
"locked": {
|
||||
"lastModified": 1721548954,
|
||||
|
|
@ -1115,12 +1115,12 @@
|
|||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"home-manager_gdpPocket3": "home-manager_gdpPocket3",
|
||||
"home-manager_h002": "home-manager_h002",
|
||||
"home-manager_joe": "home-manager_joe",
|
||||
"nixpkgs_gpdPocket3": "nixpkgs_gpdPocket3",
|
||||
"nixpkgs_h002": "nixpkgs_h002",
|
||||
"nixpkgs_joe": "nixpkgs_joe",
|
||||
"gpdPocket3_home-manager": "gpdPocket3_home-manager",
|
||||
"gpdPocket3_nixpkgs": "gpdPocket3_nixpkgs",
|
||||
"h002_home-manager": "h002_home-manager",
|
||||
"h002_nixpkgs": "h002_nixpkgs",
|
||||
"joe_home-manager": "joe_home-manager",
|
||||
"joe_nixpkgs": "joe_nixpkgs",
|
||||
"nixpkgs_stable": "nixpkgs_stable",
|
||||
"nixpkgs_unstable": "nixpkgs_unstable",
|
||||
"nypkgs": "nypkgs",
|
||||
|
|
|
|||
42
flake.nix
42
flake.nix
|
|
@ -5,20 +5,20 @@
|
|||
nixpkgs_unstable.url = "github:nixos/nixpkgs/master";
|
||||
nixpkgs_stable.url = "github:nixos/nixpkgs/nixos-24.05";
|
||||
|
||||
nixpkgs_joe.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
home-manager_joe = {
|
||||
joe_nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
joe_home-manager= {
|
||||
url = "github:nix-community/home-manager/master";
|
||||
inputs.nixpkgs.follows = "nixpkgs_joe";
|
||||
inputs.nixpkgs.follows = "joe_nixpkgs";
|
||||
};
|
||||
nixpkgs_h002.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
home-manager_h002 = {
|
||||
h002_nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
h002_home-manager= {
|
||||
url = "github:nix-community/home-manager/master";
|
||||
inputs.nixpkgs.follows = "nixpkgs_h002";
|
||||
inputs.nixpkgs.follows = "h002_nixpkgs";
|
||||
};
|
||||
nixpkgs_gpdPocket3.url = "github:nixos/nixpkgs/nixos-24.05";
|
||||
home-manager_gdpPocket3 = {
|
||||
gpdPocket3_nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
|
||||
gpdPocket3_home-manager= {
|
||||
url = "github:nix-community/home-manager/release-24.05";
|
||||
inputs.nixpkgs.follows = "nixpkgs_gpdPocket3";
|
||||
inputs.nixpkgs.follows = "gpdPocket3_nixpkgs";
|
||||
};
|
||||
|
||||
# Nix utility methods
|
||||
|
|
@ -43,12 +43,12 @@
|
|||
{
|
||||
self,
|
||||
nypkgs,
|
||||
nixpkgs_joe,
|
||||
home-manager_joe,
|
||||
nixpkgs_gpdPocket3,
|
||||
home-manager_gdpPocket3,
|
||||
nixpkgs_h002,
|
||||
home-manager_h002,
|
||||
joe_nixpkgs,
|
||||
joe_home-manager,
|
||||
gpdPocket3_nixpkgs,
|
||||
gpdPocket3_home-manager,
|
||||
h002_nixpkgs,
|
||||
h002_home-manager,
|
||||
...
|
||||
}@inputs:
|
||||
let
|
||||
|
|
@ -67,8 +67,8 @@
|
|||
};
|
||||
settings = {
|
||||
inherit user;
|
||||
nixpkgs = nixpkgs_joe;
|
||||
home-manager = home-manager_joe;
|
||||
nixpkgs = joe_nixpkgs;
|
||||
home-manager = joe_home-manager;
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -78,8 +78,8 @@
|
|||
};
|
||||
settings = {
|
||||
inherit user;
|
||||
nixpkgs = nixpkgs_gpdPocket3;
|
||||
home-manager = home-manager_gdpPocket3;
|
||||
nixpkgs = gpdPocket3_nixpkgs;
|
||||
home-manager = gpdPocket3_home-manager;
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -95,8 +95,8 @@
|
|||
name = "RingOfStorms (Joshua Bell)";
|
||||
};
|
||||
};
|
||||
nixpkgs = nixpkgs_h002;
|
||||
home-manager = home-manager_h002;
|
||||
nixpkgs = h002_nixpkgs;
|
||||
home-manager = h002_home-manager;
|
||||
};
|
||||
}
|
||||
];
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
};
|
||||
services.gnome.core-utilities.enable = false;
|
||||
environment.systemPackages = with pkgs; [
|
||||
gnome.dconf-editor
|
||||
dconf-editor
|
||||
# wayland clipboard in terminal
|
||||
wl-clipboard
|
||||
];
|
||||
|
|
|
|||
|
|
@ -13,7 +13,9 @@
|
|||
# Enable the OpenSSH daemon.
|
||||
services.openssh = {
|
||||
enable = true;
|
||||
logLevel = "VERBOSE";
|
||||
settings.PermitRootLogin = "yes";
|
||||
settings = {
|
||||
LogLevel = "VERBOSE";
|
||||
PermitRootLogin = "yes";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ in
|
|||
lsof
|
||||
|
||||
# TODO keep in common or move to specific machines, I want this for my pocket 3 video KDM module but I use ffmpeg on most machines anyways?
|
||||
ffmpeg_5-full
|
||||
ffmpeg-full
|
||||
];
|
||||
|
||||
environment.shellAliases = {
|
||||
|
|
|
|||
|
|
@ -79,10 +79,9 @@
|
|||
"thunderbolt"
|
||||
];
|
||||
services.xserver.videoDrivers = [ "intel" ];
|
||||
hardware.opengl = {
|
||||
enable = true;
|
||||
driSupport = true;
|
||||
};
|
||||
hardware.opengl.driSupport32Bit = true;
|
||||
hardware.graphics.enable = true;
|
||||
|
||||
hardware.opengl.extraPackages = with pkgs; [
|
||||
intel-media-driver
|
||||
intel-vaapi-driver
|
||||
|
|
|
|||
|
|
@ -1,10 +1,8 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
settings,
|
||||
...
|
||||
}@args:
|
||||
}:
|
||||
{
|
||||
imports = [
|
||||
# Common components this machine uses
|
||||
|
|
@ -38,46 +36,4 @@
|
|||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [ nvtopPackages.full ];
|
||||
|
||||
# nvidia gfx https://nixos.wiki/wiki/Nvidia
|
||||
# =========
|
||||
# Enable OpenGL
|
||||
#hardware.opengl = {
|
||||
# enable = true;
|
||||
# driSupport = true;
|
||||
# driSupport32Bit = true;
|
||||
#};
|
||||
|
||||
# Load nvidia driver for Xorg and Wayland
|
||||
#services.xserver.videoDrivers = [ "nvidia" ];
|
||||
#hardware.nvidia = {
|
||||
# Modesetting is required.
|
||||
# modesetting.enable = true;
|
||||
|
||||
# Nvidia power management. Experimental, and can cause sleep/suspend to fail.
|
||||
# Enable this if you have graphical corruption issues or application crashes after waking
|
||||
# up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead
|
||||
# of just the bare essentials.
|
||||
# powerManagement.enable = false;
|
||||
|
||||
# Fine-grained power management. Turns off GPU when not in use.
|
||||
# Experimental and only works on modern Nvidia GPUs (Turing or newer).
|
||||
# powerManagement.finegrained = false;
|
||||
|
||||
# Use the NVidia open source kernel module (not to be confused with the
|
||||
# independent third-party "nouveau" open source driver).
|
||||
# Support is limited to the Turing and later architectures. Full list of
|
||||
# supported GPUs is at:
|
||||
# https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus
|
||||
# Only available from driver 515.43.04+
|
||||
# Currently alpha-quality/buggy, so false is currently the recommended setting.
|
||||
# open = false;
|
||||
|
||||
# Enable the Nvidia settings menu,
|
||||
# accessible via `nvidia-settings`.
|
||||
# nvidiaSettings = true;
|
||||
|
||||
# Optionally, you may need to select the appropriate driver version for your specific GPU.
|
||||
# package = config.boot.kernelPackages.nvidiaPackages.stable;
|
||||
# };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,31 +43,11 @@
|
|||
# nvidia gfx https://nixos.wiki/wiki/Nvidia
|
||||
# =========
|
||||
# Enable OpenGL
|
||||
hardware.opengl = {
|
||||
enable = true;
|
||||
# driSupport = true;
|
||||
driSupport32Bit = true;
|
||||
};
|
||||
hardware.opengl.driSupport32Bit = true;
|
||||
hardware.graphics.enable = true;
|
||||
|
||||
# Load nvidia driver for Xorg and Wayland
|
||||
virtualisation.docker = {
|
||||
enableNvidia = true;
|
||||
extraOptions = ''
|
||||
--experimental
|
||||
--add-runtime=nvidia=${pkgs.nvidia-docker}/bin/nvidia-container-runtime
|
||||
'';
|
||||
};
|
||||
environment.etc."docker/daemon.json".text = ''
|
||||
{
|
||||
"runtimes": {
|
||||
"nvidia": {
|
||||
"path": "${pkgs.nvidia-docker}/bin/nvidia-container-runtime",
|
||||
"runtimeArgs": []
|
||||
}
|
||||
}
|
||||
}
|
||||
'';
|
||||
services.xserver.videoDrivers = [ "nvidia" ];
|
||||
hardware.nvidia-container-toolkit.enable = true;
|
||||
hardware.nvidia = {
|
||||
# Modesetting is required.
|
||||
modesetting.enable = true;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,4 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
home.packages = with pkgs; [ gnome.nautilus qimgv ];
|
||||
|
||||
home.packages = with pkgs; [ nautilus qimgv ];
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue