This commit is contained in:
2026-07-12 18:25:07 +01:00
parent 1edf4af07f
commit ac284e6cfb
8 changed files with 116 additions and 142 deletions
Generated
+1 -53
View File
@@ -70,63 +70,11 @@
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1743095683,
"narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"home-manager": "home-manager",
"kutu": "kutu",
"nixpkgs": "nixpkgs_2",
"spicetify-nix": "spicetify-nix"
}
},
"spicetify-nix": {
"inputs": {
"nixpkgs": "nixpkgs_3",
"systems": "systems"
},
"locked": {
"lastModified": 1743595372,
"narHash": "sha256-e3x1mhpPpYgyyin9j/VbrBpOT5PFpEfx2hkxVZuJZhg=",
"owner": "Gerg-L",
"repo": "spicetify-nix",
"rev": "543f12dd14c62ddee79ab79fbfd8726f312b89ff",
"type": "github"
},
"original": {
"owner": "Gerg-L",
"ref": "24.11",
"repo": "spicetify-nix",
"type": "github"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
"nixpkgs": "nixpkgs_2"
}
}
},
+11 -8
View File
@@ -4,15 +4,19 @@
kutu.url = "git+https://git.syedm.dev/syedm/kutu.rb.git";
spicetify-nix.url = "github:Gerg-L/spicetify-nix/24.11";
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = inputs@{ nixpkgs, kutu, home-manager, spicetify-nix, ... }:
outputs =
{
kutu,
nixpkgs,
home-manager,
...
}:
let
system = "x86_64-linux";
commonModules = [
@@ -20,18 +24,17 @@
home-manager.nixosModules.home-manager
{
home-manager.users.me = import ./home/common.nix;
home-manager.extraSpecialArgs = { inherit inputs; };
home-manager.users.root = import ./home/root.nix;
}
];
pkgs = import nixpkgs {
inherit system;
};
in {
in
{
nixosConfigurations = {
syedm = nixpkgs.lib.nixosSystem {
inherit system;
specialArgs = { inherit inputs; };
modules = commonModules ++ [
./hosts/syedm
];
@@ -39,7 +42,7 @@
tardis = nixpkgs.lib.nixosSystem {
inherit system;
specialArgs = { inherit inputs; };
specialArgs = { inherit kutu; };
modules = commonModules ++ [
./hosts/tardis
{ home-manager.users.me = import ./home/tardis.nix; }
@@ -50,7 +53,7 @@
# For development
devShells.${system}.default = pkgs.mkShell {
packages = with pkgs; [
nil
nixd
nixfmt
lua-language-server
+1 -1
View File
@@ -12,7 +12,7 @@ vim.lsp.config("lua_ls", {
},
})
local servers = { "clangd", "nil", "solargraph", "hls" }
local servers = { "clangd", "solargraph", "hls", "nixd" }
for _, server in ipairs(servers) do
vim.lsp.config(server, { capabilities = capabilities })
+1 -1
View File
@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ ... }:
{
imports = [
+1 -5
View File
@@ -1,11 +1,7 @@
{ inputs, pkgs, ... }:
{ ... }:
let
spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.system};
in
{
imports = [
inputs.spicetify-nix.homeManagerModules.spicetify
./battery
./dunst
./kitty
+26 -11
View File
@@ -1,28 +1,43 @@
{ config, lib, pkgs, modulesPath, ... }:
{
config,
lib,
modulesPath,
...
}:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ];
boot.initrd.availableKernelModules = [
"xhci_pci"
"ahci"
"nvme"
"usb_storage"
"sd_mod"
"sdhci_pci"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/c5fedde6-79d4-4a44-92e4-2aa764553875";
fileSystems."/" = {
device = "/dev/disk/by-uuid/c5fedde6-79d4-4a44-92e4-2aa764553875";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/510C-E000";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/510C-E000";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
options = [
"fmask=0077"
"dmask=0077"
];
};
swapDevices =
[ { device = "/dev/disk/by-uuid/712d25ef-146d-4c66-b6d4-1b64491a974e"; }
swapDevices = [
{ device = "/dev/disk/by-uuid/712d25ef-146d-4c66-b6d4-1b64491a974e"; }
];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+2 -2
View File
@@ -1,7 +1,7 @@
{
kutu,
lib,
pkgs,
inputs,
...
}:
@@ -30,7 +30,7 @@
prismlauncher
spotify
inputs.kutu.packages.${stdenv.hostPlatform.system}.default
kutu.packages.${stdenv.hostPlatform.system}.default
]
);
+23 -11
View File
@@ -1,28 +1,40 @@
{ config, lib, pkgs, modulesPath, ... }:
{
config,
lib,
modulesPath,
...
}:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "vmd" "nvme" ];
boot.initrd.availableKernelModules = [
"xhci_pci"
"vmd"
"nvme"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/29a53eeb-befc-4512-9255-e1c5f1cf55ae";
fileSystems."/" = {
device = "/dev/disk/by-uuid/29a53eeb-befc-4512-9255-e1c5f1cf55ae";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/0951-B8D1";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/0951-B8D1";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
options = [
"fmask=0077"
"dmask=0077"
];
};
swapDevices =
[ { device = "/dev/disk/by-uuid/659310da-4655-461e-a992-6e62d7a0362d"; }
swapDevices = [
{ device = "/dev/disk/by-uuid/659310da-4655-461e-a992-6e62d7a0362d"; }
];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";