diff --git a/common/common-packages.nix b/common/common-packages.nix index 0804fb2..572ca45 100644 --- a/common/common-packages.nix +++ b/common/common-packages.nix @@ -1,6 +1,5 @@ { pkgs, - pkgs-unstable, lib, config, ... @@ -21,7 +20,7 @@ tlrc wakeonlan # neovim - pkgs-unstable.ani-cli + ani-cli btop pciutils nodePackages.npm diff --git a/common/i18n.nix b/common/i18n.nix index 5de8971..bd9fd87 100644 --- a/common/i18n.nix +++ b/common/i18n.nix @@ -2,7 +2,6 @@ pkgs, lib, config, - pkgs-unstable, ... }: { time.timeZone = "Europe/Istanbul"; @@ -31,7 +30,7 @@ type = "fcitx5"; enable = true; fcitx5.addons = with pkgs; [ - pkgs-unstable.fcitx5-mozc #TODO revert back to stable once its updated + fcitx5-mozc fcitx5-gtk fcitx5-nord # a color theme ]; diff --git a/flake.nix b/flake.nix index 1d83ebf..62f5701 100644 --- a/flake.nix +++ b/flake.nix @@ -10,18 +10,14 @@ }; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; - nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; vscode-server.url = "github:nix-community/nixos-vscode-server"; vscode-server.inputs.nixpkgs.follows = "nixpkgs"; - # sops-nix.url = "github:Mic92/sops-nix"; - # sops-nix.inputs.nixpkgs.follows = "nixpkgs"; - agenix.url = "github:ryantm/agenix"; - home-manager.url = "github:nix-community/home-manager/release-24.11"; + home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; osbm-nvim.url = "github:osbm/osbm-nvim"; @@ -30,7 +26,6 @@ outputs = { self, nixpkgs, - nixpkgs-unstable, vscode-server, agenix, osbm-nvim, @@ -38,15 +33,10 @@ ... }: { nixosConfigurations = let - system = "x86_64-linux"; - pkgs-unstable = import nixpkgs-unstable { - inherit system; - config.allowUnfree = true; - }; system-label = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; in { tartarus = nixpkgs.lib.nixosSystem rec { - inherit system; + system = "x86_64-linux"; modules = [ ./hosts/tartarus/configuration.nix vscode-server.nixosModules.default @@ -57,11 +47,11 @@ } ]; specialArgs = { - inherit pkgs-unstable system-label osbm-nvim; + inherit system-label osbm-nvim; }; }; ymir = nixpkgs.lib.nixosSystem rec { - inherit system; + system = "x86_64-linux"; modules = [ ./hosts/ymir/configuration.nix vscode-server.nixosModules.default @@ -72,7 +62,7 @@ } ]; specialArgs = { - inherit pkgs-unstable system-label osbm-nvim; + inherit system-label osbm-nvim; }; }; }; diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 1d94e91..46c2685 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -4,7 +4,6 @@ { config, pkgs, - pkgs-unstable, system-label, osbm-nvim, ... @@ -83,9 +82,9 @@ packages = with pkgs; [ kdePackages.kate vscode - pkgs-unstable.discord # discord sucks + discord # discord sucks alacritty - pkgs-unstable.obsidian + obsidian mpv libreoffice blender @@ -93,8 +92,8 @@ kitty obs-studio audacity - pkgs-unstable.qbittorrent - pkgs-unstable.arduino-ide + qbittorrent + arduino-ide ]; }; diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 6306528..727b5c4 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -4,7 +4,6 @@ { config, pkgs, - pkgs-unstable, system-label, osbm-nvim, ... @@ -141,9 +140,9 @@ packages = with pkgs; [ kdePackages.kate vscode - pkgs-unstable.discord # discord sucks + discord # discord sucks alacritty - pkgs-unstable.obsidian + obsidian mpv libreoffice blender @@ -151,7 +150,7 @@ kitty obs-studio audacity - pkgs-unstable.qbittorrent + qbittorrent arduino-ide prismlauncher ];