From a2f84a98a4b2b88a7fda274d819a88a644c667ae Mon Sep 17 00:00:00 2001 From: "Mohamed C." Date: Sat, 10 Aug 2024 15:04:32 +0200 Subject: [PATCH] remove nixpkgs-stable channel --- flake.nix | 5 +---- .../computer-mo/system-packages/sys.pkg-customization.nix | 8 +------- hosts/computer-mo/system-packages/sys.pkg-dev.nix | 8 +------- hosts/computer-mo/system-packages/sys.pkg-gaming.nix | 8 +------- hosts/computer-mo/system-packages/sys.pkg-hardware.nix | 8 +------- hosts/computer-mo/system-packages/sys.pkg-media.nix | 8 +------- hosts/computer-mo/system-packages/sys.pkg-misc.nix | 8 +------- hosts/computer-mo/system-packages/sys.pkg-system.nix | 8 +------- 8 files changed, 8 insertions(+), 53 deletions(-) diff --git a/flake.nix b/flake.nix index 5e9e43c..f334a0e 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,6 @@ description = "Moe.OS"; inputs = { nixpkgs.url = "nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "nixpkgs/release-24.05"; jovian.url = "github:Jovian-Experiments/Jovian-NixOS/development"; home-manager.url = "github:nix-community/home-manager/master"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; @@ -10,19 +9,17 @@ plasma-manager.inputs.nixpkgs.follows = "nixpkgs"; plasma-manager.inputs.home-manager.follows = "home-manager"; }; - outputs = { self, nixpkgs, nixpkgs-stable, home-manager, jovian, plasma-manager, ...}: + outputs = { self, nixpkgs, home-manager, jovian, plasma-manager, ...}: let lib = nixpkgs.lib; host = "computer-mo"; user = "mo"; system = "x86_64-linux"; pkgs = import nixpkgs {inherit system; config.allowUnfree = true; }; - pkgs-stable = import nixpkgs-stable {inherit system; config.allowUnfree = true; }; in { nixosConfigurations = { ${host} = lib.nixosSystem { inherit system; - specialArgs = { inherit pkgs-stable; }; modules = [ ./hosts/${host}/system-imports.nix jovian.nixosModules.jovian diff --git a/hosts/computer-mo/system-packages/sys.pkg-customization.nix b/hosts/computer-mo/system-packages/sys.pkg-customization.nix index 5eaab8f..e6049bd 100644 --- a/hosts/computer-mo/system-packages/sys.pkg-customization.nix +++ b/hosts/computer-mo/system-packages/sys.pkg-customization.nix @@ -1,15 +1,9 @@ -{ pkgs, pkgs-stable, ... }: +{ pkgs, ... }: { environment.systemPackages = (with pkgs; [ kde-rounded-corners neofetch ibm-plex - ]) - - ++ - - (with pkgs-stable; [ - ]); } diff --git a/hosts/computer-mo/system-packages/sys.pkg-dev.nix b/hosts/computer-mo/system-packages/sys.pkg-dev.nix index 5475a92..1cae7c5 100644 --- a/hosts/computer-mo/system-packages/sys.pkg-dev.nix +++ b/hosts/computer-mo/system-packages/sys.pkg-dev.nix @@ -1,4 +1,4 @@ -{ pkgs, pkgs-stable, ... }: +{ pkgs, ... }: { programs.zsh.enable = true; @@ -8,11 +8,5 @@ git nil yaml-language-server - ]) - - ++ - - (with pkgs-stable; [ - ]); } diff --git a/hosts/computer-mo/system-packages/sys.pkg-gaming.nix b/hosts/computer-mo/system-packages/sys.pkg-gaming.nix index e95b57e..44cf0b5 100644 --- a/hosts/computer-mo/system-packages/sys.pkg-gaming.nix +++ b/hosts/computer-mo/system-packages/sys.pkg-gaming.nix @@ -1,4 +1,4 @@ -{ pkgs, pkgs-stable, ... }: +{ pkgs, ... }: { environment.systemPackages = (with pkgs; [ @@ -6,11 +6,5 @@ unigine-valley unigine-heaven unigine-tropics - ]) - - ++ - - (with pkgs-stable; [ - ]); } diff --git a/hosts/computer-mo/system-packages/sys.pkg-hardware.nix b/hosts/computer-mo/system-packages/sys.pkg-hardware.nix index df8cd63..c4a28c6 100644 --- a/hosts/computer-mo/system-packages/sys.pkg-hardware.nix +++ b/hosts/computer-mo/system-packages/sys.pkg-hardware.nix @@ -1,4 +1,4 @@ -{ pkgs, pkgs-stable, ... }: +{ pkgs, ... }: { environment.systemPackages = (with pkgs; [ @@ -6,11 +6,5 @@ aha lact kdePackages.isoimagewriter - ]) - - ++ - - (with pkgs-stable; [ - ]); } diff --git a/hosts/computer-mo/system-packages/sys.pkg-media.nix b/hosts/computer-mo/system-packages/sys.pkg-media.nix index 5d67afa..395a885 100644 --- a/hosts/computer-mo/system-packages/sys.pkg-media.nix +++ b/hosts/computer-mo/system-packages/sys.pkg-media.nix @@ -1,4 +1,4 @@ -{ pkgs, pkgs-stable, ... }: +{ pkgs, ... }: { environment.systemPackages = (with pkgs; [ @@ -8,12 +8,6 @@ kdePackages.elisa haruna krita - ]) - - ++ - - (with pkgs-stable; [ - ]); } diff --git a/hosts/computer-mo/system-packages/sys.pkg-misc.nix b/hosts/computer-mo/system-packages/sys.pkg-misc.nix index 85d9179..bf32362 100644 --- a/hosts/computer-mo/system-packages/sys.pkg-misc.nix +++ b/hosts/computer-mo/system-packages/sys.pkg-misc.nix @@ -1,4 +1,4 @@ -{ pkgs, pkgs-stable, ... }: +{ pkgs, ... }: { environment.systemPackages = (with pkgs; [ @@ -11,11 +11,5 @@ kdePackages.kcalc kdePackages.filelight kdePackages.skanlite - ]) - - ++ - - (with pkgs-stable; [ - ]); } diff --git a/hosts/computer-mo/system-packages/sys.pkg-system.nix b/hosts/computer-mo/system-packages/sys.pkg-system.nix index 5df2774..30f75a2 100644 --- a/hosts/computer-mo/system-packages/sys.pkg-system.nix +++ b/hosts/computer-mo/system-packages/sys.pkg-system.nix @@ -1,14 +1,8 @@ -{ pkgs, pkgs-stable, ... }: +{ pkgs, ... }: { environment.systemPackages = (with pkgs; [ kdePackages.ksystemlog kdePackages.partitionmanager - ]) - - ++ - - (with pkgs-stable; [ - ]); }