mirror of
https://git.sr.ht/~coasteen/dotfiles
synced 2025-11-04 14:47:38 +01:00
updates
This commit is contained in:
parent
6f11e53287
commit
d13ef15feb
2 changed files with 37 additions and 32 deletions
|
|
@ -1,6 +1,9 @@
|
|||
{ home-manager, config, lib, inputs, pkgs, settings, ... }: let
|
||||
unstable = import inputs.nixpkgs-unstable { inherit (pkgs) system; };
|
||||
in {
|
||||
{ pkgs, pkgsUnstable, ... }:
|
||||
|
||||
let
|
||||
unstable = pkgsUnstable;
|
||||
in
|
||||
{
|
||||
imports = [ ./hardware-configuration.nix ];
|
||||
|
||||
boot = {
|
||||
|
|
@ -10,13 +13,7 @@ in {
|
|||
loader.systemd-boot.editor = false;
|
||||
loader.systemd-boot.configurationLimit = 25;
|
||||
loader.efi.canTouchEfiVariables = true;
|
||||
kernelParams = [
|
||||
"nvidia_drm"
|
||||
"nvidia_modeset"
|
||||
"nvidia_uvm"
|
||||
"nvidia-drm.fbdev=1"
|
||||
"nvidia"
|
||||
];
|
||||
kernelParams = [ "nvidia_drm" "nvidia_modeset" "nvidia_uvm" "nvidia-drm.fbdev=1" "nvidia" ];
|
||||
};
|
||||
|
||||
networking.hostName = "core";
|
||||
|
|
@ -30,9 +27,8 @@ in {
|
|||
powerManagement.enable = true;
|
||||
open = false;
|
||||
nvidiaSettings = true;
|
||||
package = config.boot.kernelPackages.nvidiaPackages.stable;
|
||||
package = pkgs.linuxPackages.nvidiaPackages.stable;
|
||||
};
|
||||
|
||||
bluetooth.enable = true;
|
||||
bluetooth.powerOnBoot = true;
|
||||
};
|
||||
|
|
@ -45,7 +41,17 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
(lib.hiPrio unstable.uutils-coreutils-noprefix)
|
||||
(pkgs.runCommand "vim-wrapper" { } ''
|
||||
mkdir -p $out/bin
|
||||
ln -s ${pkgs.neovim}/bin/nvim $out/bin/vim
|
||||
'')
|
||||
unstable.firefox
|
||||
unstable.git
|
||||
unstable.adwaita-icon-theme
|
||||
unstable.nil
|
||||
];
|
||||
|
||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,34 +1,33 @@
|
|||
{
|
||||
description = "Flakes once again";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
|
||||
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
home-manager.url = "github:nix-community/home-manager/release-25.05";
|
||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
outputs = { nixpkgs, nixpkgs-unstable, home-manager, ... }: let
|
||||
|
||||
outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, ... }:
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
pkgs = import nixpkgs { inherit system; };
|
||||
pkgs-unstable = import nixpkgs-unstable { inherit system; };
|
||||
in {
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
config = { allowUnfree = true; };
|
||||
};
|
||||
pkgsUnstable = import nixpkgs-unstable { inherit system; };
|
||||
in
|
||||
{
|
||||
nixosConfigurations.core = nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
modules = [
|
||||
./compose.nix
|
||||
./create.nix home-manager.nixosModules.home-manager {
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.users.coast = import ./home.nix;
|
||||
home-manager.backupFileExtension = "home-backup";
|
||||
}
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
(lib.hiPrio pkgs-unstable.uutils-coreutils-noprefix)
|
||||
(pkgs.runCommand "vim-wrapper" { } '' mkdir -p $out/bin; ln -s ${pkgs.neovim}/bin/nvim $out/bin/vim '')
|
||||
pkgs-unstable.firefox
|
||||
pkgs-unstable.git
|
||||
pkgs-unstable.adwaita-icon-theme
|
||||
];
|
||||
./create.nix
|
||||
(import ./compose.nix { inherit pkgs pkgsUnstable; })
|
||||
home-manager.nixosModules.home-manager {
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.users.coast = import ./home.nix;
|
||||
home-manager.backupFileExtension = "home-backup";
|
||||
}
|
||||
];
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue