From d13ef15febef5f6e5ada2481b4789e2f6655b4da Mon Sep 17 00:00:00 2001 From: coast Date: Sun, 5 Oct 2025 05:22:41 +0330 Subject: [PATCH] updates --- etc/nixos/compose.nix | 32 +++++++++++++++++++------------- etc/nixos/flake.nix | 37 ++++++++++++++++++------------------- 2 files changed, 37 insertions(+), 32 deletions(-) diff --git a/etc/nixos/compose.nix b/etc/nixos/compose.nix index aa9d4f9..eaf836f 100644 --- a/etc/nixos/compose.nix +++ b/etc/nixos/compose.nix @@ -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" ]; } diff --git a/etc/nixos/flake.nix b/etc/nixos/flake.nix index 58f968c..a3e4bbc 100644 --- a/etc/nixos/flake.nix +++ b/etc/nixos/flake.nix @@ -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"; } ]; };