From 083c4491e0f703ddd8e73c89b5f82f757bd2036a Mon Sep 17 00:00:00 2001 From: "Mohamed C." Date: Wed, 31 Jul 2024 19:07:14 +0200 Subject: [PATCH] default unstable, optional stable 24.05 --- configuration.nix | 2 +- flake.nix | 14 +++++++------- home.nix | 2 +- system/.controller.nix.kate-swp | Bin 0 -> 80 bytes system/.desktop.nix.kate-swp | Bin 0 -> 80 bytes system/boot.nix | 2 +- system/hardware.nix | 2 +- system/locale.nix | 2 +- system/networking.nix | 2 +- system/systempkgs.nix | 2 +- system/systemsettings.nix | 2 +- system/updates.nix | 2 +- system/users.nix | 4 +--- user/userpkgs.nix | 2 +- 14 files changed, 18 insertions(+), 20 deletions(-) create mode 100644 system/.controller.nix.kate-swp create mode 100644 system/.desktop.nix.kate-swp diff --git a/configuration.nix b/configuration.nix index f6545c6..24bf5ec 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-unstable, ... }: +{ config, pkgs, pkgs-stable, ... }: { imports = [ diff --git a/flake.nix b/flake.nix index 427ef54..e324d6f 100644 --- a/flake.nix +++ b/flake.nix @@ -2,25 +2,25 @@ description = "Moe.OS"; inputs = { - nixpkgs.url = "nixpkgs/release-24.05"; - nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; - home-manager.url = "github:nix-community/home-manager/release-24.05"; + nixpkgs.url = "nixpkgs/nixos-unstable"; + nixpkgs-stable.url = "nixpkgs/release-24.05"; + home-manager.url = "github:nix-community/home-manager/master"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = { self,nixpkgs,nixpkgs-unstable, home-manager, ...}: + outputs = { self,nixpkgs,nixpkgs-stable, home-manager, ...}: let lib = nixpkgs.lib; system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; - pkgs-unstable = nixpkgs-unstable.legacyPackages.${system}; + pkgs-stable = nixpkgs-stable.legacyPackages.${system}; in { nixosConfigurations = { computer-mo = nixpkgs.lib.nixosSystem { inherit system; modules = [./configuration.nix]; specialArgs = { - inherit pkgs-unstable; + inherit pkgs-stable; }; }; }; @@ -29,7 +29,7 @@ inherit pkgs; modules = [./home.nix]; extraSpecialArgs = { - inherit pkgs-unstable; + inherit pkgs-stable; }; }; }; diff --git a/home.nix b/home.nix index 03bad45..5c8e969 100644 --- a/home.nix +++ b/home.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-unstable, ... }: +{ config, pkgs, pkgs-stable, ... }: { imports = [ diff --git a/system/.controller.nix.kate-swp b/system/.controller.nix.kate-swp new file mode 100644 index 0000000000000000000000000000000000000000..1f278030d91d11420dbda184d89203b523c90404 GIT binary patch literal 80 zcmZQzU=Z?7EJ;-eE>A2_aLdd|RWQ;sU|?Vn`K%W{^TVR;d>1*3BUbFXaOVQo_Km?o YKp7Aa1!7rGFcZRID=tY)%1Lzv0I8uB4*&oF literal 0 HcmV?d00001 diff --git a/system/.desktop.nix.kate-swp b/system/.desktop.nix.kate-swp new file mode 100644 index 0000000000000000000000000000000000000000..5fd27eeced297b103b82b4b8232f7f4500c93815 GIT binary patch literal 80 zcmZQzU=Z?7EJ;-eE>A2_aLdd|RWQ;sU|?Vn=@e}A7FxQ4w^8m+!phy1i=^8>vjztN XWk5g_h-E#&ObCaqxFj(tC)E`IHZu~4 literal 0 HcmV?d00001 diff --git a/system/boot.nix b/system/boot.nix index 8d987aa..ba67aa7 100644 --- a/system/boot.nix +++ b/system/boot.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-unstable, ... }: +{ config, pkgs, pkgs-stable, ... }: { boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; diff --git a/system/hardware.nix b/system/hardware.nix index 497e453..4a6dadd 100644 --- a/system/hardware.nix +++ b/system/hardware.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-unstable, ... }: +{ config, pkgs, pkgs-stable, ... }: { services.fwupd.enable = true; services.printing.enable = true; diff --git a/system/locale.nix b/system/locale.nix index 1ae0c0f..ced192e 100644 --- a/system/locale.nix +++ b/system/locale.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-unstable, ... }: +{ config, pkgs, pkgs-stable, ... }: { time.timeZone = "Europe/Berlin"; i18n.defaultLocale = "de_DE.UTF-8"; diff --git a/system/networking.nix b/system/networking.nix index e3f1404..7f989af 100644 --- a/system/networking.nix +++ b/system/networking.nix @@ -1,4 +1,4 @@ - { config, pkgs, pkgs-unstable, ... }: + { config, pkgs, pkgs-stable, ... }: { networking.hostName = "computer-mo"; networking.networkmanager.enable = true; diff --git a/system/systempkgs.nix b/system/systempkgs.nix index 882cfb9..98a3ab7 100644 --- a/system/systempkgs.nix +++ b/system/systempkgs.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-unstable, ... }: +{ config, pkgs, pkgs-stable, ... }: { programs.firefox = { enable = true; diff --git a/system/systemsettings.nix b/system/systemsettings.nix index e3cf33b..ea22d32 100644 --- a/system/systemsettings.nix +++ b/system/systemsettings.nix @@ -1,2 +1,2 @@ -{ config, pkgs, pkgs-unstable, ... }: +{ config, pkgs, pkgs-stable, ... }: {} diff --git a/system/updates.nix b/system/updates.nix index 652eb74..2f494f5 100644 --- a/system/updates.nix +++ b/system/updates.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-unstable, ... }: +{ config, pkgs, pkgs-stable, ... }: { system.autoUpgrade = { enable = true; diff --git a/system/users.nix b/system/users.nix index ff4c1ef..3f51f54 100644 --- a/system/users.nix +++ b/system/users.nix @@ -1,10 +1,8 @@ -{ config, pkgs, pkgs-unstable,... }: +{ config, pkgs, pkgs-stable,... }: { users.users.mo = { isNormalUser = true; description = "Mohamed Chrayed"; extraGroups = [ "networkmanager" "wheel" ]; - packages = with pkgs; [ - ]; }; } diff --git a/user/userpkgs.nix b/user/userpkgs.nix index 35f4fd8..37dc655 100644 --- a/user/userpkgs.nix +++ b/user/userpkgs.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-unstable,... }: +{ config, pkgs, pkgs-stable,... }: { environment.systemPackages = with pkgs; [ wget