kylekrein/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved to stable

Browse source
This commit is contained in:
Aleksandr Lebedev 2025-02-19 17:04:53 +01:00
parent 8d99b5ec15
commit 2e6e7f1d25
4 changed files with 85 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

97
flake.lock generated
View file

@ -73,17 +73,16 @@
"base16-vim": { "base16-vim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1732806396, "lastModified": 1735953590,
"narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=", "narHash": "sha256-YbQwaApLFJobn/0lbpMKcJ8N5axKlW2QIGkDS5+xoSU=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "base16-vim", "repo": "base16-vim",
"rev": "577fe8125d74ff456cf942c733a85d769afe58b7", "rev": "c2a1232aa2c0ed27dcbf005779bcfe0e0ab5e85d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "base16-vim", "repo": "base16-vim",
"rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
"type": "github" "type": "github"
} }
}, },
@ -356,15 +355,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739470101, "lastModified": 1739757849,
"narHash": "sha256-NxNe32VB4XI/xIXrsKmIfrcgtEx5r/5s52pL3CpEcA4=", "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "5031c6d2978109336637977c165f82aa49fa16a7", "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -377,15 +377,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737630279, "lastModified": 1739757849,
"narHash": "sha256-wJQCxyMRc4P26zDrHmZiRD5bbfcJpqPG3e2djdGG3pk=", "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0db5c8bfcce78583ebbde0b2abbc95ad93445f7c", "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -711,6 +712,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": {
"locked": {
"lastModified": 1739866667,
"narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1738961098, "lastModified": 1738961098,
@ -777,16 +794,16 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1739214665, "lastModified": 1739758141,
"narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", "narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", "rev": "c618e28f70257593de75a7044438efc1c1fc0791",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-unstable", "ref": "nixos-24.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -809,16 +826,16 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1736798957, "lastModified": 1739758141,
"narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", "narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3", "rev": "c618e28f70257593de75a7044438efc1c1fc0791",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixos-24.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -2992,6 +3009,7 @@
"nixos-facter-modules": "nixos-facter-modules", "nixos-facter-modules": "nixos-facter-modules",
"nixpkgs": "nixpkgs_6", "nixpkgs": "nixpkgs_6",
"nixpkgs-master": "nixpkgs-master", "nixpkgs-master": "nixpkgs-master",
"nixpkgs-unstable": "nixpkgs-unstable",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"stylix": "stylix" "stylix": "stylix"
} }
@ -3085,20 +3103,19 @@
"systems": "systems_3", "systems": "systems_3",
"tinted-foot": "tinted-foot", "tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty", "tinted-kitty": "tinted-kitty",
"tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux"
"tinted-tmux": "tinted-tmux",
"tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1739375014, "lastModified": 1739882598,
"narHash": "sha256-0fNbvZ1Dod4rDIfwGnC7CzJ3wRFSF1v5AvNCmNkVgXo=", "narHash": "sha256-LlUFkinhMlvK5uIx6tTg1UYcreYF4iLVNRL8mqiSyjQ=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "e86de61bb8f5f2b6459d0be3e3291ad16db4b777", "rev": "248860c767c67881a7491bcd522a8571560af089",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "danth", "owner": "danth",
"ref": "release-24.11",
"repo": "stylix", "repo": "stylix",
"type": "github" "type": "github"
} }
@ -3182,22 +3199,6 @@
"type": "github" "type": "github"
} }
}, },
"tinted-schemes": {
"flake": false,
"locked": {
"lastModified": 1737565458,
"narHash": "sha256-y+9cvOA6BLKT0WfebDsyUpUa/YxKow9hTjBp6HpQv68=",
"owner": "tinted-theming",
"repo": "schemes",
"rev": "ae31625ba47aeaa4bf6a98cf11a8d4886f9463d9",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "schemes",
"type": "github"
}
},
"tinted-tmux": { "tinted-tmux": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -3213,22 +3214,6 @@
"repo": "tinted-tmux", "repo": "tinted-tmux",
"type": "github" "type": "github"
} }
},
"tinted-zed": {
"flake": false,
"locked": {
"lastModified": 1725758778,
"narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=",
"owner": "tinted-theming",
"repo": "base16-zed",
"rev": "122c9e5c0e6f27211361a04fae92df97940eccf9",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-zed",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

59
flake.nix
View file

@ -1,3 +1,4 @@
#nixversion = "24.11";
{ {
description = "NixOS config"; description = "NixOS config";
nixConfig = { nixConfig = {
@ -14,6 +15,9 @@
}; };
inputs = { inputs = {
nixpkgs = { nixpkgs = {
url = "github:nixos/nixpkgs?ref=nixos-24.11";
};
nixpkgs-unstable = {
url = "github:nixos/nixpkgs?ref=nixos-unstable"; url = "github:nixos/nixpkgs?ref=nixos-unstable";
}; };
nixpkgs-master = { nixpkgs-master = {
@ -23,7 +27,7 @@
url = "github:kylekrein/neovim"; url = "github:kylekrein/neovim";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
stylix.url = "github:danth/stylix"; stylix.url = "github:danth/stylix?ref=release-24.11";
nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest"; nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest";
apple-silicon-support.url = "github:tpwrules/nixos-apple-silicon"; apple-silicon-support.url = "github:tpwrules/nixos-apple-silicon";
@ -31,7 +35,7 @@
sops-nix.url = "github:Mic92/sops-nix"; sops-nix.url = "github:Mic92/sops-nix";
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager?ref=release-24.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -62,6 +66,7 @@
outputs = { outputs = {
self, self,
nixpkgs, nixpkgs,
nixpkgs-unstable,
... ...
} @ inputs: let } @ inputs: let
#systems = ["aarch64-linux" "x86_64-linux" ]; #systems = ["aarch64-linux" "x86_64-linux" ];
@ -74,6 +79,29 @@
#}; #};
arm = "aarch64-linux"; arm = "aarch64-linux";
x86 = "x86_64-linux"; x86 = "x86_64-linux";
kylekrein-homepc-pkgs = nixpkgs: import nixpkgs {
system = x86;
overlays = [
#nativePackagesOverlay
];
config = {
allowBroken = true;
allowUnfree = true;
cudaSupport = true;
};
};
kylekrein-mac-pkgs = nixpkgs: import nixpkgs {
system = arm;
overlays = [
#(import ./nixos/macos/widevine.nix)
];
config = {
allowBroken = true;
allowUnfree = true;
allowUnsupportedSystem = true;
# rocmSupport = true;
};
};
nativePackagesOverlay = self: super: { nativePackagesOverlay = self: super: {
stdenv = super.impureUseNativeOptimizations super.stdenv; stdenv = super.impureUseNativeOptimizations super.stdenv;
}; };
@ -112,20 +140,11 @@
}; };
inherit first-nixos-install; inherit first-nixos-install;
inherit inputs; inherit inputs;
unstable-pkgs = kylekrein-homepc-pkgs nixpkgs-unstable;
}; };
system = x86; system = x86;
pkgs = import nixpkgs { pkgs = kylekrein-homepc-pkgs nixpkgs;
system = x86;
overlays = [
#nativePackagesOverlay
];
config = {
allowBroken = true;
allowUnfree = true;
cudaSupport = true;
};
};
modules = [ modules = [
(import ./disko/impermanence-btrfs.nix {device = "/dev/nvme0n1";}) (import ./disko/impermanence-btrfs.nix {device = "/dev/nvme0n1";})
./nixos/configuration.nix ./nixos/configuration.nix
@ -141,21 +160,11 @@
}; };
inherit first-nixos-install; inherit first-nixos-install;
inherit inputs; inherit inputs;
unstable-pkgs = kylekrein-mac-pkgs nixpkgs-unstable;
}; };
system = arm; system = arm;
pkgs = import nixpkgs { pkgs = kylekrein-mac-pkgs nixpkgs;
system = arm;
overlays = [
#(import ./nixos/macos/widevine.nix)
];
config = {
allowBroken = true;
allowUnfree = true;
allowUnsupportedSystem = true;
# rocmSupport = true;
};
};
modules = [ modules = [
./nixos/configuration.nix ./nixos/configuration.nix
]; ];

3
nixos/configuration.nix
View file

@ -8,6 +8,7 @@
hwconfig, hwconfig,
first-nixos-install, first-nixos-install,
inputs, inputs,
unstable-pkgs,
... ...
}: }:
{ {
@ -175,7 +176,7 @@
clean.extraArgs = "--keep-since 4d --keep 3"; clean.extraArgs = "--keep-since 4d --keep 3";
flake = "/etc/nixos-config"; flake = "/etc/nixos-config";
}; };
fonts.packages = with pkgs; [ fonts.packages = with unstable-pkgs; [ #TODO change to pkgs when 25.05 comes out
nerd-fonts.jetbrains-mono nerd-fonts.jetbrains-mono
font-awesome font-awesome
nerd-fonts.symbols-only nerd-fonts.symbols-only

9
nixos/hardware/nvidia/default.nix
View file

@ -36,11 +36,18 @@
nvidiaSettings = true; nvidiaSettings = true;
# Optionally, you may need to select the appropriate driver version for your specific GPU. # Optionally, you may need to select the appropriate driver version for your specific GPU.
package = config.boot.kernelPackages.nvidiaPackages.beta; #package = config.boot.kernelPackages.nvidiaPackages.latest;
}; };
logitech.wireless.enable = true; logitech.wireless.enable = true;
}; };
services.xserver.videoDrivers = [ "nvidia" ]; services.xserver.videoDrivers = [ "nvidia" ];
hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.mkDriver { #fixes https://github.com/NixOS/nixpkgs/issues/375730 temporary
version = "570.86.16"; # use new 570 drivers
sha256_64bit = "sha256-RWPqS7ZUJH9JEAWlfHLGdqrNlavhaR1xMyzs8lJhy9U=";
openSha256 = "sha256-DuVNA63+pJ8IB7Tw2gM4HbwlOh1bcDg2AN2mbEU9VPE=";
settingsSha256 = "sha256-9rtqh64TyhDF5fFAYiWl3oDHzKJqyOW3abpcf2iNRT8=";
usePersistenced = false;
};
} }