Compare commits

..

No commits in common. "8c8c4214adfdcba26b686a4fb486c22da115fbee" and "f4b0cb805bc1418f64ecf713d31fc7fc6aed9ff1" have entirely different histories.

6 changed files with 7 additions and 75 deletions

View file

@ -1,4 +1,4 @@
# Edit this configuration file to define what should be installed onconfiguraticonfig
# Edit this configuration file to define what should be installed onconfigurati
# 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`).
@ -76,17 +76,15 @@ in
};
# Use the systemd-boot EFI boot loader.
boot.loader.grub.device = "nodev";
boot.kernelPackages = pkgs.linuxPackages_testing;
boot.kernelPackages = pkgs.linuxPackages_zen;
boot.loader.grub.efiSupport = true;
boot.loader.grub.useOSProber = true;
boot.loader.grub.efiInstallAsRemovable = true;
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
# add user to "openrazer" group
hardware.openrazer.enable = true;
hardware.openrazer.users = [ "meyer" ];
hardware.i2c.enable = true;
hardware.xpadneo.enable = true;
hardware.amdgpu.opencl.enable = true;
hardware.bluetooth.enable = true;
services.tailscale.enable = true;
networking.hostName = "nix-desktop-evo4b5"; # Define your hostname.
@ -107,13 +105,11 @@ in
# };
services = {
teamviewer.enable = true;
avahi.enable = true;
usbmuxd.enable = true;
};
services.desktopManager.plasma6.enable = true;
services.xserver = {
videoDrivers = [ "amdgpu" ];
enable = true;
displayManager.sddm = {
enable = true;
@ -167,7 +163,6 @@ in
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs; [
clinfo
fuse
ifuse
ddcutil
@ -191,29 +186,6 @@ in
#LD fix
programs.nix-ld.enable = true;
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
fuse
fuse3

View file

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

View file

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

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

View file

@ -54,26 +54,6 @@
"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": {
"inputs": {
"flake-compat": "flake-compat",
@ -161,7 +141,6 @@
"root": {
"inputs": {
"home-manager": "home-manager",
"nix-index-database": "nix-index-database",
"nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs_2",
"sops-nix": "sops-nix"

View file

@ -7,8 +7,6 @@
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";
home-manager = {
url = "github:nix-community/home-manager";
@ -24,24 +22,11 @@
# in
{
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 {
specialArgs = { inherit inputs; };
modules = [
./boxes/desktop/configuration.nix
inputs.home-manager.nixosModules.default
inputs.nix-index-database.nixosModules.nix-index
{ programs.nix-index-database.comma.enable = true; }
];
};
wsl = nixpkgs.lib.nixosSystem {