From 0251b35b64afeb8f2077860e1f23a117d537b735 Mon Sep 17 00:00:00 2001 From: "Mohamed C." Date: Wed, 31 Jul 2024 18:23:25 +0200 Subject: [PATCH] revert stable/unstable --- configuration.nix | 2 +- flake.nix | 14 ++++++-------- home.nix | 2 +- system/boot.nix | 2 +- system/controller.nix | 2 +- system/desktop.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 | 2 +- 13 files changed, 18 insertions(+), 20 deletions(-) diff --git a/configuration.nix b/configuration.nix index 24bf5ec..f6545c6 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-stable, ... }: +{ config, pkgs, pkgs-unstable, ... }: { imports = [ diff --git a/flake.nix b/flake.nix index a669d3e..5df6557 100644 --- a/flake.nix +++ b/flake.nix @@ -2,27 +2,25 @@ description = "Moe.OS"; inputs = { - nixpkgs.url = "nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "nixpkgs/nixos-24.05"; + nixpkgs.url = "nixpkgs/nixos-24-05"; + nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; home-manager.url = "github:nix-community/home-manager/master"; - home-manager-stable.url = "github:nix-community/home-manager/release-24.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - home-manager-stable.inputs.nixpkgs.follows = "nixpkgs-stable"; }; - outputs = { self,nixpkgs,nixpkgs-stable, home-manager, ...}: + outputs = { self,nixpkgs,nixpkgs-unstable, home-manager, ...}: let lib = nixpkgs.lib; system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; - pkgs-stable = nixpkgs-stable.legacyPackages.${system}; + pkgs-unstable = nixpkgs-unstable.legacyPackages.${system}; in { nixosConfigurations = { computer-mo = nixpkgs.lib.nixosSystem { inherit system; modules = [./configuration.nix]; specialArgs = { - inherit pkgs-stable; + inherit pkgs-unstable; }; }; }; @@ -31,7 +29,7 @@ inherit pkgs; modules = [./home.nix]; extraSpecialArgs = { - inherit pkgs-stable; + inherit pkgs-unstable; }; }; }; diff --git a/home.nix b/home.nix index 19ca706..bb60ddb 100644 --- a/home.nix +++ b/home.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-stable, ... }: +{ config, pkgs, pkgs-unstable, ... }: { home.username = "mo"; diff --git a/system/boot.nix b/system/boot.nix index ba67aa7..8d987aa 100644 --- a/system/boot.nix +++ b/system/boot.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-stable, ... }: +{ config, pkgs, pkgs-unstable, ... }: { boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; diff --git a/system/controller.nix b/system/controller.nix index 0a3ba23..f32e579 100644 --- a/system/controller.nix +++ b/system/controller.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-stable, ... }: +{ config, pkgs, pkgs-unstable, ... }: { # Ignore Dualsense Touchpad in Desktop services.udev.extraRules ='' diff --git a/system/desktop.nix b/system/desktop.nix index a445e24..8911814 100644 --- a/system/desktop.nix +++ b/system/desktop.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-stable, ... }: +{ config, pkgs, pkgs-unstable, ... }: { services.xserver.enable = false; services.displayManager.sddm.wayland.enable = true; diff --git a/system/hardware.nix b/system/hardware.nix index 4a6dadd..497e453 100644 --- a/system/hardware.nix +++ b/system/hardware.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-stable, ... }: +{ config, pkgs, pkgs-unstable, ... }: { services.fwupd.enable = true; services.printing.enable = true; diff --git a/system/locale.nix b/system/locale.nix index ced192e..1ae0c0f 100644 --- a/system/locale.nix +++ b/system/locale.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-stable, ... }: +{ config, pkgs, pkgs-unstable, ... }: { time.timeZone = "Europe/Berlin"; i18n.defaultLocale = "de_DE.UTF-8"; diff --git a/system/networking.nix b/system/networking.nix index 7f989af..e3f1404 100644 --- a/system/networking.nix +++ b/system/networking.nix @@ -1,4 +1,4 @@ - { config, pkgs, pkgs-stable, ... }: + { config, pkgs, pkgs-unstable, ... }: { networking.hostName = "computer-mo"; networking.networkmanager.enable = true; diff --git a/system/systempkgs.nix b/system/systempkgs.nix index d50dcdf..f4cec38 100644 --- a/system/systempkgs.nix +++ b/system/systempkgs.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-stable, ... }: +{ config, pkgs, pkgs-unstable, ... }: { programs.firefox = { enable = true; diff --git a/system/systemsettings.nix b/system/systemsettings.nix index ea22d32..e3cf33b 100644 --- a/system/systemsettings.nix +++ b/system/systemsettings.nix @@ -1,2 +1,2 @@ -{ config, pkgs, pkgs-stable, ... }: +{ config, pkgs, pkgs-unstable, ... }: {} diff --git a/system/updates.nix b/system/updates.nix index 2f494f5..652eb74 100644 --- a/system/updates.nix +++ b/system/updates.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-stable, ... }: +{ config, pkgs, pkgs-unstable, ... }: { system.autoUpgrade = { enable = true; diff --git a/system/users.nix b/system/users.nix index 4f7938c..ff4c1ef 100644 --- a/system/users.nix +++ b/system/users.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-stable,... }: +{ config, pkgs, pkgs-unstable,... }: { users.users.mo = { isNormalUser = true;