Compare commits

..

9 commits

Author SHA1 Message Date
sadan
8c8c4214ad
230 current 2024-09-08 23:54:23 24.11.20240831.12228ff 6.11.0-rc5 *
231 current  2024-09-08 23:55:54  24.11.20240831.12228ff  6.11.0-rc5                           *

232 current  2024-09-08 23:57:58  24.11.20240831.12228ff  6.11.0-rc5                           *

233 current  2024-09-09 00:00:25  24.11.20240831.12228ff  6.11.0-rc5                           *

234 current  2024-09-09 00:01:40  24.11.20240831.12228ff  6.11.0-rc5                           *

235 current  2024-09-09 00:08:17  24.11.20240831.12228ff  6.11.0-rc5                           *

236 current  2024-09-09 00:09:22  24.11.20240831.12228ff  6.11.0-rc5                           *

237 current  2024-09-09 00:20:19  24.11.20240831.12228ff  6.11.0-rc5                           *

238 current  2024-09-09 00:40:29  24.11.20240831.12228ff  6.11.0-rc5                           *

239 current  2024-09-09 00:42:12  24.11.20240831.12228ff  6.11.0-rc5                           *

240 current  2024-09-09 00:44:00  24.11.20240831.12228ff  6.11.0-rc5                           *

241 current  2024-09-09 00:45:41  24.11.20240831.12228ff  6.11.0-rc5                           *

242 current  2024-09-09 00:46:52  24.11.20240831.12228ff  6.11.0-rc5                           *

243 current  2024-09-09 00:48:27  24.11.20240831.12228ff  6.11.0-rc5                           *

244 current  2024-09-09 00:49:49  24.11.20240831.12228ff  6.11.0-rc5                           *

245 current  2024-09-09 00:51:13  24.11.20240831.12228ff  6.11.0-rc5                           *

246 current  2024-09-09 00:58:46  24.11.20240831.12228ff  6.11.0-rc5                           *

247 current  2024-09-09 01:00:34  24.11.20240831.12228ff  6.11.0-rc5                           *

248 current  2024-09-09 01:01:38  24.11.20240831.12228ff  6.11.0-rc5                           *

249 current  2024-09-09 01:02:25  24.11.20240831.12228ff  6.11.0-rc5                           *

250 current  2024-09-09 01:03:52  24.11.20240831.12228ff  6.11.0-rc5                           *

251 current  2024-09-09 01:04:51  24.11.20240831.12228ff  6.11.0-rc5                           *

252 current  2024-09-09 01:05:55  24.11.20240831.12228ff  6.11.0-rc5                           *

253 current  2024-09-09 01:07:07  24.11.20240831.12228ff  6.11.0-rc5                           *

254 current  2024-09-09 01:08:16  24.11.20240831.12228ff  6.11.0-rc5                           *

255 current  2024-09-09 01:12:42  24.11.20240831.12228ff  6.11.0-rc5                           *
2024-09-09 01:18:50 -04:00
sadan
037626910c
229 current 2024-09-07 20:59:05 24.11.20240831.12228ff 6.11.0-rc5 * 2024-09-07 20:59:12 -04:00
sadan
844176b115
228 current 2024-09-06 20:00:11 24.11.20240831.12228ff 6.11.0-rc5 * 2024-09-06 20:00:15 -04:00
sadan
f2e076c1f5
227 current 2024-09-06 19:58:33 24.11.20240831.12228ff 6.11.0-rc5 * 2024-09-06 19:58:45 -04:00
sadan
813c9df1a2
226 current 2024-09-06 19:50:29 24.11.20240831.12228ff 6.11.0-rc5 * 2024-09-06 19:51:11 -04:00
sadan
1c64d7872f
225 current 2024-09-06 19:22:35 24.11.20240831.12228ff 6.11.0-rc5 * 2024-09-06 19:22:42 -04:00
sadan
81ebab006f
224 current 2024-09-06 16:25:17 24.11.20240831.12228ff 6.11.0-rc5 * 2024-09-06 16:25:26 -04:00
sadan
6514aaea5a
223 current 2024-09-02 16:18:24 24.11.20240831.12228ff 6.11.0-rc5 * 2024-09-02 16:18:36 -04:00
sadan
82a8661ec1
guh 2024-09-02 16:01:02 -04:00
6 changed files with 75 additions and 7 deletions

View file

@ -1,4 +1,4 @@
# Edit this configuration file to define what should be installed onconfigurati # Edit this configuration file to define what should be installed onconfiguraticonfig
# your system. Help is available in the configuration.nix(5) man page, on # your system. Help is available in the configuration.nix(5) man page, on
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`). # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
@ -76,15 +76,17 @@ in
}; };
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.
boot.loader.grub.device = "nodev"; boot.loader.grub.device = "nodev";
boot.kernelPackages = pkgs.linuxPackages_zen; boot.kernelPackages = pkgs.linuxPackages_testing;
boot.loader.grub.efiSupport = true; boot.loader.grub.efiSupport = true;
boot.loader.grub.useOSProber = true; boot.loader.grub.useOSProber = true;
boot.loader.grub.efiInstallAsRemovable = true; boot.loader.grub.efiInstallAsRemovable = true;
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
# add user to "openrazer" group # add user to "openrazer" group
hardware.openrazer.enable = true; hardware.openrazer.enable = true;
hardware.openrazer.users = [ "meyer" ]; hardware.openrazer.users = [ "meyer" ];
hardware.i2c.enable = true; hardware.i2c.enable = true;
hardware.xpadneo.enable = true; hardware.xpadneo.enable = true;
hardware.amdgpu.opencl.enable = true;
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
services.tailscale.enable = true; services.tailscale.enable = true;
networking.hostName = "nix-desktop-evo4b5"; # Define your hostname. networking.hostName = "nix-desktop-evo4b5"; # Define your hostname.
@ -105,11 +107,13 @@ in
# }; # };
services = { services = {
teamviewer.enable = true;
avahi.enable = true; avahi.enable = true;
usbmuxd.enable = true; usbmuxd.enable = true;
}; };
services.desktopManager.plasma6.enable = true; services.desktopManager.plasma6.enable = true;
services.xserver = { services.xserver = {
videoDrivers = [ "amdgpu" ];
enable = true; enable = true;
displayManager.sddm = { displayManager.sddm = {
enable = true; enable = true;
@ -163,6 +167,7 @@ in
# List packages installed in system profile. To search, run: # List packages installed in system profile. To search, run:
# $ nix search wget # $ nix search wget
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
clinfo
fuse fuse
ifuse ifuse
ddcutil ddcutil
@ -186,6 +191,29 @@ in
#LD fix #LD fix
programs.nix-ld.enable = true; programs.nix-ld.enable = true;
programs.nix-ld.libraries = with pkgs; [ programs.nix-ld.libraries = with pkgs; [
libGL
alsa-lib
expat
mesa
libxkbcommon
xorg.libxcb
xorg.libXrandr
xorg.libXfixes
xorg.libXext
xorg.libXdamage
xorg.libXcomposite
xorg.libX11
cairo
pango
gtk3
libdrm
cups
at-spi2-atk
lzo
dbus
nspr
nss
glib
curlWithGnuTls curlWithGnuTls
fuse fuse
fuse3 fuse3

View file

@ -10,7 +10,7 @@
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ "amdgpu" ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];

View file

@ -18,12 +18,12 @@ in
gradle gradle
lazygit lazygit
linuxHeaders linuxHeaders
nodePackages.eslint eslint
nodePackages.nodemon nodePackages.nodemon
nodePackages.ts-node nodePackages.ts-node
nodePackages.pnpm nodePackages.pnpm
corepack_22 corepack_22
nodePackages.prisma prisma
prisma-engines prisma-engines
nodePackages.live-server nodePackages.live-server
gh gh
@ -37,6 +37,9 @@ in
nodejs_22 nodejs_22
]; ];
gui = with pkgs;[ gui = with pkgs;[
teamviewer
davinci-resolve
warp-terminal
gnome.gnome-calculator gnome.gnome-calculator
libsForQt5.kcolorchooser libsForQt5.kcolorchooser
python312Packages.openai-whisper python312Packages.openai-whisper
@ -82,6 +85,7 @@ in
libsForQt5.kinit libsForQt5.kinit
]; ];
general = with pkgs; [ general = with pkgs; [
imagemagick
p7zip p7zip
dig dig
bat bat

@ -1 +1 @@
Subproject commit bf42a74f00a8e8105647b9cd5c9e105d9410a5bf Subproject commit ddf45b4e55de9465b4a016b3a02c5b3005aeee95

View file

@ -54,6 +54,26 @@
"type": "github" "type": "github"
} }
}, },
"nix-index-database": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1725765290,
"narHash": "sha256-hwX53i24KyWzp2nWpQsn8lfGQNCP0JoW/bvQmcR1DPY=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "642275444c5a9defce57219c944b3179bf2adaa9",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-index-database",
"type": "github"
}
},
"nixos-wsl": { "nixos-wsl": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
@ -141,6 +161,7 @@
"root": { "root": {
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"nix-index-database": "nix-index-database",
"nixos-wsl": "nixos-wsl", "nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"sops-nix": "sops-nix" "sops-nix": "sops-nix"

View file

@ -7,6 +7,8 @@
sops-nix = { sops-nix = {
url = "github:Mic92/sops-nix"; url = "github:Mic92/sops-nix";
}; };
nix-index-database.url = "github:nix-community/nix-index-database";
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
nixos-wsl.url = "github:nix-community/nixos-wsl"; nixos-wsl.url = "github:nix-community/nixos-wsl";
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
@ -22,11 +24,24 @@
# in # in
{ {
nixosConfigurations = { nixosConfigurations = {
desktopIso = nixpkgs.lib.nixosSystem {
system = "aarch64-linux";
modules = [
# ./boxes/desktop/configuration.nix
# inputs.home-manager.nixosModules.default
({ pkgs, modulesPath, ... }: {
imports = [ (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix") ];
boot.kernelPackages = pkgs.linuxPackages_testing;
})
];
};
desktop = nixpkgs.lib.nixosSystem { desktop = nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
./boxes/desktop/configuration.nix ./boxes/desktop/configuration.nix
inputs.home-manager.nixosModules.default inputs.home-manager.nixosModules.default
inputs.nix-index-database.nixosModules.nix-index
{ programs.nix-index-database.comma.enable = true; }
]; ];
}; };
wsl = nixpkgs.lib.nixosSystem { wsl = nixpkgs.lib.nixosSystem {